@@ -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 | } |
@@ -28,55 +28,55 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | - * e.g. 'ldap' |
|
48 | - * |
|
49 | - * @returns string |
|
50 | - */ |
|
51 | - public function getID() { |
|
52 | - return 'externalstorages'; |
|
53 | - } |
|
45 | + /** |
|
46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | + * e.g. 'ldap' |
|
48 | + * |
|
49 | + * @returns string |
|
50 | + */ |
|
51 | + public function getID() { |
|
52 | + return 'externalstorages'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | - * integration'. Use the L10N service to translate it. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getName() { |
|
62 | - return $this->l->t('External storages'); |
|
63 | - } |
|
55 | + /** |
|
56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | + * integration'. Use the L10N service to translate it. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getName() { |
|
62 | + return $this->l->t('External storages'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return int whether the form should be rather on the top or bottom of |
|
67 | - * the settings navigation. The sections are arranged in ascending order of |
|
68 | - * the priority values. It is required to return a value between 0 and 99. |
|
69 | - * |
|
70 | - * E.g.: 70 |
|
71 | - */ |
|
72 | - public function getPriority() { |
|
73 | - return 10; |
|
74 | - } |
|
65 | + /** |
|
66 | + * @return int whether the form should be rather on the top or bottom of |
|
67 | + * the settings navigation. The sections are arranged in ascending order of |
|
68 | + * the priority values. It is required to return a value between 0 and 99. |
|
69 | + * |
|
70 | + * E.g.: 70 |
|
71 | + */ |
|
72 | + public function getPriority() { |
|
73 | + return 10; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('files_external', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('files_external', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -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 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IAuthMechanismProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return AuthMechanism[] |
|
36 | - */ |
|
37 | - public function getAuthMechanisms(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return AuthMechanism[] |
|
36 | + */ |
|
37 | + public function getAuthMechanisms(); |
|
38 | 38 | |
39 | 39 | } |
@@ -31,14 +31,14 @@ |
||
31 | 31 | */ |
32 | 32 | class SessionStorageWrapper extends PermissionsMask { |
33 | 33 | |
34 | - /** |
|
35 | - * @param array $arguments ['storage' => $storage] |
|
36 | - */ |
|
37 | - public function __construct($arguments) { |
|
38 | - // disable sharing permission |
|
39 | - $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE; |
|
40 | - parent::__construct($arguments); |
|
41 | - } |
|
34 | + /** |
|
35 | + * @param array $arguments ['storage' => $storage] |
|
36 | + */ |
|
37 | + public function __construct($arguments) { |
|
38 | + // disable sharing permission |
|
39 | + $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE; |
|
40 | + parent::__construct($arguments); |
|
41 | + } |
|
42 | 42 | |
43 | 43 | } |
44 | 44 |
@@ -30,101 +30,101 @@ |
||
30 | 30 | |
31 | 31 | abstract class StreamWrapper extends \OC\Files\Storage\Common { |
32 | 32 | |
33 | - /** |
|
34 | - * @param string $path |
|
35 | - * @return string|null |
|
36 | - */ |
|
37 | - abstract public function constructUrl($path); |
|
38 | - |
|
39 | - public function mkdir($path) { |
|
40 | - return mkdir($this->constructUrl($path)); |
|
41 | - } |
|
42 | - |
|
43 | - public function rmdir($path) { |
|
44 | - if ($this->is_dir($path) && $this->isDeletable($path)) { |
|
45 | - $dh = $this->opendir($path); |
|
46 | - if (!is_resource($dh)) { |
|
47 | - return false; |
|
48 | - } |
|
49 | - while (($file = readdir($dh)) !== false) { |
|
50 | - if ($this->is_dir($path . '/' . $file)) { |
|
51 | - $this->rmdir($path . '/' . $file); |
|
52 | - } else { |
|
53 | - $this->unlink($path . '/' . $file); |
|
54 | - } |
|
55 | - } |
|
56 | - $url = $this->constructUrl($path); |
|
57 | - $success = rmdir($url); |
|
58 | - clearstatcache(false, $url); |
|
59 | - return $success; |
|
60 | - } else { |
|
61 | - return false; |
|
62 | - } |
|
63 | - } |
|
64 | - |
|
65 | - public function opendir($path) { |
|
66 | - return opendir($this->constructUrl($path)); |
|
67 | - } |
|
68 | - |
|
69 | - public function filetype($path) { |
|
70 | - return @filetype($this->constructUrl($path)); |
|
71 | - } |
|
72 | - |
|
73 | - public function file_exists($path) { |
|
74 | - return file_exists($this->constructUrl($path)); |
|
75 | - } |
|
76 | - |
|
77 | - public function unlink($path) { |
|
78 | - $url = $this->constructUrl($path); |
|
79 | - $success = unlink($url); |
|
80 | - // normally unlink() is supposed to do this implicitly, |
|
81 | - // but doing it anyway just to be sure |
|
82 | - clearstatcache(false, $url); |
|
83 | - return $success; |
|
84 | - } |
|
85 | - |
|
86 | - public function fopen($path, $mode) { |
|
87 | - return fopen($this->constructUrl($path), $mode); |
|
88 | - } |
|
89 | - |
|
90 | - public function touch($path, $mtime = null) { |
|
91 | - if ($this->file_exists($path)) { |
|
92 | - if (is_null($mtime)) { |
|
93 | - $fh = $this->fopen($path, 'a'); |
|
94 | - fwrite($fh, ''); |
|
95 | - fclose($fh); |
|
96 | - |
|
97 | - return true; |
|
98 | - } else { |
|
99 | - return false; //not supported |
|
100 | - } |
|
101 | - } else { |
|
102 | - $this->file_put_contents($path, ''); |
|
103 | - return true; |
|
104 | - } |
|
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * @param string $path |
|
109 | - * @param string $target |
|
110 | - */ |
|
111 | - public function getFile($path, $target) { |
|
112 | - return copy($this->constructUrl($path), $target); |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * @param string $target |
|
117 | - */ |
|
118 | - public function uploadFile($path, $target) { |
|
119 | - return copy($path, $this->constructUrl($target)); |
|
120 | - } |
|
121 | - |
|
122 | - public function rename($path1, $path2) { |
|
123 | - return rename($this->constructUrl($path1), $this->constructUrl($path2)); |
|
124 | - } |
|
125 | - |
|
126 | - public function stat($path) { |
|
127 | - return stat($this->constructUrl($path)); |
|
128 | - } |
|
33 | + /** |
|
34 | + * @param string $path |
|
35 | + * @return string|null |
|
36 | + */ |
|
37 | + abstract public function constructUrl($path); |
|
38 | + |
|
39 | + public function mkdir($path) { |
|
40 | + return mkdir($this->constructUrl($path)); |
|
41 | + } |
|
42 | + |
|
43 | + public function rmdir($path) { |
|
44 | + if ($this->is_dir($path) && $this->isDeletable($path)) { |
|
45 | + $dh = $this->opendir($path); |
|
46 | + if (!is_resource($dh)) { |
|
47 | + return false; |
|
48 | + } |
|
49 | + while (($file = readdir($dh)) !== false) { |
|
50 | + if ($this->is_dir($path . '/' . $file)) { |
|
51 | + $this->rmdir($path . '/' . $file); |
|
52 | + } else { |
|
53 | + $this->unlink($path . '/' . $file); |
|
54 | + } |
|
55 | + } |
|
56 | + $url = $this->constructUrl($path); |
|
57 | + $success = rmdir($url); |
|
58 | + clearstatcache(false, $url); |
|
59 | + return $success; |
|
60 | + } else { |
|
61 | + return false; |
|
62 | + } |
|
63 | + } |
|
64 | + |
|
65 | + public function opendir($path) { |
|
66 | + return opendir($this->constructUrl($path)); |
|
67 | + } |
|
68 | + |
|
69 | + public function filetype($path) { |
|
70 | + return @filetype($this->constructUrl($path)); |
|
71 | + } |
|
72 | + |
|
73 | + public function file_exists($path) { |
|
74 | + return file_exists($this->constructUrl($path)); |
|
75 | + } |
|
76 | + |
|
77 | + public function unlink($path) { |
|
78 | + $url = $this->constructUrl($path); |
|
79 | + $success = unlink($url); |
|
80 | + // normally unlink() is supposed to do this implicitly, |
|
81 | + // but doing it anyway just to be sure |
|
82 | + clearstatcache(false, $url); |
|
83 | + return $success; |
|
84 | + } |
|
85 | + |
|
86 | + public function fopen($path, $mode) { |
|
87 | + return fopen($this->constructUrl($path), $mode); |
|
88 | + } |
|
89 | + |
|
90 | + public function touch($path, $mtime = null) { |
|
91 | + if ($this->file_exists($path)) { |
|
92 | + if (is_null($mtime)) { |
|
93 | + $fh = $this->fopen($path, 'a'); |
|
94 | + fwrite($fh, ''); |
|
95 | + fclose($fh); |
|
96 | + |
|
97 | + return true; |
|
98 | + } else { |
|
99 | + return false; //not supported |
|
100 | + } |
|
101 | + } else { |
|
102 | + $this->file_put_contents($path, ''); |
|
103 | + return true; |
|
104 | + } |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * @param string $path |
|
109 | + * @param string $target |
|
110 | + */ |
|
111 | + public function getFile($path, $target) { |
|
112 | + return copy($this->constructUrl($path), $target); |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * @param string $target |
|
117 | + */ |
|
118 | + public function uploadFile($path, $target) { |
|
119 | + return copy($path, $this->constructUrl($target)); |
|
120 | + } |
|
121 | + |
|
122 | + public function rename($path1, $path2) { |
|
123 | + return rename($this->constructUrl($path1), $this->constructUrl($path2)); |
|
124 | + } |
|
125 | + |
|
126 | + public function stat($path) { |
|
127 | + return stat($this->constructUrl($path)); |
|
128 | + } |
|
129 | 129 | |
130 | 130 | } |