nextcloud /
server
@@ -25,33 +25,33 @@ |
||
| 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 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -33,90 +33,90 @@ |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 @@ |
||
| 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 @@ |
||
| 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 @@ |
||
| 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 @@ |
||
| 14 | 14 | <div class="body-login-container update two-factor"> |
| 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> |
@@ -23,18 +23,18 @@ |
||
| 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 @@ |
||
| 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 | |
@@ -214,7 +214,7 @@ discard block |
||
| 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 |
||
| 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; |
@@ -48,274 +48,274 @@ |
||
| 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 | } |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener); |
| 66 | 66 | $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener); |
| 67 | 67 | |
| 68 | -\OCA\Files\App::getNavigationManager()->add(function () { |
|
| 68 | +\OCA\Files\App::getNavigationManager()->add(function() { |
|
| 69 | 69 | $l = \OC::$server->getL10N('systemtags'); |
| 70 | 70 | return [ |
| 71 | 71 | 'id' => 'systemtagsfilter', |
@@ -30,18 +30,18 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | $eventDispatcher = \OC::$server->getEventDispatcher(); |
| 32 | 32 | $eventDispatcher->addListener( |
| 33 | - 'OCA\Files::loadAdditionalScripts', |
|
| 34 | - function() { |
|
| 35 | - // FIXME: no public API for these ? |
|
| 36 | - \OCP\Util::addScript('dist/systemtags'); |
|
| 37 | - \OCP\Util::addScript('systemtags', 'systemtags'); |
|
| 38 | - } |
|
| 33 | + 'OCA\Files::loadAdditionalScripts', |
|
| 34 | + function() { |
|
| 35 | + // FIXME: no public API for these ? |
|
| 36 | + \OCP\Util::addScript('dist/systemtags'); |
|
| 37 | + \OCP\Util::addScript('systemtags', 'systemtags'); |
|
| 38 | + } |
|
| 39 | 39 | ); |
| 40 | 40 | |
| 41 | 41 | $managerListener = function(ManagerEvent $event) { |
| 42 | - /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 43 | - $listener = \OC::$server->query(Listener::class); |
|
| 44 | - $listener->event($event); |
|
| 42 | + /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 43 | + $listener = \OC::$server->query(Listener::class); |
|
| 44 | + $listener->event($event); |
|
| 45 | 45 | }; |
| 46 | 46 | |
| 47 | 47 | $eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener); |
@@ -49,23 +49,23 @@ discard block |
||
| 49 | 49 | $eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener); |
| 50 | 50 | |
| 51 | 51 | $mapperListener = function(MapperEvent $event) { |
| 52 | - $application = new \OCP\AppFramework\App('systemtags'); |
|
| 53 | - /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 54 | - $listener = \OC::$server->query(Listener::class); |
|
| 55 | - $listener->mapperEvent($event); |
|
| 52 | + $application = new \OCP\AppFramework\App('systemtags'); |
|
| 53 | + /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 54 | + $listener = \OC::$server->query(Listener::class); |
|
| 55 | + $listener->mapperEvent($event); |
|
| 56 | 56 | }; |
| 57 | 57 | |
| 58 | 58 | $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener); |
| 59 | 59 | $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener); |
| 60 | 60 | |
| 61 | 61 | \OCA\Files\App::getNavigationManager()->add(function () { |
| 62 | - $l = \OC::$server->getL10N('systemtags'); |
|
| 63 | - return [ |
|
| 64 | - 'id' => 'systemtagsfilter', |
|
| 65 | - 'appname' => 'systemtags', |
|
| 66 | - 'script' => 'list.php', |
|
| 67 | - 'order' => 25, |
|
| 68 | - 'name' => $l->t('Tags'), |
|
| 69 | - ]; |
|
| 62 | + $l = \OC::$server->getL10N('systemtags'); |
|
| 63 | + return [ |
|
| 64 | + 'id' => 'systemtagsfilter', |
|
| 65 | + 'appname' => 'systemtags', |
|
| 66 | + 'script' => 'list.php', |
|
| 67 | + 'order' => 25, |
|
| 68 | + 'name' => $l->t('Tags'), |
|
| 69 | + ]; |
|
| 70 | 70 | }); |
| 71 | 71 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | // register hooks |
| 29 | 29 | \OCA\Files_Trashbin\Trashbin::registerHooks(); |
| 30 | 30 | |
| 31 | -\OCA\Files\App::getNavigationManager()->add(function () { |
|
| 31 | +\OCA\Files\App::getNavigationManager()->add(function() { |
|
| 32 | 32 | $l = \OC::$server->getL10N('files_trashbin'); |
| 33 | 33 | return [ |
| 34 | 34 | 'id' => 'trashbin', |
@@ -29,13 +29,13 @@ |
||
| 29 | 29 | \OCA\Files_Trashbin\Trashbin::registerHooks(); |
| 30 | 30 | |
| 31 | 31 | \OCA\Files\App::getNavigationManager()->add(function () { |
| 32 | - $l = \OC::$server->getL10N('files_trashbin'); |
|
| 33 | - return [ |
|
| 34 | - 'id' => 'trashbin', |
|
| 35 | - 'appname' => 'files_trashbin', |
|
| 36 | - 'script' => 'list.php', |
|
| 37 | - 'order' => 50, |
|
| 38 | - 'name' => $l->t('Deleted files'), |
|
| 39 | - 'classes' => 'pinned', |
|
| 40 | - ]; |
|
| 32 | + $l = \OC::$server->getL10N('files_trashbin'); |
|
| 33 | + return [ |
|
| 34 | + 'id' => 'trashbin', |
|
| 35 | + 'appname' => 'files_trashbin', |
|
| 36 | + 'script' => 'list.php', |
|
| 37 | + 'order' => 50, |
|
| 38 | + 'name' => $l->t('Deleted files'), |
|
| 39 | + 'classes' => 'pinned', |
|
| 40 | + ]; |
|
| 41 | 41 | }); |
