@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | $backend = $input->getArgument('backend'); |
72 | 72 | if ($type) { |
73 | 73 | if (!isset($data[$type])) { |
74 | - $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
74 | + $output->writeln('<error>Invalid type "'.$type.'". Possible values are "authentication" or "storage"</error>'); |
|
75 | 75 | return 1; |
76 | 76 | } |
77 | 77 | $data = $data[$type]; |
78 | 78 | |
79 | 79 | if ($backend) { |
80 | 80 | if (!isset($data[$backend])) { |
81 | - $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
81 | + $output->writeln('<error>Unknown backend "'.$backend.'" of type "'.$type.'"</error>'); |
|
82 | 82 | return 1; |
83 | 83 | } |
84 | 84 | $data = $data[$backend]; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $result['storage_class'] = $backend->getStorageClass(); |
100 | 100 | $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
101 | 101 | $result['supported_authentication_backends'] = array_keys($authBackends); |
102 | - $authConfig = array_map(function (AuthMechanism $auth) { |
|
102 | + $authConfig = array_map(function(AuthMechanism $auth) { |
|
103 | 103 | return $this->serializeAuthBackend($auth)['configuration']; |
104 | 104 | }, $authBackends); |
105 | 105 | $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
@@ -112,10 +112,10 @@ discard block |
||
112 | 112 | * @return string[] |
113 | 113 | */ |
114 | 114 | private function formatConfiguration(array $parameters) { |
115 | - $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
115 | + $configuration = array_filter($parameters, function(DefinitionParameter $parameter) { |
|
116 | 116 | return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
117 | 117 | }); |
118 | - return array_map(function (DefinitionParameter $parameter) { |
|
118 | + return array_map(function(DefinitionParameter $parameter) { |
|
119 | 119 | return $parameter->getTypeName(); |
120 | 120 | }, $configuration); |
121 | 121 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $json = file_get_contents('php://stdin'); |
113 | 113 | } else { |
114 | 114 | if (!file_exists($path)) { |
115 | - $output->writeln('<error>File not found: ' . $path . '</error>'); |
|
115 | + $output->writeln('<error>File not found: '.$path.'</error>'); |
|
116 | 116 | return 1; |
117 | 117 | } |
118 | 118 | $json = file_get_contents($path); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $existingMount->getApplicableUsers() == $mount->getApplicableUsers() && |
165 | 165 | $existingMount->getBackendOptions() == $mount->getBackendOptions() |
166 | 166 | ) { |
167 | - $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); |
|
167 | + $output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>"); |
|
168 | 168 | return 1; |
169 | 169 | } |
170 | 170 | } |
@@ -140,7 +140,7 @@ |
||
140 | 140 | * @return bool |
141 | 141 | */ |
142 | 142 | public function isFlagSet($flag) { |
143 | - return (bool)($this->flags & $flag); |
|
143 | + return (bool) ($this->flags & $flag); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | /** |
@@ -51,7 +51,7 @@ |
||
51 | 51 | ->addParameters([]); |
52 | 52 | } |
53 | 53 | |
54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
54 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
55 | 55 | try { |
56 | 56 | $credentials = $this->credentialsStore->getLoginCredentials(); |
57 | 57 | } catch (CredentialsUnavailableException $e) { |
@@ -75,7 +75,7 @@ |
||
75 | 75 | $this->credentialsManager->store($userId, self::CREDENTIALS_IDENTIFIER, $credentials); |
76 | 76 | } |
77 | 77 | |
78 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
78 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
79 | 79 | if (!isset($user)) { |
80 | 80 | throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved'); |
81 | 81 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | private function getCredentialsIdentifier($storageId) { |
64 | - return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId; |
|
64 | + return self::CREDENTIALS_IDENTIFIER_PREFIX.$storageId; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | public function saveBackendOptions(IUser $user, $id, array $options) { |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | ]); |
72 | 72 | } |
73 | 73 | |
74 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
74 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
75 | 75 | if (!isset($user)) { |
76 | 76 | throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
77 | 77 | } |
@@ -70,7 +70,7 @@ |
||
70 | 70 | ]); |
71 | 71 | } |
72 | 72 | |
73 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
73 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
74 | 74 | if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) { |
75 | 75 | $uid = ''; |
76 | 76 | } elseif (is_null($user)) { |
@@ -57,7 +57,7 @@ |
||
57 | 57 | ; |
58 | 58 | } |
59 | 59 | |
60 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
60 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
61 | 61 | $auth = new RSACrypt(); |
62 | 62 | $auth->setPassword($this->config->getSystemValue('secret', '')); |
63 | 63 | if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
@@ -62,11 +62,11 @@ discard block |
||
62 | 62 | $input = $host; |
63 | 63 | if (strpos($host, '://') === false) { |
64 | 64 | // add a protocol to fix parse_url behavior with ipv6 |
65 | - $host = 'http://' . $host; |
|
65 | + $host = 'http://'.$host; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $parsed = parse_url($host); |
69 | - if(is_array($parsed) && isset($parsed['port'])) { |
|
69 | + if (is_array($parsed) && isset($parsed['port'])) { |
|
70 | 70 | return [$parsed['host'], $parsed['port']]; |
71 | 71 | } else if (is_array($parsed)) { |
72 | 72 | return [$parsed['host'], 22]; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | // Register sftp:// |
83 | 83 | Stream::register(); |
84 | 84 | |
85 | - $parsedHost = $this->splitHost($params['host']); |
|
85 | + $parsedHost = $this->splitHost($params['host']); |
|
86 | 86 | |
87 | 87 | $this->host = $parsedHost[0]; |
88 | 88 | $this->port = $parsedHost[1]; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | = isset($params['root']) ? $this->cleanPath($params['root']) : '/'; |
105 | 105 | |
106 | 106 | if ($this->root[0] != '/') { |
107 | - $this->root = '/' . $this->root; |
|
107 | + $this->root = '/'.$this->root; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | if (substr($this->root, -1, 1) != '/') { |
@@ -159,15 +159,15 @@ discard block |
||
159 | 159 | /** |
160 | 160 | * {@inheritdoc} |
161 | 161 | */ |
162 | - public function getId(){ |
|
163 | - $id = 'sftp::' . $this->user . '@' . $this->host; |
|
162 | + public function getId() { |
|
163 | + $id = 'sftp::'.$this->user.'@'.$this->host; |
|
164 | 164 | if ($this->port !== 22) { |
165 | - $id .= ':' . $this->port; |
|
165 | + $id .= ':'.$this->port; |
|
166 | 166 | } |
167 | 167 | // note: this will double the root slash, |
168 | 168 | // we should not change it to keep compatible with |
169 | 169 | // old storage ids |
170 | - $id .= '/' . $this->root; |
|
170 | + $id .= '/'.$this->root; |
|
171 | 171 | return $id; |
172 | 172 | } |
173 | 173 | |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | * @return string |
198 | 198 | */ |
199 | 199 | private function absPath($path) { |
200 | - return $this->root . $this->cleanPath($path); |
|
200 | + return $this->root.$this->cleanPath($path); |
|
201 | 201 | } |
202 | 202 | |
203 | 203 | /** |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | try { |
208 | 208 | $storage_view = \OCP\Files::getStorage('files_external'); |
209 | 209 | if ($storage_view) { |
210 | - return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . |
|
211 | - $storage_view->getAbsolutePath('') . |
|
210 | + return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data'). |
|
211 | + $storage_view->getAbsolutePath(''). |
|
212 | 212 | 'ssh_hostKeys'; |
213 | 213 | } |
214 | 214 | } catch (\Exception $e) { |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | if ($keyPath && file_exists($keyPath)) { |
227 | 227 | $fp = fopen($keyPath, 'w'); |
228 | 228 | foreach ($keys as $host => $key) { |
229 | - fwrite($fp, $host . '::' . $key . "\n"); |
|
229 | + fwrite($fp, $host.'::'.$key."\n"); |
|
230 | 230 | } |
231 | 231 | fclose($fp); |
232 | 232 | return true; |
@@ -298,15 +298,15 @@ discard block |
||
298 | 298 | return false; |
299 | 299 | } |
300 | 300 | |
301 | - $id = md5('sftp:' . $path); |
|
301 | + $id = md5('sftp:'.$path); |
|
302 | 302 | $dirStream = array(); |
303 | - foreach($list as $file) { |
|
303 | + foreach ($list as $file) { |
|
304 | 304 | if ($file != '.' && $file != '..') { |
305 | 305 | $dirStream[] = $file; |
306 | 306 | } |
307 | 307 | } |
308 | 308 | return IteratorDirectory::wrap($dirStream); |
309 | - } catch(\Exception $e) { |
|
309 | + } catch (\Exception $e) { |
|
310 | 310 | return false; |
311 | 311 | } |
312 | 312 | } |
@@ -358,10 +358,10 @@ discard block |
||
358 | 358 | public function fopen($path, $mode) { |
359 | 359 | try { |
360 | 360 | $absPath = $this->absPath($path); |
361 | - switch($mode) { |
|
361 | + switch ($mode) { |
|
362 | 362 | case 'r': |
363 | 363 | case 'rb': |
364 | - if ( !$this->file_exists($path)) { |
|
364 | + if (!$this->file_exists($path)) { |
|
365 | 365 | return false; |
366 | 366 | } |
367 | 367 | case 'w': |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | /** |
389 | 389 | * {@inheritdoc} |
390 | 390 | */ |
391 | - public function touch($path, $mtime=null) { |
|
391 | + public function touch($path, $mtime = null) { |
|
392 | 392 | try { |
393 | 393 | if (!is_null($mtime)) { |
394 | 394 | return false; |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | // Do not pass the password here. We want to use the Net_SFTP object |
464 | 464 | // supplied via stream context or fail. We only supply username and |
465 | 465 | // hostname because this might show up in logs (they are not used). |
466 | - $url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path; |
|
466 | + $url = 'sftp://'.urlencode($this->user).'@'.$this->host.':'.$this->port.$this->root.$path; |
|
467 | 467 | return $url; |
468 | 468 | } |
469 | 469 | } |