@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | //use the admin login data for the new database user |
61 | 61 | |
62 | 62 | //add prefix to the postgresql user name to prevent collisions |
63 | - $this->dbUser = 'oc_' . strtolower($username); |
|
63 | + $this->dbUser = 'oc_'.strtolower($username); |
|
64 | 64 | //create a new password so we don't need to store the admin config in the config file |
65 | - $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS); |
|
65 | + $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); |
|
66 | 66 | |
67 | 67 | $this->createDBUser($connection); |
68 | 68 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | //create the database |
76 | 76 | $this->createDatabase($connection); |
77 | 77 | $query = $connection->prepare("select count(*) FROM pg_class WHERE relname=? limit 1"); |
78 | - $query->execute([$this->tablePrefix . "users"]); |
|
78 | + $query->execute([$this->tablePrefix."users"]); |
|
79 | 79 | $tablesSetup = $query->fetchColumn() > 0; |
80 | 80 | |
81 | 81 | // the connection to dbname=postgres is not needed anymore |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | private function createDatabase(IDBConnection $connection) { |
112 | 112 | if (!$this->databaseExists($connection)) { |
113 | 113 | //The database does not exists... let's create it |
114 | - $query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser)); |
|
114 | + $query = $connection->prepare("CREATE DATABASE ".addslashes($this->dbName)." OWNER ".addslashes($this->dbUser)); |
|
115 | 115 | try { |
116 | 116 | $query->execute(); |
117 | 117 | } catch (DatabaseException $e) { |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $this->logger->logException($e); |
120 | 120 | } |
121 | 121 | } else { |
122 | - $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC"); |
|
122 | + $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE ".addslashes($this->dbName)." FROM PUBLIC"); |
|
123 | 123 | try { |
124 | 124 | $query->execute(); |
125 | 125 | } catch (DatabaseException $e) { |
@@ -155,11 +155,11 @@ discard block |
||
155 | 155 | $i = 1; |
156 | 156 | while ($this->userExists($connection)) { |
157 | 157 | $i++; |
158 | - $this->dbUser = $dbUser . $i; |
|
158 | + $this->dbUser = $dbUser.$i; |
|
159 | 159 | }; |
160 | 160 | |
161 | 161 | // create the user |
162 | - $query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'"); |
|
162 | + $query = $connection->prepare("CREATE USER ".addslashes($this->dbUser)." CREATEDB PASSWORD '".addslashes($this->dbPassword)."'"); |
|
163 | 163 | $query->execute(); |
164 | 164 | } catch (DatabaseException $e) { |
165 | 165 | $this->logger->error('Error while trying to create database user'); |
@@ -68,14 +68,14 @@ |
||
68 | 68 | |
69 | 69 | public function validate($config) { |
70 | 70 | $errors = array(); |
71 | - if(empty($config['dbuser']) && empty($config['dbname'])) { |
|
71 | + if (empty($config['dbuser']) && empty($config['dbname'])) { |
|
72 | 72 | $errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname)); |
73 | - } else if(empty($config['dbuser'])) { |
|
73 | + } else if (empty($config['dbuser'])) { |
|
74 | 74 | $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname)); |
75 | - } else if(empty($config['dbname'])) { |
|
75 | + } else if (empty($config['dbname'])) { |
|
76 | 76 | $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname)); |
77 | 77 | } |
78 | - if(substr_count($config['dbname'], '.') >= 1) { |
|
78 | + if (substr_count($config['dbname'], '.') >= 1) { |
|
79 | 79 | $errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname)); |
80 | 80 | } |
81 | 81 | return $errors; |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | } |
245 | 245 | |
246 | 246 | $mount = $file->getMountPoint(); |
247 | - if ($mount and !$mount->getOption('previews', true)){ |
|
247 | + if ($mount and !$mount->getOption('previews', true)) { |
|
248 | 248 | return false; |
249 | 249 | } |
250 | 250 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | */ |
331 | 331 | protected function registerCoreProvider($class, $mimeType, $options = []) { |
332 | 332 | if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) { |
333 | - $this->registerProvider($mimeType, function () use ($class, $options) { |
|
333 | + $this->registerProvider($mimeType, function() use ($class, $options) { |
|
334 | 334 | return new $class($options); |
335 | 335 | }); |
336 | 336 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { |
88 | 88 | $path = Filesystem::getPath($params['fileSource']); |
89 | 89 | list($owner, $ownerPath) = $this->getOwnerPath($path); |
90 | - $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
90 | + $absPath = '/'.$owner.'/files/'.$ownerPath; |
|
91 | 91 | $this->update($absPath); |
92 | 92 | } |
93 | 93 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { |
104 | 104 | $path = Filesystem::getPath($params['fileSource']); |
105 | 105 | list($owner, $ownerPath) = $this->getOwnerPath($path); |
106 | - $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
106 | + $absPath = '/'.$owner.'/files/'.$ownerPath; |
|
107 | 107 | $this->update($absPath); |
108 | 108 | } |
109 | 109 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function postRestore($params) { |
119 | 119 | if ($this->encryptionManager->isEnabled()) { |
120 | - $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']); |
|
120 | + $path = Filesystem::normalizePath('/'.$this->uid.'/files/'.$params['filePath']); |
|
121 | 121 | $this->update($path); |
122 | 122 | } |
123 | 123 | } |
@@ -131,12 +131,12 @@ discard block |
||
131 | 131 | public function postRename($params) { |
132 | 132 | $source = $params['oldpath']; |
133 | 133 | $target = $params['newpath']; |
134 | - if( |
|
134 | + if ( |
|
135 | 135 | $this->encryptionManager->isEnabled() && |
136 | 136 | dirname($source) !== dirname($target) |
137 | 137 | ) { |
138 | 138 | list($owner, $ownerPath) = $this->getOwnerPath($target); |
139 | - $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
139 | + $absPath = '/'.$owner.'/files/'.$ownerPath; |
|
140 | 140 | $this->update($absPath); |
141 | 141 | } |
142 | 142 | } |
@@ -151,10 +151,10 @@ discard block |
||
151 | 151 | protected function getOwnerPath($path) { |
152 | 152 | $info = Filesystem::getFileInfo($path); |
153 | 153 | $owner = Filesystem::getOwner($path); |
154 | - $view = new View('/' . $owner . '/files'); |
|
154 | + $view = new View('/'.$owner.'/files'); |
|
155 | 155 | $path = $view->getPath($info->getId()); |
156 | 156 | if ($path === null) { |
157 | - throw new \InvalidArgumentException('No file found for ' . $info->getId()); |
|
157 | + throw new \InvalidArgumentException('No file found for '.$info->getId()); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | return array($owner, $path); |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @param string $name |
33 | 33 | */ |
34 | 34 | public function __construct($id, $name) { |
35 | - parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"'); |
|
35 | + parent::__construct('Id "'.$id.'" already used by encryption module "'.$name.'"'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | } |
@@ -31,6 +31,6 @@ |
||
31 | 31 | * @param string $key |
32 | 32 | */ |
33 | 33 | public function __construct($key) { |
34 | - parent::__construct('header key "'. $key . '" already reserved by ownCloud'); |
|
34 | + parent::__construct('header key "'.$key.'" already reserved by ownCloud'); |
|
35 | 35 | } |
36 | 36 | } |
@@ -26,6 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use OCP\Encryption\Exceptions\GenericEncryptionException; |
28 | 28 | |
29 | -class EncryptionFailedException extends GenericEncryptionException{ |
|
29 | +class EncryptionFailedException extends GenericEncryptionException { |
|
30 | 30 | |
31 | 31 | } |
@@ -26,6 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use OCP\Encryption\Exceptions\GenericEncryptionException; |
28 | 28 | |
29 | -class EmptyEncryptionDataException extends GenericEncryptionException{ |
|
29 | +class EmptyEncryptionDataException extends GenericEncryptionException { |
|
30 | 30 | |
31 | 31 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $this->output = $output; |
86 | 86 | |
87 | 87 | if ($user !== '' && $this->userManager->userExists($user) === false) { |
88 | - $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again'); |
|
88 | + $this->output->writeln('User "'.$user.'" does not exist. Please check the username and try again'); |
|
89 | 89 | return false; |
90 | 90 | } |
91 | 91 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $this->output->writeln('Files for following users couldn\'t be decrypted, '); |
104 | 104 | $this->output->writeln('maybe the user is not set up in a way that supports this operation: '); |
105 | 105 | foreach ($this->failed as $uid => $paths) { |
106 | - $this->output->writeln(' ' . $uid); |
|
106 | + $this->output->writeln(' '.$uid); |
|
107 | 107 | } |
108 | 108 | $this->output->writeln(''); |
109 | 109 | } |
@@ -124,10 +124,10 @@ discard block |
||
124 | 124 | /** @var IEncryptionModule $module */ |
125 | 125 | $module = call_user_func($moduleDesc['callback']); |
126 | 126 | $this->output->writeln(''); |
127 | - $this->output->writeln('Prepare "' . $module->getDisplayName() . '"'); |
|
127 | + $this->output->writeln('Prepare "'.$module->getDisplayName().'"'); |
|
128 | 128 | $this->output->writeln(''); |
129 | 129 | if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) { |
130 | - $this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!'); |
|
130 | + $this->output->writeln('Module "'.$moduleDesc['displayName'].'" does not support the functionality to decrypt all files again or the initialization of the module failed!'); |
|
131 | 131 | return false; |
132 | 132 | } |
133 | 133 | } |
@@ -205,16 +205,16 @@ discard block |
||
205 | 205 | |
206 | 206 | $this->setupUserFS($uid); |
207 | 207 | $directories = array(); |
208 | - $directories[] = '/' . $uid . '/files'; |
|
208 | + $directories[] = '/'.$uid.'/files'; |
|
209 | 209 | |
210 | 210 | while ($root = array_pop($directories)) { |
211 | 211 | $content = $this->rootView->getDirectoryContent($root); |
212 | 212 | foreach ($content as $file) { |
213 | 213 | // only decrypt files owned by the user |
214 | - if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { |
|
214 | + if ($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { |
|
215 | 215 | continue; |
216 | 216 | } |
217 | - $path = $root . '/' . $file['name']; |
|
217 | + $path = $root.'/'.$file['name']; |
|
218 | 218 | if ($this->rootView->is_dir($path)) { |
219 | 219 | $directories[] = $path; |
220 | 220 | continue; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | protected function decryptFile($path) { |
253 | 253 | |
254 | 254 | $source = $path; |
255 | - $target = $path . '.decrypted.' . $this->getTimestamp(); |
|
255 | + $target = $path.'.decrypted.'.$this->getTimestamp(); |
|
256 | 256 | |
257 | 257 | try { |
258 | 258 | $this->rootView->copy($source, $target); |