@@ -32,129 +32,129 @@ |
||
| 32 | 32 | |
| 33 | 33 | class Favorites implements IFilter { |
| 34 | 34 | |
| 35 | - /** @var IL10N */ |
|
| 36 | - protected $l; |
|
| 37 | - |
|
| 38 | - /** @var IURLGenerator */ |
|
| 39 | - protected $url; |
|
| 40 | - |
|
| 41 | - /** @var IManager */ |
|
| 42 | - protected $activityManager; |
|
| 43 | - |
|
| 44 | - /** @var Helper */ |
|
| 45 | - protected $helper; |
|
| 46 | - |
|
| 47 | - /** @var IDBConnection */ |
|
| 48 | - protected $db; |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * @param IL10N $l |
|
| 52 | - * @param IURLGenerator $url |
|
| 53 | - * @param IManager $activityManager |
|
| 54 | - * @param Helper $helper |
|
| 55 | - * @param IDBConnection $db |
|
| 56 | - */ |
|
| 57 | - public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) { |
|
| 58 | - $this->l = $l; |
|
| 59 | - $this->url = $url; |
|
| 60 | - $this->activityManager = $activityManager; |
|
| 61 | - $this->helper = $helper; |
|
| 62 | - $this->db = $db; |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - /** |
|
| 66 | - * @return string Lowercase a-z only identifier |
|
| 67 | - * @since 11.0.0 |
|
| 68 | - */ |
|
| 69 | - public function getIdentifier() { |
|
| 70 | - return 'files_favorites'; |
|
| 71 | - } |
|
| 72 | - |
|
| 73 | - /** |
|
| 74 | - * @return string A translated string |
|
| 75 | - * @since 11.0.0 |
|
| 76 | - */ |
|
| 77 | - public function getName() { |
|
| 78 | - return $this->l->t('Favorites'); |
|
| 79 | - } |
|
| 80 | - |
|
| 81 | - /** |
|
| 82 | - * @return int |
|
| 83 | - * @since 11.0.0 |
|
| 84 | - */ |
|
| 85 | - public function getPriority() { |
|
| 86 | - return 10; |
|
| 87 | - } |
|
| 88 | - |
|
| 89 | - /** |
|
| 90 | - * @return string Full URL to an icon, empty string when none is given |
|
| 91 | - * @since 11.0.0 |
|
| 92 | - */ |
|
| 93 | - public function getIcon() { |
|
| 94 | - return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg')); |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - /** |
|
| 98 | - * @param string[] $types |
|
| 99 | - * @return string[] An array of allowed apps from which activities should be displayed |
|
| 100 | - * @since 11.0.0 |
|
| 101 | - */ |
|
| 102 | - public function filterTypes(array $types) { |
|
| 103 | - return array_intersect([ |
|
| 104 | - 'file_created', |
|
| 105 | - 'file_changed', |
|
| 106 | - 'file_deleted', |
|
| 107 | - 'file_restored', |
|
| 108 | - ], $types); |
|
| 109 | - } |
|
| 110 | - |
|
| 111 | - /** |
|
| 112 | - * @return string[] An array of allowed apps from which activities should be displayed |
|
| 113 | - * @since 11.0.0 |
|
| 114 | - */ |
|
| 115 | - public function allowedApps() { |
|
| 116 | - return ['files']; |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - /** |
|
| 120 | - * @param IQueryBuilder $query |
|
| 121 | - */ |
|
| 122 | - public function filterFavorites(IQueryBuilder $query) { |
|
| 123 | - try { |
|
| 124 | - $user = $this->activityManager->getCurrentUserId(); |
|
| 125 | - } catch (\UnexpectedValueException $e) { |
|
| 126 | - return; |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - try { |
|
| 130 | - $favorites = $this->helper->getFavoriteFilePaths($user); |
|
| 131 | - } catch (\RuntimeException $e) { |
|
| 132 | - return; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - $limitations = []; |
|
| 136 | - if (!empty($favorites['items'])) { |
|
| 137 | - $limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY)); |
|
| 138 | - } |
|
| 139 | - foreach ($favorites['folders'] as $favorite) { |
|
| 140 | - $limitations[] = $query->expr()->like('file', $query->createNamedParameter( |
|
| 141 | - $this->db->escapeLikeParameter($favorite . '/') . '%' |
|
| 142 | - )); |
|
| 143 | - } |
|
| 144 | - |
|
| 145 | - if (empty($limitations)) { |
|
| 146 | - return; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - $function = $query->createFunction(' |
|
| 35 | + /** @var IL10N */ |
|
| 36 | + protected $l; |
|
| 37 | + |
|
| 38 | + /** @var IURLGenerator */ |
|
| 39 | + protected $url; |
|
| 40 | + |
|
| 41 | + /** @var IManager */ |
|
| 42 | + protected $activityManager; |
|
| 43 | + |
|
| 44 | + /** @var Helper */ |
|
| 45 | + protected $helper; |
|
| 46 | + |
|
| 47 | + /** @var IDBConnection */ |
|
| 48 | + protected $db; |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * @param IL10N $l |
|
| 52 | + * @param IURLGenerator $url |
|
| 53 | + * @param IManager $activityManager |
|
| 54 | + * @param Helper $helper |
|
| 55 | + * @param IDBConnection $db |
|
| 56 | + */ |
|
| 57 | + public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) { |
|
| 58 | + $this->l = $l; |
|
| 59 | + $this->url = $url; |
|
| 60 | + $this->activityManager = $activityManager; |
|
| 61 | + $this->helper = $helper; |
|
| 62 | + $this->db = $db; |
|
| 63 | + } |
|
| 64 | + |
|
| 65 | + /** |
|
| 66 | + * @return string Lowercase a-z only identifier |
|
| 67 | + * @since 11.0.0 |
|
| 68 | + */ |
|
| 69 | + public function getIdentifier() { |
|
| 70 | + return 'files_favorites'; |
|
| 71 | + } |
|
| 72 | + |
|
| 73 | + /** |
|
| 74 | + * @return string A translated string |
|
| 75 | + * @since 11.0.0 |
|
| 76 | + */ |
|
| 77 | + public function getName() { |
|
| 78 | + return $this->l->t('Favorites'); |
|
| 79 | + } |
|
| 80 | + |
|
| 81 | + /** |
|
| 82 | + * @return int |
|
| 83 | + * @since 11.0.0 |
|
| 84 | + */ |
|
| 85 | + public function getPriority() { |
|
| 86 | + return 10; |
|
| 87 | + } |
|
| 88 | + |
|
| 89 | + /** |
|
| 90 | + * @return string Full URL to an icon, empty string when none is given |
|
| 91 | + * @since 11.0.0 |
|
| 92 | + */ |
|
| 93 | + public function getIcon() { |
|
| 94 | + return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg')); |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + /** |
|
| 98 | + * @param string[] $types |
|
| 99 | + * @return string[] An array of allowed apps from which activities should be displayed |
|
| 100 | + * @since 11.0.0 |
|
| 101 | + */ |
|
| 102 | + public function filterTypes(array $types) { |
|
| 103 | + return array_intersect([ |
|
| 104 | + 'file_created', |
|
| 105 | + 'file_changed', |
|
| 106 | + 'file_deleted', |
|
| 107 | + 'file_restored', |
|
| 108 | + ], $types); |
|
| 109 | + } |
|
| 110 | + |
|
| 111 | + /** |
|
| 112 | + * @return string[] An array of allowed apps from which activities should be displayed |
|
| 113 | + * @since 11.0.0 |
|
| 114 | + */ |
|
| 115 | + public function allowedApps() { |
|
| 116 | + return ['files']; |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + /** |
|
| 120 | + * @param IQueryBuilder $query |
|
| 121 | + */ |
|
| 122 | + public function filterFavorites(IQueryBuilder $query) { |
|
| 123 | + try { |
|
| 124 | + $user = $this->activityManager->getCurrentUserId(); |
|
| 125 | + } catch (\UnexpectedValueException $e) { |
|
| 126 | + return; |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + try { |
|
| 130 | + $favorites = $this->helper->getFavoriteFilePaths($user); |
|
| 131 | + } catch (\RuntimeException $e) { |
|
| 132 | + return; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + $limitations = []; |
|
| 136 | + if (!empty($favorites['items'])) { |
|
| 137 | + $limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY)); |
|
| 138 | + } |
|
| 139 | + foreach ($favorites['folders'] as $favorite) { |
|
| 140 | + $limitations[] = $query->expr()->like('file', $query->createNamedParameter( |
|
| 141 | + $this->db->escapeLikeParameter($favorite . '/') . '%' |
|
| 142 | + )); |
|
| 143 | + } |
|
| 144 | + |
|
| 145 | + if (empty($limitations)) { |
|
| 146 | + return; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + $function = $query->createFunction(' |
|
| 150 | 150 | CASE |
| 151 | 151 | WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1 |
| 152 | 152 | WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . ' |
| 153 | 153 | AND (' . implode(' OR ', $limitations) . ') |
| 154 | 154 | THEN 1 |
| 155 | 155 | END = 1' |
| 156 | - ); |
|
| 156 | + ); |
|
| 157 | 157 | |
| 158 | - $query->andWhere($function); |
|
| 159 | - } |
|
| 158 | + $query->andWhere($function); |
|
| 159 | + } |
|
| 160 | 160 | } |
@@ -24,26 +24,26 @@ |
||
| 24 | 24 | |
| 25 | 25 | interface IUserLDAP { |
| 26 | 26 | |
| 27 | - //Functions used by LDAPProvider |
|
| 27 | + //Functions used by LDAPProvider |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Return access for LDAP interaction. |
|
| 31 | - * @param string $uid |
|
| 32 | - * @return Access instance of Access for LDAP interaction |
|
| 33 | - */ |
|
| 34 | - public function getLDAPAccess($uid); |
|
| 29 | + /** |
|
| 30 | + * Return access for LDAP interaction. |
|
| 31 | + * @param string $uid |
|
| 32 | + * @return Access instance of Access for LDAP interaction |
|
| 33 | + */ |
|
| 34 | + public function getLDAPAccess($uid); |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Return a new LDAP connection for the specified user. |
|
| 38 | - * @param string $uid |
|
| 39 | - * @return resource of the LDAP connection |
|
| 40 | - */ |
|
| 41 | - public function getNewLDAPConnection($uid); |
|
| 36 | + /** |
|
| 37 | + * Return a new LDAP connection for the specified user. |
|
| 38 | + * @param string $uid |
|
| 39 | + * @return resource of the LDAP connection |
|
| 40 | + */ |
|
| 41 | + public function getNewLDAPConnection($uid); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Return the username for the given LDAP DN, if available. |
|
| 45 | - * @param string $dn |
|
| 46 | - * @return string|false with the username |
|
| 47 | - */ |
|
| 48 | - public function dn2UserName($dn); |
|
| 43 | + /** |
|
| 44 | + * Return the username for the given LDAP DN, if available. |
|
| 45 | + * @param string $dn |
|
| 46 | + * @return string|false with the username |
|
| 47 | + */ |
|
| 48 | + public function dn2UserName($dn); |
|
| 49 | 49 | } |
@@ -26,13 +26,13 @@ |
||
| 26 | 26 | namespace OCA\User_LDAP; |
| 27 | 27 | |
| 28 | 28 | abstract class LDAPUtility { |
| 29 | - protected $ldap; |
|
| 29 | + protected $ldap; |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * constructor, make sure the subclasses call this one! |
|
| 33 | - * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper |
|
| 34 | - */ |
|
| 35 | - public function __construct(ILDAPWrapper $ldapWrapper) { |
|
| 36 | - $this->ldap = $ldapWrapper; |
|
| 37 | - } |
|
| 31 | + /** |
|
| 32 | + * constructor, make sure the subclasses call this one! |
|
| 33 | + * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper |
|
| 34 | + */ |
|
| 35 | + public function __construct(ILDAPWrapper $ldapWrapper) { |
|
| 36 | + $this->ldap = $ldapWrapper; |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -24,25 +24,25 @@ |
||
| 24 | 24 | namespace OCA\Files_External\Service; |
| 25 | 25 | |
| 26 | 26 | class ImportLegacyStoragesService extends LegacyStoragesService { |
| 27 | - private $data; |
|
| 27 | + private $data; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * @param BackendService $backendService |
|
| 31 | - */ |
|
| 32 | - public function __construct(BackendService $backendService) { |
|
| 33 | - $this->backendService = $backendService; |
|
| 34 | - } |
|
| 29 | + /** |
|
| 30 | + * @param BackendService $backendService |
|
| 31 | + */ |
|
| 32 | + public function __construct(BackendService $backendService) { |
|
| 33 | + $this->backendService = $backendService; |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - public function setData($data) { |
|
| 37 | - $this->data = $data; |
|
| 38 | - } |
|
| 36 | + public function setData($data) { |
|
| 37 | + $this->data = $data; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Read legacy config data |
|
| 42 | - * |
|
| 43 | - * @return array list of mount configs |
|
| 44 | - */ |
|
| 45 | - protected function readLegacyConfig() { |
|
| 46 | - return $this->data; |
|
| 47 | - } |
|
| 40 | + /** |
|
| 41 | + * Read legacy config data |
|
| 42 | + * |
|
| 43 | + * @return array list of mount configs |
|
| 44 | + */ |
|
| 45 | + protected function readLegacyConfig() { |
|
| 46 | + return $this->data; |
|
| 47 | + } |
|
| 48 | 48 | } |
@@ -28,50 +28,50 @@ |
||
| 28 | 28 | use Symfony\Component\Console\Output\OutputInterface; |
| 29 | 29 | |
| 30 | 30 | class Option extends Config { |
| 31 | - protected function configure() { |
|
| 32 | - $this |
|
| 33 | - ->setName('files_external:option') |
|
| 34 | - ->setDescription('Manage mount options for a mount') |
|
| 35 | - ->addArgument( |
|
| 36 | - 'mount_id', |
|
| 37 | - InputArgument::REQUIRED, |
|
| 38 | - 'The id of the mount to edit' |
|
| 39 | - )->addArgument( |
|
| 40 | - 'key', |
|
| 41 | - InputArgument::REQUIRED, |
|
| 42 | - 'key of the mount option to set/get' |
|
| 43 | - )->addArgument( |
|
| 44 | - 'value', |
|
| 45 | - InputArgument::OPTIONAL, |
|
| 46 | - 'value to set the mount option to, when no value is provided the existing value will be printed' |
|
| 47 | - ); |
|
| 48 | - } |
|
| 31 | + protected function configure() { |
|
| 32 | + $this |
|
| 33 | + ->setName('files_external:option') |
|
| 34 | + ->setDescription('Manage mount options for a mount') |
|
| 35 | + ->addArgument( |
|
| 36 | + 'mount_id', |
|
| 37 | + InputArgument::REQUIRED, |
|
| 38 | + 'The id of the mount to edit' |
|
| 39 | + )->addArgument( |
|
| 40 | + 'key', |
|
| 41 | + InputArgument::REQUIRED, |
|
| 42 | + 'key of the mount option to set/get' |
|
| 43 | + )->addArgument( |
|
| 44 | + 'value', |
|
| 45 | + InputArgument::OPTIONAL, |
|
| 46 | + 'value to set the mount option to, when no value is provided the existing value will be printed' |
|
| 47 | + ); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @param StorageConfig $mount |
|
| 52 | - * @param string $key |
|
| 53 | - * @param OutputInterface $output |
|
| 54 | - */ |
|
| 55 | - protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
| 56 | - $value = $mount->getMountOption($key); |
|
| 57 | - if (!is_string($value)) { // show bools and objects correctly |
|
| 58 | - $value = json_encode($value); |
|
| 59 | - } |
|
| 60 | - $output->writeln($value); |
|
| 61 | - } |
|
| 50 | + /** |
|
| 51 | + * @param StorageConfig $mount |
|
| 52 | + * @param string $key |
|
| 53 | + * @param OutputInterface $output |
|
| 54 | + */ |
|
| 55 | + protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
| 56 | + $value = $mount->getMountOption($key); |
|
| 57 | + if (!is_string($value)) { // show bools and objects correctly |
|
| 58 | + $value = json_encode($value); |
|
| 59 | + } |
|
| 60 | + $output->writeln($value); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @param StorageConfig $mount |
|
| 65 | - * @param string $key |
|
| 66 | - * @param string $value |
|
| 67 | - * @param OutputInterface $output |
|
| 68 | - */ |
|
| 69 | - protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
| 70 | - $decoded = json_decode($value, true); |
|
| 71 | - if (!is_null($decoded)) { |
|
| 72 | - $value = $decoded; |
|
| 73 | - } |
|
| 74 | - $mount->setMountOption($key, $value); |
|
| 75 | - $this->globalService->updateStorage($mount); |
|
| 76 | - } |
|
| 63 | + /** |
|
| 64 | + * @param StorageConfig $mount |
|
| 65 | + * @param string $key |
|
| 66 | + * @param string $value |
|
| 67 | + * @param OutputInterface $output |
|
| 68 | + */ |
|
| 69 | + protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
| 70 | + $decoded = json_decode($value, true); |
|
| 71 | + if (!is_null($decoded)) { |
|
| 72 | + $value = $decoded; |
|
| 73 | + } |
|
| 74 | + $mount->setMountOption($key, $value); |
|
| 75 | + $this->globalService->updateStorage($mount); |
|
| 76 | + } |
|
| 77 | 77 | } |
@@ -29,43 +29,43 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | trait LegacyDependencyCheckPolyfill { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @return string |
|
| 34 | - */ |
|
| 35 | - abstract public function getStorageClass(); |
|
| 32 | + /** |
|
| 33 | + * @return string |
|
| 34 | + */ |
|
| 35 | + abstract public function getStorageClass(); |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Check if object is valid for use |
|
| 39 | - * |
|
| 40 | - * @return MissingDependency[] Unsatisfied dependencies |
|
| 41 | - */ |
|
| 42 | - public function checkDependencies() { |
|
| 43 | - $ret = []; |
|
| 37 | + /** |
|
| 38 | + * Check if object is valid for use |
|
| 39 | + * |
|
| 40 | + * @return MissingDependency[] Unsatisfied dependencies |
|
| 41 | + */ |
|
| 42 | + public function checkDependencies() { |
|
| 43 | + $ret = []; |
|
| 44 | 44 | |
| 45 | - $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
| 46 | - if ($result !== true) { |
|
| 47 | - if (!is_array($result)) { |
|
| 48 | - $result = [$result]; |
|
| 49 | - } |
|
| 50 | - foreach ($result as $key => $value) { |
|
| 51 | - if (!($value instanceof MissingDependency)) { |
|
| 52 | - $module = null; |
|
| 53 | - $message = null; |
|
| 54 | - if (is_numeric($key)) { |
|
| 55 | - $module = $value; |
|
| 56 | - } else { |
|
| 57 | - $module = $key; |
|
| 58 | - $message = $value; |
|
| 59 | - } |
|
| 60 | - $value = new MissingDependency($module, $this); |
|
| 61 | - $value->setMessage($message); |
|
| 62 | - } |
|
| 63 | - $ret[] = $value; |
|
| 64 | - } |
|
| 65 | - } |
|
| 45 | + $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
| 46 | + if ($result !== true) { |
|
| 47 | + if (!is_array($result)) { |
|
| 48 | + $result = [$result]; |
|
| 49 | + } |
|
| 50 | + foreach ($result as $key => $value) { |
|
| 51 | + if (!($value instanceof MissingDependency)) { |
|
| 52 | + $module = null; |
|
| 53 | + $message = null; |
|
| 54 | + if (is_numeric($key)) { |
|
| 55 | + $module = $value; |
|
| 56 | + } else { |
|
| 57 | + $module = $key; |
|
| 58 | + $message = $value; |
|
| 59 | + } |
|
| 60 | + $value = new MissingDependency($module, $this); |
|
| 61 | + $value->setMessage($message); |
|
| 62 | + } |
|
| 63 | + $ret[] = $value; |
|
| 64 | + } |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - return $ret; |
|
| 68 | - } |
|
| 67 | + return $ret; |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | 70 | } |
| 71 | 71 | |
@@ -39,31 +39,31 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | class SessionCredentials extends AuthMechanism { |
| 41 | 41 | |
| 42 | - /** @var CredentialsStore */ |
|
| 43 | - private $credentialsStore; |
|
| 42 | + /** @var CredentialsStore */ |
|
| 43 | + private $credentialsStore; |
|
| 44 | 44 | |
| 45 | - public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
| 46 | - $this->credentialsStore = $credentialsStore; |
|
| 45 | + public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
| 46 | + $this->credentialsStore = $credentialsStore; |
|
| 47 | 47 | |
| 48 | - $this->setIdentifier('password::sessioncredentials') |
|
| 49 | - ->setScheme(self::SCHEME_PASSWORD) |
|
| 50 | - ->setText($l->t('Log-in credentials, save in session')) |
|
| 51 | - ->addParameters([]); |
|
| 52 | - } |
|
| 48 | + $this->setIdentifier('password::sessioncredentials') |
|
| 49 | + ->setScheme(self::SCHEME_PASSWORD) |
|
| 50 | + ->setText($l->t('Log-in credentials, save in session')) |
|
| 51 | + ->addParameters([]); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 55 | - try { |
|
| 56 | - $credentials = $this->credentialsStore->getLoginCredentials(); |
|
| 57 | - } catch (CredentialsUnavailableException $e) { |
|
| 58 | - throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
| 59 | - } |
|
| 54 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 55 | + try { |
|
| 56 | + $credentials = $this->credentialsStore->getLoginCredentials(); |
|
| 57 | + } catch (CredentialsUnavailableException $e) { |
|
| 58 | + throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - $storage->setBackendOption('user', $credentials->getLoginName()); |
|
| 62 | - $storage->setBackendOption('password', $credentials->getPassword()); |
|
| 63 | - } |
|
| 61 | + $storage->setBackendOption('user', $credentials->getLoginName()); |
|
| 62 | + $storage->setBackendOption('password', $credentials->getPassword()); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - public function wrapStorage(Storage $storage) { |
|
| 66 | - return new SessionStorageWrapper(['storage' => $storage]); |
|
| 67 | - } |
|
| 65 | + public function wrapStorage(Storage $storage) { |
|
| 66 | + return new SessionStorageWrapper(['storage' => $storage]); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | 69 | } |
@@ -28,10 +28,10 @@ |
||
| 28 | 28 | * For auth mechanisms where the user needs to provide credentials |
| 29 | 29 | */ |
| 30 | 30 | interface IUserProvided { |
| 31 | - /** |
|
| 32 | - * @param IUser $user the user for which to save the user provided options |
|
| 33 | - * @param int $mountId the mount id to save the options for |
|
| 34 | - * @param array $options the user provided options |
|
| 35 | - */ |
|
| 36 | - public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
| 31 | + /** |
|
| 32 | + * @param IUser $user the user for which to save the user provided options |
|
| 33 | + * @param int $mountId the mount id to save the options for |
|
| 34 | + * @param array $options the user provided options |
|
| 35 | + */ |
|
| 36 | + public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
| 37 | 37 | } |
@@ -30,10 +30,10 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | interface IBackendProvider { |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @since 9.1.0 |
|
| 35 | - * @return Backend[] |
|
| 36 | - */ |
|
| 37 | - public function getBackends(); |
|
| 33 | + /** |
|
| 34 | + * @since 9.1.0 |
|
| 35 | + * @return Backend[] |
|
| 36 | + */ |
|
| 37 | + public function getBackends(); |
|
| 38 | 38 | |
| 39 | 39 | } |