Inspection of "Let SCSS cleanup only run once (#17543)" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 07dffb...bd5189 )

by John

created 2019-10-17 08:03 UTC

Status

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -25,33 +25,33 @@
 block discarded – undo
 use OCP\Files\Search\ISearchOperator;
 
 class SearchBinaryOperator implements ISearchBinaryOperator {
-	/** @var string */
-	private $type;
-	/** @var ISearchOperator[] */
-	private $arguments;
+    /** @var string */
+    private $type;
+    /** @var ISearchOperator[] */
+    private $arguments;
 
-	/**
-	 * SearchBinaryOperator constructor.
-	 *
-	 * @param string $type
-	 * @param ISearchOperator[] $arguments
-	 */
-	public function __construct($type, array $arguments) {
-		$this->type = $type;
-		$this->arguments = $arguments;
-	}
+    /**
+     * SearchBinaryOperator constructor.
+     *
+     * @param string $type
+     * @param ISearchOperator[] $arguments
+     */
+    public function __construct($type, array $arguments) {
+        $this->type = $type;
+        $this->arguments = $arguments;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * @return ISearchOperator[]
-	 */
-	public function getArguments() {
-		return $this->arguments;
-	}
+    /**
+     * @return ISearchOperator[]
+     */
+    public function getArguments() {
+        return $this->arguments;
+    }
 }

Please login to merge, or discard this patch.

lib/private/Repair/RepairInvalidShares.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 
 		$updatedEntries = $builder->execute();
 		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+			$out->info('Fixed file share permissions for '.$updatedEntries.' shares');
 		}
 	}
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+			$out->info('Removed '.$deletedEntries.' shares where the parent did not exist');
 		}
 	}
 

Please login to merge, or discard this patch.

Indentation +86 added lines, -86 removed lines patch added patch discarded remove patch

@@ -33,90 +33,90 @@
 block discarded – undo
  */
 class RepairInvalidShares implements IRepairStep {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 * @suppress SqlInjectionChecker
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     * @suppress SqlInjectionChecker
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

Please login to merge, or discard this patch.

lib/private/OCS/Provider.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 			],
 		];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
+		if ($this->appManager->isEnabledForUser('files_sharing')) {
 			$services['SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if($this->appManager->isEnabledForUser('activity')) {
+		if ($this->appManager->isEnabledForUser('activity')) {
 			$services['ACTIVITY'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 			];
 		}
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
+		if ($this->appManager->isEnabledForUser('provisioning_api')) {
 			$services['PROVISIONING'] = [
 				'version' => 1,
 				'endpoints' => [

Please login to merge, or discard this patch.

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -24,92 +24,92 @@
 block discarded – undo
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('federation')) {
-			if (isset($services['FEDERATED_SHARING'])) {
-				$services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
-				$services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
-				$services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
-			} else {
-				$services['FEDERATED_SHARING'] = [
-					'version' => 1,
-					'endpoints' => [
-						'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
-						'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
-						'carddav-user' => 'system'
-					],
-				];
-			}
-		}
+        if ($this->appManager->isEnabledForUser('federation')) {
+            if (isset($services['FEDERATED_SHARING'])) {
+                $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
+                $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
+                $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
+            } else {
+                $services['FEDERATED_SHARING'] = [
+                    'version' => 1,
+                    'endpoints' => [
+                        'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
+                        'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
+                        'carddav-user' => 'system'
+                    ],
+                ];
+            }
+        }
 
-		if($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

Please login to merge, or discard this patch.

core/templates/twofactorshowchallenge.php 3 patches

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -16,8 +16,11 @@
 block discarded – undo
 	<?php if ($error): ?>
 			<?php if($error_message): ?>
 				<p><strong><?php p($error_message); ?></strong></p>
-			<?php else: ?>
-				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
+			<?php else {
+    : ?>
+				<p><strong><?php p($l->t('Error while validating your second factor'));
+}
+?></strong></p>
 			<?php endif; ?>
 	<?php endif; ?>
 	<?php print_unescaped($template); ?>

Please login to merge, or discard this patch.

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -24,11 +24,11 @@
 block discarded – undo
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
 		<a class="two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-			[
-				'challengeProviderId' => $_['backupProvider']->getId(),
-				'redirect_url' => $_['redirect_url'],
-			]
-		)) ?>">
+            [
+                'challengeProviderId' => $_['backupProvider']->getId(),
+                'redirect_url' => $_['redirect_url'],
+            ]
+        )) ?>">
 			<?php p($l->t('Use backup code')) ?>
 		</a>
 	</p>

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@
 block discarded – undo
 <div class="body-login-container update">
 	<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
 	<?php if ($error): ?>
-			<?php if($error_message): ?>
+			<?php if ($error_message): ?>
 				<p><strong><?php p($error_message); ?></strong></p>
 			<?php else: ?>
 				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>

Please login to merge, or discard this patch.

lib/public/Files/Search/ISearchQuery.php 1 patch

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -27,41 +27,41 @@
 block discarded – undo
  * @since 12.0.0
  */
 interface ISearchQuery {
-	/**
-	 * @return ISearchOperator
-	 * @since 12.0.0
-	 */
-	public function getSearchOperation();
+    /**
+     * @return ISearchOperator
+     * @since 12.0.0
+     */
+    public function getSearchOperation();
 
-	/**
-	 * Get the maximum number of results to return
-	 *
-	 * @return integer
-	 * @since 12.0.0
-	 */
-	public function getLimit();
+    /**
+     * Get the maximum number of results to return
+     *
+     * @return integer
+     * @since 12.0.0
+     */
+    public function getLimit();
 
-	/**
-	 * Get the offset for returned results
-	 *
-	 * @return integer
-	 * @since 12.0.0
-	 */
-	public function getOffset();
+    /**
+     * Get the offset for returned results
+     *
+     * @return integer
+     * @since 12.0.0
+     */
+    public function getOffset();
 
-	/**
-	 * The fields and directions to order by
-	 *
-	 * @return ISearchOrder[]
-	 * @since 12.0.0
-	 */
-	public function getOrder();
+    /**
+     * The fields and directions to order by
+     *
+     * @return ISearchOrder[]
+     * @since 12.0.0
+     */
+    public function getOrder();
 
-	/**
-	 * The user that issued the search
-	 *
-	 * @return IUser
-	 * @since 12.0.0
-	 */
-	public function getUser();
+    /**
+     * The user that issued the search
+     *
+     * @return IUser
+     * @since 12.0.0
+     */
+    public function getUser();
 }

Please login to merge, or discard this patch.

lib/private/Files/Search/SearchQuery.php 1 patch

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -27,66 +27,66 @@
 block discarded – undo
 use OCP\IUser;
 
 class SearchQuery implements ISearchQuery {
-	/** @var  ISearchOperator */
-	private $searchOperation;
-	/** @var  integer */
-	private $limit;
-	/** @var  integer */
-	private $offset;
-	/** @var  ISearchOrder[] */
-	private $order;
-	/** @var IUser */
-	private $user;
+    /** @var  ISearchOperator */
+    private $searchOperation;
+    /** @var  integer */
+    private $limit;
+    /** @var  integer */
+    private $offset;
+    /** @var  ISearchOrder[] */
+    private $order;
+    /** @var IUser */
+    private $user;
 
-	/**
-	 * SearchQuery constructor.
-	 *
-	 * @param ISearchOperator $searchOperation
-	 * @param int $limit
-	 * @param int $offset
-	 * @param array $order
-	 * @param IUser $user
-	 */
-	public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
-		$this->searchOperation = $searchOperation;
-		$this->limit = $limit;
-		$this->offset = $offset;
-		$this->order = $order;
-		$this->user = $user;
-	}
+    /**
+     * SearchQuery constructor.
+     *
+     * @param ISearchOperator $searchOperation
+     * @param int $limit
+     * @param int $offset
+     * @param array $order
+     * @param IUser $user
+     */
+    public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
+        $this->searchOperation = $searchOperation;
+        $this->limit = $limit;
+        $this->offset = $offset;
+        $this->order = $order;
+        $this->user = $user;
+    }
 
-	/**
-	 * @return ISearchOperator
-	 */
-	public function getSearchOperation() {
-		return $this->searchOperation;
-	}
+    /**
+     * @return ISearchOperator
+     */
+    public function getSearchOperation() {
+        return $this->searchOperation;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getLimit() {
-		return $this->limit;
-	}
+    /**
+     * @return int
+     */
+    public function getLimit() {
+        return $this->limit;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getOffset() {
-		return $this->offset;
-	}
+    /**
+     * @return int
+     */
+    public function getOffset() {
+        return $this->offset;
+    }
 
-	/**
-	 * @return ISearchOrder[]
-	 */
-	public function getOrder() {
-		return $this->order;
-	}
+    /**
+     * @return ISearchOrder[]
+     */
+    public function getOrder() {
+        return $this->order;
+    }
 
-	/**
-	 * @return IUser
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * @return IUser
+     */
+    public function getUser() {
+        return $this->user;
+    }
 }

Please login to merge, or discard this patch.

apps/federatedfilesharing/appinfo/routes.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -23,18 +23,18 @@
 block discarded – undo
  */
 
 return [
-	'routes' => [
-		['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
-		['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
+        ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
+    ],
 ];

Please login to merge, or discard this patch.

apps/dav/appinfo/v2/remote.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

Please login to merge, or discard this patch.

lib/private/Share20/ProviderFactory.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
 
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

Please login to merge, or discard this patch.

Indentation +261 added lines, -261 removed lines patch added patch discarded remove patch

@@ -48,274 +48,274 @@
 block discarded – undo
  */
 class ProviderFactory implements IProviderFactory {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var DefaultShareProvider */
-	private $defaultProvider = null;
-	/** @var FederatedShareProvider */
-	private $federatedProvider = null;
-	/** @var  ShareByMailProvider */
-	private $shareByMailProvider;
-	/** @var  \OCA\Circles\ShareByCircleProvider */
-	private $shareByCircleProvider = null;
-	/** @var bool */
-	private $circlesAreNotAvailable = false;
-	/** @var \OCA\Talk\Share\RoomShareProvider */
-	private $roomShareProvider = null;
-
-	/**
-	 * IProviderFactory constructor.
-	 *
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Create the default share provider.
-	 *
-	 * @return DefaultShareProvider
-	 */
-	protected function defaultShareProvider() {
-		if ($this->defaultProvider === null) {
-			$this->defaultProvider = new DefaultShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getGroupManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getL10N('sharing'),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->defaultProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function federatedShareProvider() {
-		if ($this->federatedProvider === null) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var DefaultShareProvider */
+    private $defaultProvider = null;
+    /** @var FederatedShareProvider */
+    private $federatedProvider = null;
+    /** @var  ShareByMailProvider */
+    private $shareByMailProvider;
+    /** @var  \OCA\Circles\ShareByCircleProvider */
+    private $shareByCircleProvider = null;
+    /** @var bool */
+    private $circlesAreNotAvailable = false;
+    /** @var \OCA\Talk\Share\RoomShareProvider */
+    private $roomShareProvider = null;
+
+    /**
+     * IProviderFactory constructor.
+     *
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Create the default share provider.
+     *
+     * @return DefaultShareProvider
+     */
+    protected function defaultShareProvider() {
+        if ($this->defaultProvider === null) {
+            $this->defaultProvider = new DefaultShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getGroupManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getL10N('sharing'),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->defaultProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function federatedShareProvider() {
+        if ($this->federatedProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('federatedfilesharing')) {
-				return null;
-			}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('federatedfilesharing')) {
+                return null;
+            }
 
-			/*
+            /*
 			 * TODO: add factory to federated sharing app
 			 */
-			$l = $this->serverContainer->getL10N('federatedfilesharing');
-			$addressHandler = new AddressHandler(
-				$this->serverContainer->getURLGenerator(),
-				$l,
-				$this->serverContainer->getCloudIdManager()
-			);
-			$notifications = new Notifications(
-				$addressHandler,
-				$this->serverContainer->getHTTPClientService(),
-				$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
-				$this->serverContainer->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory()
-			);
-			$tokenHandler = new TokenHandler(
-				$this->serverContainer->getSecureRandom()
-			);
-
-			$this->federatedProvider = new FederatedShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$addressHandler,
-				$notifications,
-				$tokenHandler,
-				$l,
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager(),
-				$this->serverContainer->getGlobalScaleConfig(),
-				$this->serverContainer->getCloudFederationProviderManager()
-			);
-		}
-
-		return $this->federatedProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return ShareByMailProvider
-	 */
-	protected function getShareByMailProvider() {
-		if ($this->shareByMailProvider === null) {
-			/*
+            $l = $this->serverContainer->getL10N('federatedfilesharing');
+            $addressHandler = new AddressHandler(
+                $this->serverContainer->getURLGenerator(),
+                $l,
+                $this->serverContainer->getCloudIdManager()
+            );
+            $notifications = new Notifications(
+                $addressHandler,
+                $this->serverContainer->getHTTPClientService(),
+                $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
+                $this->serverContainer->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory()
+            );
+            $tokenHandler = new TokenHandler(
+                $this->serverContainer->getSecureRandom()
+            );
+
+            $this->federatedProvider = new FederatedShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $addressHandler,
+                $notifications,
+                $tokenHandler,
+                $l,
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getCloudIdManager(),
+                $this->serverContainer->getGlobalScaleConfig(),
+                $this->serverContainer->getCloudFederationProviderManager()
+            );
+        }
+
+        return $this->federatedProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return ShareByMailProvider
+     */
+    protected function getShareByMailProvider() {
+        if ($this->shareByMailProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('sharebymail')) {
-				return null;
-			}
-
-			$settingsManager = new SettingsManager($this->serverContainer->getConfig());
-
-			$this->shareByMailProvider = new ShareByMailProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('sharebymail'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getActivityManager(),
-				$settingsManager,
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getHasher(),
-				$this->serverContainer->query(CapabilitiesManager::class)
-			);
-		}
-
-		return $this->shareByMailProvider;
-	}
-
-
-	/**
-	 * Create the circle share provider
-	 *
-	 * @return FederatedShareProvider
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function getShareByCircleProvider() {
-
-		if ($this->circlesAreNotAvailable) {
-			return null;
-		}
-
-		if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
-			!class_exists('\OCA\Circles\ShareByCircleProvider')
-		) {
-			$this->circlesAreNotAvailable = true;
-			return null;
-		}
-
-		if ($this->shareByCircleProvider === null) {
-
-			$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('circles'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->shareByCircleProvider;
-	}
-
-	/**
-	 * Create the room share provider
-	 *
-	 * @return RoomShareProvider
-	 */
-	protected function getRoomShareProvider() {
-		if ($this->roomShareProvider === null) {
-			/*
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('sharebymail')) {
+                return null;
+            }
+
+            $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+
+            $this->shareByMailProvider = new ShareByMailProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('sharebymail'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getActivityManager(),
+                $settingsManager,
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getHasher(),
+                $this->serverContainer->query(CapabilitiesManager::class)
+            );
+        }
+
+        return $this->shareByMailProvider;
+    }
+
+
+    /**
+     * Create the circle share provider
+     *
+     * @return FederatedShareProvider
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function getShareByCircleProvider() {
+
+        if ($this->circlesAreNotAvailable) {
+            return null;
+        }
+
+        if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
+            !class_exists('\OCA\Circles\ShareByCircleProvider')
+        ) {
+            $this->circlesAreNotAvailable = true;
+            return null;
+        }
+
+        if ($this->shareByCircleProvider === null) {
+
+            $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('circles'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->shareByCircleProvider;
+    }
+
+    /**
+     * Create the room share provider
+     *
+     * @return RoomShareProvider
+     */
+    protected function getRoomShareProvider() {
+        if ($this->roomShareProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('spreed')) {
-				return null;
-			}
-
-			try {
-				$this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
-			} catch (\OCP\AppFramework\QueryException $e) {
-				return null;
-			}
-		}
-
-		return $this->roomShareProvider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProvider($id) {
-		$provider = null;
-		if ($id === 'ocinternal') {
-			$provider = $this->defaultShareProvider();
-		} else if ($id === 'ocFederatedSharing') {
-			$provider = $this->federatedShareProvider();
-		} else if ($id === 'ocMailShare') {
-			$provider = $this->getShareByMailProvider();
-		} else if ($id === 'ocCircleShare') {
-			$provider = $this->getShareByCircleProvider();
-		} else if ($id === 'ocRoomShare') {
-			$provider = $this->getRoomShareProvider();
-		}
-
-		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
-		}
-
-		return $provider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProviderForType($shareType) {
-		$provider = null;
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
-			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
-			$shareType === \OCP\Share::SHARE_TYPE_LINK
-		) {
-			$provider = $this->defaultShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE || $shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
-			$provider = $this->federatedShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$provider = $this->getShareByMailProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			$provider = $this->getShareByCircleProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_ROOM) {
-			$provider = $this->getRoomShareProvider();
-		}
-
-
-		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
-		}
-
-		return $provider;
-	}
-
-	public function getAllProviders() {
-		$shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
-		$shareByMail = $this->getShareByMailProvider();
-		if ($shareByMail !== null) {
-			$shares[] = $shareByMail;
-		}
-		$shareByCircle = $this->getShareByCircleProvider();
-		if ($shareByCircle !== null) {
-			$shares[] = $shareByCircle;
-		}
-		$roomShare = $this->getRoomShareProvider();
-		if ($roomShare !== null) {
-			$shares[] = $roomShare;
-		}
-
-		return $shares;
-	}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('spreed')) {
+                return null;
+            }
+
+            try {
+                $this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
+            } catch (\OCP\AppFramework\QueryException $e) {
+                return null;
+            }
+        }
+
+        return $this->roomShareProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProvider($id) {
+        $provider = null;
+        if ($id === 'ocinternal') {
+            $provider = $this->defaultShareProvider();
+        } else if ($id === 'ocFederatedSharing') {
+            $provider = $this->federatedShareProvider();
+        } else if ($id === 'ocMailShare') {
+            $provider = $this->getShareByMailProvider();
+        } else if ($id === 'ocCircleShare') {
+            $provider = $this->getShareByCircleProvider();
+        } else if ($id === 'ocRoomShare') {
+            $provider = $this->getRoomShareProvider();
+        }
+
+        if ($provider === null) {
+            throw new ProviderException('No provider with id .' . $id . ' found.');
+        }
+
+        return $provider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProviderForType($shareType) {
+        $provider = null;
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
+            $shareType === \OCP\Share::SHARE_TYPE_GROUP ||
+            $shareType === \OCP\Share::SHARE_TYPE_LINK
+        ) {
+            $provider = $this->defaultShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE || $shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
+            $provider = $this->federatedShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $provider = $this->getShareByMailProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            $provider = $this->getShareByCircleProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_ROOM) {
+            $provider = $this->getRoomShareProvider();
+        }
+
+
+        if ($provider === null) {
+            throw new ProviderException('No share provider for share type ' . $shareType);
+        }
+
+        return $provider;
+    }
+
+    public function getAllProviders() {
+        $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
+        $shareByMail = $this->getShareByMailProvider();
+        if ($shareByMail !== null) {
+            $shares[] = $shareByMail;
+        }
+        $shareByCircle = $this->getShareByCircleProvider();
+        if ($shareByCircle !== null) {
+            $shares[] = $shareByCircle;
+        }
+        $roomShare = $this->getRoomShareProvider();
+        if ($roomShare !== null) {
+            $shares[] = $roomShare;
+        }
+
+        return $shares;
+    }
 }

Please login to merge, or discard this patch.

		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71
72	72	$updatedEntries = $builder->execute();
73	73	if ($updatedEntries > 0) {
74		- $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
	74	+ $out->info('Fixed file share permissions for '.$updatedEntries.' shares');
75	75	}
76	76	}
77	77
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	}
108	108
109	109	if ($deletedEntries) {
110		- $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
	110	+ $out->info('Removed '.$deletedEntries.' shares where the parent did not exist');
111	111	}
112	112	}
113	113

		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	}
215	215
216	216	if ($provider === null) {
217		- throw new ProviderException('No provider with id .' . $id . ' found.');
	217	+ throw new ProviderException('No provider with id .'.$id.' found.');
218	218	}
219	219
220	220	return $provider;
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241
242	242
243	243	if ($provider === null) {
244		- throw new ProviderException('No share provider for share type ' . $shareType);
	244	+ throw new ProviderException('No share provider for share type '.$shareType);
245	245	}
246	246
247	247	return $provider;

		@@ -25,33 +25,33 @@
		block discarded – undo
25	25	use OCP\Files\Search\ISearchOperator;
26	26
27	27	class SearchBinaryOperator implements ISearchBinaryOperator {
28		- /** @var string */
29		- private $type;
30		- /** @var ISearchOperator[] */
31		- private $arguments;
	28	+ /** @var string */
	29	+ private $type;
	30	+ /** @var ISearchOperator[] */
	31	+ private $arguments;
32	32
33		- /**
34		- * SearchBinaryOperator constructor.
35		- *
36		- * @param string $type
37		- * @param ISearchOperator[] $arguments
38		- */
39		- public function __construct($type, array $arguments) {
40		- $this->type = $type;
41		- $this->arguments = $arguments;
42		- }
	33	+ /**
	34	+ * SearchBinaryOperator constructor.
	35	+ *
	36	+ * @param string $type
	37	+ * @param ISearchOperator[] $arguments
	38	+ */
	39	+ public function __construct($type, array $arguments) {
	40	+ $this->type = $type;
	41	+ $this->arguments = $arguments;
	42	+ }
43	43
44		- /**
45		- * @return string
46		- */
47		- public function getType() {
48		- return $this->type;
49		- }
	44	+ /**
	45	+ * @return string
	46	+ */
	47	+ public function getType() {
	48	+ return $this->type;
	49	+ }
50	50
51		- /**
52		- * @return ISearchOperator[]
53		- */
54		- public function getArguments() {
55		- return $this->arguments;
56		- }
	51	+ /**
	52	+ * @return ISearchOperator[]
	53	+ */
	54	+ public function getArguments() {
	55	+ return $this->arguments;
	56	+ }
57	57	}

		@@ -33,90 +33,90 @@
		block discarded – undo
33	33	*/
34	34	class RepairInvalidShares implements IRepairStep {
35	35
36		- const CHUNK_SIZE = 200;
37		-
38		- /** @var \OCP\IConfig */
39		- protected $config;
40		-
41		- /** @var \OCP\IDBConnection */
42		- protected $connection;
43		-
44		- /**
45		- * @param \OCP\IConfig $config
46		- * @param \OCP\IDBConnection $connection
47		- */
48		- public function __construct($config, $connection) {
49		- $this->connection = $connection;
50		- $this->config = $config;
51		- }
52		-
53		- public function getName() {
54		- return 'Repair invalid shares';
55		- }
56		-
57		- /**
58		- * Adjust file share permissions
59		- * @suppress SqlInjectionChecker
60		- */
61		- private function adjustFileSharePermissions(IOutput $out) {
62		- $mask = \OCP\Constants::PERMISSION_READ \| \OCP\Constants::PERMISSION_UPDATE \| \OCP\Constants::PERMISSION_SHARE;
63		- $builder = $this->connection->getQueryBuilder();
64		-
65		- $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
66		- $builder
67		- ->update('share')
68		- ->set('permissions', $permsFunc)
69		- ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
70		- ->andWhere($builder->expr()->neq('permissions', $permsFunc));
71		-
72		- $updatedEntries = $builder->execute();
73		- if ($updatedEntries > 0) {
74		- $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
75		- }
76		- }
77		-
78		- /**
79		- * Remove shares where the parent share does not exist anymore
80		- */
81		- private function removeSharesNonExistingParent(IOutput $out) {
82		- $deletedEntries = 0;
83		-
84		- $query = $this->connection->getQueryBuilder();
85		- $query->select('s1.parent')
86		- ->from('share', 's1')
87		- ->where($query->expr()->isNotNull('s1.parent'))
88		- ->andWhere($query->expr()->isNull('s2.id'))
89		- ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
90		- ->groupBy('s1.parent')
91		- ->setMaxResults(self::CHUNK_SIZE);
92		-
93		- $deleteQuery = $this->connection->getQueryBuilder();
94		- $deleteQuery->delete('share')
95		- ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
96		-
97		- $deletedInLastChunk = self::CHUNK_SIZE;
98		- while ($deletedInLastChunk === self::CHUNK_SIZE) {
99		- $deletedInLastChunk = 0;
100		- $result = $query->execute();
101		- while ($row = $result->fetch()) {
102		- $deletedInLastChunk++;
103		- $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
104		- ->execute();
105		- }
106		- $result->closeCursor();
107		- }
108		-
109		- if ($deletedEntries) {
110		- $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
111		- }
112		- }
113		-
114		- public function run(IOutput $out) {
115		- $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
116		- if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
117		- $this->adjustFileSharePermissions($out);
118		- }
119		-
120		- $this->removeSharesNonExistingParent($out);
121		- }
	36	+ const CHUNK_SIZE = 200;
	37	+
	38	+ /** @var \OCP\IConfig */
	39	+ protected $config;
	40	+
	41	+ /** @var \OCP\IDBConnection */
	42	+ protected $connection;
	43	+
	44	+ /**
	45	+ * @param \OCP\IConfig $config
	46	+ * @param \OCP\IDBConnection $connection
	47	+ */
	48	+ public function __construct($config, $connection) {
	49	+ $this->connection = $connection;
	50	+ $this->config = $config;
	51	+ }
	52	+
	53	+ public function getName() {
	54	+ return 'Repair invalid shares';
	55	+ }
	56	+
	57	+ /**
	58	+ * Adjust file share permissions
	59	+ * @suppress SqlInjectionChecker
	60	+ */
	61	+ private function adjustFileSharePermissions(IOutput $out) {
	62	+ $mask = \OCP\Constants::PERMISSION_READ \| \OCP\Constants::PERMISSION_UPDATE \| \OCP\Constants::PERMISSION_SHARE;
	63	+ $builder = $this->connection->getQueryBuilder();
	64	+
	65	+ $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
	66	+ $builder
	67	+ ->update('share')
	68	+ ->set('permissions', $permsFunc)
	69	+ ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
	70	+ ->andWhere($builder->expr()->neq('permissions', $permsFunc));
	71	+
	72	+ $updatedEntries = $builder->execute();
	73	+ if ($updatedEntries > 0) {
	74	+ $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
	75	+ }
	76	+ }
	77	+
	78	+ /**
	79	+ * Remove shares where the parent share does not exist anymore
	80	+ */
	81	+ private function removeSharesNonExistingParent(IOutput $out) {
	82	+ $deletedEntries = 0;
	83	+
	84	+ $query = $this->connection->getQueryBuilder();
	85	+ $query->select('s1.parent')
	86	+ ->from('share', 's1')
	87	+ ->where($query->expr()->isNotNull('s1.parent'))
	88	+ ->andWhere($query->expr()->isNull('s2.id'))
	89	+ ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
	90	+ ->groupBy('s1.parent')
	91	+ ->setMaxResults(self::CHUNK_SIZE);
	92	+
	93	+ $deleteQuery = $this->connection->getQueryBuilder();
	94	+ $deleteQuery->delete('share')
	95	+ ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
	96	+
	97	+ $deletedInLastChunk = self::CHUNK_SIZE;
	98	+ while ($deletedInLastChunk === self::CHUNK_SIZE) {
	99	+ $deletedInLastChunk = 0;
	100	+ $result = $query->execute();
	101	+ while ($row = $result->fetch()) {
	102	+ $deletedInLastChunk++;
	103	+ $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
	104	+ ->execute();
	105	+ }
	106	+ $result->closeCursor();
	107	+ }
	108	+
	109	+ if ($deletedEntries) {
	110	+ $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
	111	+ }
	112	+ }
	113	+
	114	+ public function run(IOutput $out) {
	115	+ $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
	116	+ if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
	117	+ $this->adjustFileSharePermissions($out);
	118	+ }
	119	+
	120	+ $this->removeSharesNonExistingParent($out);
	121	+ }
122	122	}

		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	],
55	55	];
56	56
57		- if($this->appManager->isEnabledForUser('files_sharing')) {
	57	+ if ($this->appManager->isEnabledForUser('files_sharing')) {
58	58	$services['SHARING'] = [
59	59	'version' => 1,
60	60	'endpoints' => [
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	}
86	86	}
87	87
88		- if($this->appManager->isEnabledForUser('activity')) {
	88	+ if ($this->appManager->isEnabledForUser('activity')) {
89	89	$services['ACTIVITY'] = [
90	90	'version' => 1,
91	91	'endpoints' => [
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	];
95	95	}
96	96
97		- if($this->appManager->isEnabledForUser('provisioning_api')) {
	97	+ if ($this->appManager->isEnabledForUser('provisioning_api')) {
98	98	$services['PROVISIONING'] = [
99	99	'version' => 1,
100	100	'endpoints' => [

		@@ -24,92 +24,92 @@
		block discarded – undo
24	24	namespace OC\OCS;
25	25
26	26	class Provider extends \OCP\AppFramework\Controller {
27		- /** @var \OCP\App\IAppManager */
28		- private $appManager;
	27	+ /** @var \OCP\App\IAppManager */
	28	+ private $appManager;
29	29
30		- /**
31		- * @param string $appName
32		- * @param \OCP\IRequest $request
33		- * @param \OCP\App\IAppManager $appManager
34		- */
35		- public function __construct($appName,
36		- \OCP\IRequest $request,
37		- \OCP\App\IAppManager $appManager) {
38		- parent::__construct($appName, $request);
39		- $this->appManager = $appManager;
40		- }
	30	+ /**
	31	+ * @param string $appName
	32	+ * @param \OCP\IRequest $request
	33	+ * @param \OCP\App\IAppManager $appManager
	34	+ */
	35	+ public function __construct($appName,
	36	+ \OCP\IRequest $request,
	37	+ \OCP\App\IAppManager $appManager) {
	38	+ parent::__construct($appName, $request);
	39	+ $this->appManager = $appManager;
	40	+ }
41	41
42		- /**
43		- * @return \OCP\AppFramework\Http\JSONResponse
44		- */
45		- public function buildProviderList() {
46		- $services = [
47		- 'PRIVATE_DATA' => [
48		- 'version' => 1,
49		- 'endpoints' => [
50		- 'store' => '/ocs/v2.php/privatedata/setattribute',
51		- 'read' => '/ocs/v2.php/privatedata/getattribute',
52		- 'delete' => '/ocs/v2.php/privatedata/deleteattribute',
53		- ],
54		- ],
55		- ];
	42	+ /**
	43	+ * @return \OCP\AppFramework\Http\JSONResponse
	44	+ */
	45	+ public function buildProviderList() {
	46	+ $services = [
	47	+ 'PRIVATE_DATA' => [
	48	+ 'version' => 1,
	49	+ 'endpoints' => [
	50	+ 'store' => '/ocs/v2.php/privatedata/setattribute',
	51	+ 'read' => '/ocs/v2.php/privatedata/getattribute',
	52	+ 'delete' => '/ocs/v2.php/privatedata/deleteattribute',
	53	+ ],
	54	+ ],
	55	+ ];
56	56
57		- if($this->appManager->isEnabledForUser('files_sharing')) {
58		- $services['SHARING'] = [
59		- 'version' => 1,
60		- 'endpoints' => [
61		- 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
62		- ],
63		- ];
64		- $services['FEDERATED_SHARING'] = [
65		- 'version' => 1,
66		- 'endpoints' => [
67		- 'share' => '/ocs/v2.php/cloud/shares',
68		- 'webdav' => '/public.php/webdav/',
69		- ],
70		- ];
71		- }
	57	+ if($this->appManager->isEnabledForUser('files_sharing')) {
	58	+ $services['SHARING'] = [
	59	+ 'version' => 1,
	60	+ 'endpoints' => [
	61	+ 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
	62	+ ],
	63	+ ];
	64	+ $services['FEDERATED_SHARING'] = [
	65	+ 'version' => 1,
	66	+ 'endpoints' => [
	67	+ 'share' => '/ocs/v2.php/cloud/shares',
	68	+ 'webdav' => '/public.php/webdav/',
	69	+ ],
	70	+ ];
	71	+ }
72	72
73		- if ($this->appManager->isEnabledForUser('federation')) {
74		- if (isset($services['FEDERATED_SHARING'])) {
75		- $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
76		- $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
77		- $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
78		- } else {
79		- $services['FEDERATED_SHARING'] = [
80		- 'version' => 1,
81		- 'endpoints' => [
82		- 'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
83		- 'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
84		- 'carddav-user' => 'system'
85		- ],
86		- ];
87		- }
88		- }
	73	+ if ($this->appManager->isEnabledForUser('federation')) {
	74	+ if (isset($services['FEDERATED_SHARING'])) {
	75	+ $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
	76	+ $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
	77	+ $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
	78	+ } else {
	79	+ $services['FEDERATED_SHARING'] = [
	80	+ 'version' => 1,
	81	+ 'endpoints' => [
	82	+ 'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
	83	+ 'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
	84	+ 'carddav-user' => 'system'
	85	+ ],
	86	+ ];
	87	+ }
	88	+ }
89	89
90		- if($this->appManager->isEnabledForUser('activity')) {
91		- $services['ACTIVITY'] = [
92		- 'version' => 1,
93		- 'endpoints' => [
94		- 'list' => '/ocs/v2.php/cloud/activity',
95		- ],
96		- ];
97		- }
	90	+ if($this->appManager->isEnabledForUser('activity')) {
	91	+ $services['ACTIVITY'] = [
	92	+ 'version' => 1,
	93	+ 'endpoints' => [
	94	+ 'list' => '/ocs/v2.php/cloud/activity',
	95	+ ],
	96	+ ];
	97	+ }
98	98
99		- if($this->appManager->isEnabledForUser('provisioning_api')) {
100		- $services['PROVISIONING'] = [
101		- 'version' => 1,
102		- 'endpoints' => [
103		- 'user' => '/ocs/v2.php/cloud/users',
104		- 'groups' => '/ocs/v2.php/cloud/groups',
105		- 'apps' => '/ocs/v2.php/cloud/apps',
106		- ],
107		- ];
108		- }
	99	+ if($this->appManager->isEnabledForUser('provisioning_api')) {
	100	+ $services['PROVISIONING'] = [
	101	+ 'version' => 1,
	102	+ 'endpoints' => [
	103	+ 'user' => '/ocs/v2.php/cloud/users',
	104	+ 'groups' => '/ocs/v2.php/cloud/groups',
	105	+ 'apps' => '/ocs/v2.php/cloud/apps',
	106	+ ],
	107	+ ];
	108	+ }
109	109
110		- return new \OCP\AppFramework\Http\JSONResponse([
111		- 'version' => 2,
112		- 'services' => $services,
113		- ]);
114		- }
	110	+ return new \OCP\AppFramework\Http\JSONResponse([
	111	+ 'version' => 2,
	112	+ 'services' => $services,
	113	+ ]);
	114	+ }
115	115	}

		@@ -16,8 +16,11 @@
		block discarded – undo
16	16	<?php if ($error): ?>
17	17	<?php if($error_message): ?>
18	18	<p><strong><?php p($error_message); ?></strong></p>
19		- <?php else: ?>
20		- <p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
	19	+ <?php else {
	20	+ : ?>
	21	+ <p><strong><?php p($l->t('Error while validating your second factor'));
	22	+}
	23	+?></strong></p>
21	24	<?php endif; ?>
22	25	<?php endif; ?>
23	26	<?php print_unescaped($template); ?>

		@@ -24,11 +24,11 @@
		block discarded – undo
24	24	<?php if (!is_null($_['backupProvider'])): ?>
25	25	<p>
26	26	<a class="two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
27		- [
28		- 'challengeProviderId' => $_['backupProvider']->getId(),
29		- 'redirect_url' => $_['redirect_url'],
30		- ]
31		- )) ?>">
	27	+ [
	28	+ 'challengeProviderId' => $_['backupProvider']->getId(),
	29	+ 'redirect_url' => $_['redirect_url'],
	30	+ ]
	31	+ )) ?>">
32	32	<?php p($l->t('Use backup code')) ?>
33	33	</a>
34	34	</p>

		@@ -14,7 +14,7 @@
		block discarded – undo
14	14	<div class="body-login-container update">
15	15	<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
16	16	<?php if ($error): ?>
17		- <?php if($error_message): ?>
	17	+ <?php if ($error_message): ?>
18	18	<p><strong><?php p($error_message); ?></strong></p>
19	19	<?php else: ?>
20	20	<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>

		@@ -27,41 +27,41 @@
		block discarded – undo
27	27	* @since 12.0.0
28	28	*/
29	29	interface ISearchQuery {
30		- /**
31		- * @return ISearchOperator
32		- * @since 12.0.0
33		- */
34		- public function getSearchOperation();
	30	+ /**
	31	+ * @return ISearchOperator
	32	+ * @since 12.0.0
	33	+ */
	34	+ public function getSearchOperation();
35	35
36		- /**
37		- * Get the maximum number of results to return
38		- *
39		- * @return integer
40		- * @since 12.0.0
41		- */
42		- public function getLimit();
	36	+ /**
	37	+ * Get the maximum number of results to return
	38	+ *
	39	+ * @return integer
	40	+ * @since 12.0.0
	41	+ */
	42	+ public function getLimit();
43	43
44		- /**
45		- * Get the offset for returned results
46		- *
47		- * @return integer
48		- * @since 12.0.0
49		- */
50		- public function getOffset();
	44	+ /**
	45	+ * Get the offset for returned results
	46	+ *
	47	+ * @return integer
	48	+ * @since 12.0.0
	49	+ */
	50	+ public function getOffset();
51	51
52		- /**
53		- * The fields and directions to order by
54		- *
55		- * @return ISearchOrder[]
56		- * @since 12.0.0
57		- */
58		- public function getOrder();
	52	+ /**
	53	+ * The fields and directions to order by
	54	+ *
	55	+ * @return ISearchOrder[]
	56	+ * @since 12.0.0
	57	+ */
	58	+ public function getOrder();
59	59
60		- /**
61		- * The user that issued the search
62		- *
63		- * @return IUser
64		- * @since 12.0.0
65		- */
66		- public function getUser();
	60	+ /**
	61	+ * The user that issued the search
	62	+ *
	63	+ * @return IUser
	64	+ * @since 12.0.0
	65	+ */
	66	+ public function getUser();
67	67	}

		@@ -27,66 +27,66 @@
		block discarded – undo
27	27	use OCP\IUser;
28	28
29	29	class SearchQuery implements ISearchQuery {
30		- /** @var ISearchOperator */
31		- private $searchOperation;
32		- /** @var integer */
33		- private $limit;
34		- /** @var integer */
35		- private $offset;
36		- /** @var ISearchOrder[] */
37		- private $order;
38		- /** @var IUser */
39		- private $user;
	30	+ /** @var ISearchOperator */
	31	+ private $searchOperation;
	32	+ /** @var integer */
	33	+ private $limit;
	34	+ /** @var integer */
	35	+ private $offset;
	36	+ /** @var ISearchOrder[] */
	37	+ private $order;
	38	+ /** @var IUser */
	39	+ private $user;
40	40
41		- /**
42		- * SearchQuery constructor.
43		- *
44		- * @param ISearchOperator $searchOperation
45		- * @param int $limit
46		- * @param int $offset
47		- * @param array $order
48		- * @param IUser $user
49		- */
50		- public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
51		- $this->searchOperation = $searchOperation;
52		- $this->limit = $limit;
53		- $this->offset = $offset;
54		- $this->order = $order;
55		- $this->user = $user;
56		- }
	41	+ /**
	42	+ * SearchQuery constructor.
	43	+ *
	44	+ * @param ISearchOperator $searchOperation
	45	+ * @param int $limit
	46	+ * @param int $offset
	47	+ * @param array $order
	48	+ * @param IUser $user
	49	+ */
	50	+ public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
	51	+ $this->searchOperation = $searchOperation;
	52	+ $this->limit = $limit;
	53	+ $this->offset = $offset;
	54	+ $this->order = $order;
	55	+ $this->user = $user;
	56	+ }
57	57
58		- /**
59		- * @return ISearchOperator
60		- */
61		- public function getSearchOperation() {
62		- return $this->searchOperation;
63		- }
	58	+ /**
	59	+ * @return ISearchOperator
	60	+ */
	61	+ public function getSearchOperation() {
	62	+ return $this->searchOperation;
	63	+ }
64	64
65		- /**
66		- * @return int
67		- */
68		- public function getLimit() {
69		- return $this->limit;
70		- }
	65	+ /**
	66	+ * @return int
	67	+ */
	68	+ public function getLimit() {
	69	+ return $this->limit;
	70	+ }
71	71
72		- /**
73		- * @return int
74		- */
75		- public function getOffset() {
76		- return $this->offset;
77		- }
	72	+ /**
	73	+ * @return int
	74	+ */
	75	+ public function getOffset() {
	76	+ return $this->offset;
	77	+ }
78	78
79		- /**
80		- * @return ISearchOrder[]
81		- */
82		- public function getOrder() {
83		- return $this->order;
84		- }
	79	+ /**
	80	+ * @return ISearchOrder[]
	81	+ */
	82	+ public function getOrder() {
	83	+ return $this->order;
	84	+ }
85	85
86		- /**
87		- * @return IUser
88		- */
89		- public function getUser() {
90		- return $this->user;
91		- }
	86	+ /**
	87	+ * @return IUser
	88	+ */
	89	+ public function getUser() {
	90	+ return $this->user;
	91	+ }
92	92	}

		@@ -23,18 +23,18 @@
		block discarded – undo
23	23	*/
24	24
25	25	return [
26		- 'routes' => [
27		- ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
28		- ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
29		- ],
30		- 'ocs' => [
31		- ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
32		- ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
33		- ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
34		- ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
35		- ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
36		- ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
37		- ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
38		- ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
39		- ],
	26	+ 'routes' => [
	27	+ ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
	28	+ ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
	29	+ ],
	30	+ 'ocs' => [
	31	+ ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
	32	+ ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
	33	+ ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
	34	+ ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
	35	+ ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
	36	+ ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
	37	+ ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
	38	+ ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
	39	+ ],
40	40	];

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21	*/
22	22	// no php execution timeout for webdav
23	23	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
24		- @set_time_limit(0);
	24	+ @set_time_limit(0);
25	25	}
26	26	ignore_user_abort(true);
27	27

		@@ -48,274 +48,274 @@
		block discarded – undo
48	48	*/
49	49	class ProviderFactory implements IProviderFactory {
50	50
51		- /** @var IServerContainer */
52		- private $serverContainer;
53		- /** @var DefaultShareProvider */
54		- private $defaultProvider = null;
55		- /** @var FederatedShareProvider */
56		- private $federatedProvider = null;
57		- /** @var ShareByMailProvider */
58		- private $shareByMailProvider;
59		- /** @var \OCA\Circles\ShareByCircleProvider */
60		- private $shareByCircleProvider = null;
61		- /** @var bool */
62		- private $circlesAreNotAvailable = false;
63		- /** @var \OCA\Talk\Share\RoomShareProvider */
64		- private $roomShareProvider = null;
65		-
66		- /**
67		- * IProviderFactory constructor.
68		- *
69		- * @param IServerContainer $serverContainer
70		- */
71		- public function __construct(IServerContainer $serverContainer) {
72		- $this->serverContainer = $serverContainer;
73		- }
74		-
75		- /**
76		- * Create the default share provider.
77		- *
78		- * @return DefaultShareProvider
79		- */
80		- protected function defaultShareProvider() {
81		- if ($this->defaultProvider === null) {
82		- $this->defaultProvider = new DefaultShareProvider(
83		- $this->serverContainer->getDatabaseConnection(),
84		- $this->serverContainer->getUserManager(),
85		- $this->serverContainer->getGroupManager(),
86		- $this->serverContainer->getLazyRootFolder(),
87		- $this->serverContainer->getMailer(),
88		- $this->serverContainer->query(Defaults::class),
89		- $this->serverContainer->getL10N('sharing'),
90		- $this->serverContainer->getURLGenerator()
91		- );
92		- }
93		-
94		- return $this->defaultProvider;
95		- }
96		-
97		- /**
98		- * Create the federated share provider
99		- *
100		- * @return FederatedShareProvider
101		- */
102		- protected function federatedShareProvider() {
103		- if ($this->federatedProvider === null) {
104		- /*
	51	+ /** @var IServerContainer */
	52	+ private $serverContainer;
	53	+ /** @var DefaultShareProvider */
	54	+ private $defaultProvider = null;
	55	+ /** @var FederatedShareProvider */
	56	+ private $federatedProvider = null;
	57	+ /** @var ShareByMailProvider */
	58	+ private $shareByMailProvider;
	59	+ /** @var \OCA\Circles\ShareByCircleProvider */
	60	+ private $shareByCircleProvider = null;
	61	+ /** @var bool */
	62	+ private $circlesAreNotAvailable = false;
	63	+ /** @var \OCA\Talk\Share\RoomShareProvider */
	64	+ private $roomShareProvider = null;
	65	+
	66	+ /**
	67	+ * IProviderFactory constructor.
	68	+ *
	69	+ * @param IServerContainer $serverContainer
	70	+ */
	71	+ public function __construct(IServerContainer $serverContainer) {
	72	+ $this->serverContainer = $serverContainer;
	73	+ }
	74	+
	75	+ /**
	76	+ * Create the default share provider.
	77	+ *
	78	+ * @return DefaultShareProvider
	79	+ */
	80	+ protected function defaultShareProvider() {
	81	+ if ($this->defaultProvider === null) {
	82	+ $this->defaultProvider = new DefaultShareProvider(
	83	+ $this->serverContainer->getDatabaseConnection(),
	84	+ $this->serverContainer->getUserManager(),
	85	+ $this->serverContainer->getGroupManager(),
	86	+ $this->serverContainer->getLazyRootFolder(),
	87	+ $this->serverContainer->getMailer(),
	88	+ $this->serverContainer->query(Defaults::class),
	89	+ $this->serverContainer->getL10N('sharing'),
	90	+ $this->serverContainer->getURLGenerator()
	91	+ );
	92	+ }
	93	+
	94	+ return $this->defaultProvider;
	95	+ }
	96	+
	97	+ /**
	98	+ * Create the federated share provider
	99	+ *
	100	+ * @return FederatedShareProvider
	101	+ */
	102	+ protected function federatedShareProvider() {
	103	+ if ($this->federatedProvider === null) {
	104	+ /*
105	105	* Check if the app is enabled
106	106	*/
107		- $appManager = $this->serverContainer->getAppManager();
108		- if (!$appManager->isEnabledForUser('federatedfilesharing')) {
109		- return null;
110		- }
	107	+ $appManager = $this->serverContainer->getAppManager();
	108	+ if (!$appManager->isEnabledForUser('federatedfilesharing')) {
	109	+ return null;
	110	+ }
111	111
112		- /*
	112	+ /*
113	113	* TODO: add factory to federated sharing app
114	114	*/
115		- $l = $this->serverContainer->getL10N('federatedfilesharing');
116		- $addressHandler = new AddressHandler(
117		- $this->serverContainer->getURLGenerator(),
118		- $l,
119		- $this->serverContainer->getCloudIdManager()
120		- );
121		- $notifications = new Notifications(
122		- $addressHandler,
123		- $this->serverContainer->getHTTPClientService(),
124		- $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
125		- $this->serverContainer->getJobList(),
126		- \OC::$server->getCloudFederationProviderManager(),
127		- \OC::$server->getCloudFederationFactory()
128		- );
129		- $tokenHandler = new TokenHandler(
130		- $this->serverContainer->getSecureRandom()
131		- );
132		-
133		- $this->federatedProvider = new FederatedShareProvider(
134		- $this->serverContainer->getDatabaseConnection(),
135		- $addressHandler,
136		- $notifications,
137		- $tokenHandler,
138		- $l,
139		- $this->serverContainer->getLogger(),
140		- $this->serverContainer->getLazyRootFolder(),
141		- $this->serverContainer->getConfig(),
142		- $this->serverContainer->getUserManager(),
143		- $this->serverContainer->getCloudIdManager(),
144		- $this->serverContainer->getGlobalScaleConfig(),
145		- $this->serverContainer->getCloudFederationProviderManager()
146		- );
147		- }
148		-
149		- return $this->federatedProvider;
150		- }
151		-
152		- /**
153		- * Create the federated share provider
154		- *
155		- * @return ShareByMailProvider
156		- */
157		- protected function getShareByMailProvider() {
158		- if ($this->shareByMailProvider === null) {
159		- /*
	115	+ $l = $this->serverContainer->getL10N('federatedfilesharing');
	116	+ $addressHandler = new AddressHandler(
	117	+ $this->serverContainer->getURLGenerator(),
	118	+ $l,
	119	+ $this->serverContainer->getCloudIdManager()
	120	+ );
	121	+ $notifications = new Notifications(
	122	+ $addressHandler,
	123	+ $this->serverContainer->getHTTPClientService(),
	124	+ $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
	125	+ $this->serverContainer->getJobList(),
	126	+ \OC::$server->getCloudFederationProviderManager(),
	127	+ \OC::$server->getCloudFederationFactory()
	128	+ );
	129	+ $tokenHandler = new TokenHandler(
	130	+ $this->serverContainer->getSecureRandom()
	131	+ );
	132	+
	133	+ $this->federatedProvider = new FederatedShareProvider(
	134	+ $this->serverContainer->getDatabaseConnection(),
	135	+ $addressHandler,
	136	+ $notifications,
	137	+ $tokenHandler,
	138	+ $l,
	139	+ $this->serverContainer->getLogger(),
	140	+ $this->serverContainer->getLazyRootFolder(),
	141	+ $this->serverContainer->getConfig(),
	142	+ $this->serverContainer->getUserManager(),
	143	+ $this->serverContainer->getCloudIdManager(),
	144	+ $this->serverContainer->getGlobalScaleConfig(),
	145	+ $this->serverContainer->getCloudFederationProviderManager()
	146	+ );
	147	+ }
	148	+
	149	+ return $this->federatedProvider;
	150	+ }
	151	+
	152	+ /**
	153	+ * Create the federated share provider
	154	+ *
	155	+ * @return ShareByMailProvider
	156	+ */
	157	+ protected function getShareByMailProvider() {
	158	+ if ($this->shareByMailProvider === null) {
	159	+ /*
160	160	* Check if the app is enabled
161	161	*/
162		- $appManager = $this->serverContainer->getAppManager();
163		- if (!$appManager->isEnabledForUser('sharebymail')) {
164		- return null;
165		- }
166		-
167		- $settingsManager = new SettingsManager($this->serverContainer->getConfig());
168		-
169		- $this->shareByMailProvider = new ShareByMailProvider(
170		- $this->serverContainer->getDatabaseConnection(),
171		- $this->serverContainer->getSecureRandom(),
172		- $this->serverContainer->getUserManager(),
173		- $this->serverContainer->getLazyRootFolder(),
174		- $this->serverContainer->getL10N('sharebymail'),
175		- $this->serverContainer->getLogger(),
176		- $this->serverContainer->getMailer(),
177		- $this->serverContainer->getURLGenerator(),
178		- $this->serverContainer->getActivityManager(),
179		- $settingsManager,
180		- $this->serverContainer->query(Defaults::class),
181		- $this->serverContainer->getHasher(),
182		- $this->serverContainer->query(CapabilitiesManager::class)
183		- );
184		- }
185		-
186		- return $this->shareByMailProvider;
187		- }
188		-
189		-
190		- /**
191		- * Create the circle share provider
192		- *
193		- * @return FederatedShareProvider
194		- *
195		- * @suppress PhanUndeclaredClassMethod
196		- */
197		- protected function getShareByCircleProvider() {
198		-
199		- if ($this->circlesAreNotAvailable) {
200		- return null;
201		- }
202		-
203		- if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') \|\|
204		- !class_exists('\OCA\Circles\ShareByCircleProvider')
205		- ) {
206		- $this->circlesAreNotAvailable = true;
207		- return null;
208		- }
209		-
210		- if ($this->shareByCircleProvider === null) {
211		-
212		- $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
213		- $this->serverContainer->getDatabaseConnection(),
214		- $this->serverContainer->getSecureRandom(),
215		- $this->serverContainer->getUserManager(),
216		- $this->serverContainer->getLazyRootFolder(),
217		- $this->serverContainer->getL10N('circles'),
218		- $this->serverContainer->getLogger(),
219		- $this->serverContainer->getURLGenerator()
220		- );
221		- }
222		-
223		- return $this->shareByCircleProvider;
224		- }
225		-
226		- /**
227		- * Create the room share provider
228		- *
229		- * @return RoomShareProvider
230		- */
231		- protected function getRoomShareProvider() {
232		- if ($this->roomShareProvider === null) {
233		- /*
	162	+ $appManager = $this->serverContainer->getAppManager();
	163	+ if (!$appManager->isEnabledForUser('sharebymail')) {
	164	+ return null;
	165	+ }
	166	+
	167	+ $settingsManager = new SettingsManager($this->serverContainer->getConfig());
	168	+
	169	+ $this->shareByMailProvider = new ShareByMailProvider(
	170	+ $this->serverContainer->getDatabaseConnection(),
	171	+ $this->serverContainer->getSecureRandom(),
	172	+ $this->serverContainer->getUserManager(),
	173	+ $this->serverContainer->getLazyRootFolder(),
	174	+ $this->serverContainer->getL10N('sharebymail'),
	175	+ $this->serverContainer->getLogger(),
	176	+ $this->serverContainer->getMailer(),
	177	+ $this->serverContainer->getURLGenerator(),
	178	+ $this->serverContainer->getActivityManager(),
	179	+ $settingsManager,
	180	+ $this->serverContainer->query(Defaults::class),
	181	+ $this->serverContainer->getHasher(),
	182	+ $this->serverContainer->query(CapabilitiesManager::class)
	183	+ );
	184	+ }
	185	+
	186	+ return $this->shareByMailProvider;
	187	+ }
	188	+
	189	+
	190	+ /**
	191	+ * Create the circle share provider
	192	+ *
	193	+ * @return FederatedShareProvider
	194	+ *
	195	+ * @suppress PhanUndeclaredClassMethod
	196	+ */
	197	+ protected function getShareByCircleProvider() {
	198	+
	199	+ if ($this->circlesAreNotAvailable) {
	200	+ return null;
	201	+ }
	202	+
	203	+ if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') \|\|
	204	+ !class_exists('\OCA\Circles\ShareByCircleProvider')
	205	+ ) {
	206	+ $this->circlesAreNotAvailable = true;
	207	+ return null;
	208	+ }
	209	+
	210	+ if ($this->shareByCircleProvider === null) {
	211	+
	212	+ $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
	213	+ $this->serverContainer->getDatabaseConnection(),
	214	+ $this->serverContainer->getSecureRandom(),
	215	+ $this->serverContainer->getUserManager(),
	216	+ $this->serverContainer->getLazyRootFolder(),
	217	+ $this->serverContainer->getL10N('circles'),
	218	+ $this->serverContainer->getLogger(),
	219	+ $this->serverContainer->getURLGenerator()
	220	+ );
	221	+ }
	222	+
	223	+ return $this->shareByCircleProvider;
	224	+ }
	225	+
	226	+ /**
	227	+ * Create the room share provider
	228	+ *
	229	+ * @return RoomShareProvider
	230	+ */
	231	+ protected function getRoomShareProvider() {
	232	+ if ($this->roomShareProvider === null) {
	233	+ /*
234	234	* Check if the app is enabled
235	235	*/
236		- $appManager = $this->serverContainer->getAppManager();
237		- if (!$appManager->isEnabledForUser('spreed')) {
238		- return null;
239		- }
240		-
241		- try {
242		- $this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
243		- } catch (\OCP\AppFramework\QueryException $e) {
244		- return null;
245		- }
246		- }
247		-
248		- return $this->roomShareProvider;
249		- }
250		-
251		- /**
252		- * @inheritdoc
253		- */
254		- public function getProvider($id) {
255		- $provider = null;
256		- if ($id === 'ocinternal') {
257		- $provider = $this->defaultShareProvider();
258		- } else if ($id === 'ocFederatedSharing') {
259		- $provider = $this->federatedShareProvider();
260		- } else if ($id === 'ocMailShare') {
261		- $provider = $this->getShareByMailProvider();
262		- } else if ($id === 'ocCircleShare') {
263		- $provider = $this->getShareByCircleProvider();
264		- } else if ($id === 'ocRoomShare') {
265		- $provider = $this->getRoomShareProvider();
266		- }
267		-
268		- if ($provider === null) {
269		- throw new ProviderException('No provider with id .' . $id . ' found.');
270		- }
271		-
272		- return $provider;
273		- }
274		-
275		- /**
276		- * @inheritdoc
277		- */
278		- public function getProviderForType($shareType) {
279		- $provider = null;
280		-
281		- if ($shareType === \OCP\Share::SHARE_TYPE_USER \|\|
282		- $shareType === \OCP\Share::SHARE_TYPE_GROUP \|\|
283		- $shareType === \OCP\Share::SHARE_TYPE_LINK
284		- ) {
285		- $provider = $this->defaultShareProvider();
286		- } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE \|\| $shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
287		- $provider = $this->federatedShareProvider();
288		- } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
289		- $provider = $this->getShareByMailProvider();
290		- } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
291		- $provider = $this->getShareByCircleProvider();
292		- } else if ($shareType === \OCP\Share::SHARE_TYPE_ROOM) {
293		- $provider = $this->getRoomShareProvider();
294		- }
295		-
296		-
297		- if ($provider === null) {
298		- throw new ProviderException('No share provider for share type ' . $shareType);
299		- }
300		-
301		- return $provider;
302		- }
303		-
304		- public function getAllProviders() {
305		- $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
306		- $shareByMail = $this->getShareByMailProvider();
307		- if ($shareByMail !== null) {
308		- $shares[] = $shareByMail;
309		- }
310		- $shareByCircle = $this->getShareByCircleProvider();
311		- if ($shareByCircle !== null) {
312		- $shares[] = $shareByCircle;
313		- }
314		- $roomShare = $this->getRoomShareProvider();
315		- if ($roomShare !== null) {
316		- $shares[] = $roomShare;
317		- }
318		-
319		- return $shares;
320		- }
	236	+ $appManager = $this->serverContainer->getAppManager();
	237	+ if (!$appManager->isEnabledForUser('spreed')) {
	238	+ return null;
	239	+ }
	240	+
	241	+ try {
	242	+ $this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
	243	+ } catch (\OCP\AppFramework\QueryException $e) {
	244	+ return null;
	245	+ }
	246	+ }
	247	+
	248	+ return $this->roomShareProvider;
	249	+ }
	250	+
	251	+ /**
	252	+ * @inheritdoc
	253	+ */
	254	+ public function getProvider($id) {
	255	+ $provider = null;
	256	+ if ($id === 'ocinternal') {
	257	+ $provider = $this->defaultShareProvider();
	258	+ } else if ($id === 'ocFederatedSharing') {
	259	+ $provider = $this->federatedShareProvider();
	260	+ } else if ($id === 'ocMailShare') {
	261	+ $provider = $this->getShareByMailProvider();
	262	+ } else if ($id === 'ocCircleShare') {
	263	+ $provider = $this->getShareByCircleProvider();
	264	+ } else if ($id === 'ocRoomShare') {
	265	+ $provider = $this->getRoomShareProvider();
	266	+ }
	267	+
	268	+ if ($provider === null) {
	269	+ throw new ProviderException('No provider with id .' . $id . ' found.');
	270	+ }
	271	+
	272	+ return $provider;
	273	+ }
	274	+
	275	+ /**
	276	+ * @inheritdoc
	277	+ */
	278	+ public function getProviderForType($shareType) {
	279	+ $provider = null;
	280	+
	281	+ if ($shareType === \OCP\Share::SHARE_TYPE_USER \|\|
	282	+ $shareType === \OCP\Share::SHARE_TYPE_GROUP \|\|
	283	+ $shareType === \OCP\Share::SHARE_TYPE_LINK
	284	+ ) {
	285	+ $provider = $this->defaultShareProvider();
	286	+ } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE \|\| $shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
	287	+ $provider = $this->federatedShareProvider();
	288	+ } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
	289	+ $provider = $this->getShareByMailProvider();
	290	+ } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
	291	+ $provider = $this->getShareByCircleProvider();
	292	+ } else if ($shareType === \OCP\Share::SHARE_TYPE_ROOM) {
	293	+ $provider = $this->getRoomShareProvider();
	294	+ }
	295	+
	296	+
	297	+ if ($provider === null) {
	298	+ throw new ProviderException('No share provider for share type ' . $shareType);
	299	+ }
	300	+
	301	+ return $provider;
	302	+ }
	303	+
	304	+ public function getAllProviders() {
	305	+ $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
	306	+ $shareByMail = $this->getShareByMailProvider();
	307	+ if ($shareByMail !== null) {
	308	+ $shares[] = $shareByMail;
	309	+ }
	310	+ $shareByCircle = $this->getShareByCircleProvider();
	311	+ if ($shareByCircle !== null) {
	312	+ $shares[] = $shareByCircle;
	313	+ }
	314	+ $roomShare = $this->getRoomShareProvider();
	315	+ if ($roomShare !== null) {
	316	+ $shares[] = $roomShare;
	317	+ }
	318	+
	319	+ return $shares;
	320	+ }
321	321	}

nextcloud / server

Push — master ( 07dffb...bd5189 )

Status

Category

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +86 added lines, -86 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +261 added lines, -261 removed lines patch added patch discarded remove patch