Completed
Push — master ( 49662f...f67d94 )
by Joas
99:38 queued 81:58
created
lib/private/Preview/MSOfficeDoc.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 block discarded – undo
23 23
 
24 24
 //.doc, .dot
25 25
 class MSOfficeDoc extends Office {
26
-	/**
27
-	 * {@inheritDoc}
28
-	 */
29
-	public function getMimeType() {
30
-		return '/application\/msword/';
31
-	}
26
+    /**
27
+     * {@inheritDoc}
28
+     */
29
+    public function getMimeType() {
30
+        return '/application\/msword/';
31
+    }
32 32
 }
Please login to merge, or discard this patch.
lib/private/Preview/Font.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 
25 25
 // .otf, .ttf and .pfb
26 26
 class Font extends Bitmap {
27
-	/**
28
-	 * {@inheritDoc}
29
-	 */
30
-	public function getMimeType() {
31
-		return '/application\/(?:font-sfnt|x-font$)/';
32
-	}
27
+    /**
28
+     * {@inheritDoc}
29
+     */
30
+    public function getMimeType() {
31
+        return '/application\/(?:font-sfnt|x-font$)/';
32
+    }
33 33
 }
34 34
\ No newline at end of file
Please login to merge, or discard this patch.
lib/private/Preview/Postscript.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
 
26 26
 //.eps
27 27
 class Postscript extends Bitmap {
28
-	/**
29
-	 * {@inheritDoc}
30
-	 */
31
-	public function getMimeType() {
32
-		return '/application\/postscript/';
33
-	}
28
+    /**
29
+     * {@inheritDoc}
30
+     */
31
+    public function getMimeType() {
32
+        return '/application\/postscript/';
33
+    }
34 34
 }
Please login to merge, or discard this patch.
lib/private/Share20/Hooks.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -22,15 +22,15 @@
 block discarded – undo
22 22
 namespace OC\Share20;
23 23
 
24 24
 class Hooks {
25
-	public static function post_deleteUser($arguments) {
26
-		\OC::$server->getShareManager()->userDeleted($arguments['uid']);
27
-	}
25
+    public static function post_deleteUser($arguments) {
26
+        \OC::$server->getShareManager()->userDeleted($arguments['uid']);
27
+    }
28 28
 
29
-	public static function post_deleteGroup($arguments) {
30
-		\OC::$server->getShareManager()->groupDeleted($arguments['gid']);
31
-	}
29
+    public static function post_deleteGroup($arguments) {
30
+        \OC::$server->getShareManager()->groupDeleted($arguments['gid']);
31
+    }
32 32
 
33
-	public static function post_removeFromGroup($arguments) {
34
-		\OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
35
-	}
33
+    public static function post_removeFromGroup($arguments) {
34
+        \OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
35
+    }
36 36
 }
Please login to merge, or discard this patch.
lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
 
28 28
 class ModuleAlreadyExistsException extends GenericEncryptionException {
29 29
 
30
-	/**
31
-	 * @param string $id
32
-	 * @param string $name
33
-	 */
34
-	public function __construct($id, $name) {
35
-		parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"');
36
-	}
30
+    /**
31
+     * @param string $id
32
+     * @param string $name
33
+     */
34
+    public function __construct($id, $name) {
35
+        parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"');
36
+    }
37 37
 
38 38
 }
Please login to merge, or discard this patch.
lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,8 +28,8 @@
 block discarded – undo
28 28
 
29 29
 class EncryptionHeaderToLargeException extends GenericEncryptionException {
30 30
 
31
-	public function __construct() {
32
-		parent::__construct('max header size exceeded');
33
-	}
31
+    public function __construct() {
32
+        parent::__construct('max header size exceeded');
33
+    }
34 34
 
35 35
 }
Please login to merge, or discard this patch.
lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@
 block discarded – undo
27 27
 
28 28
 class EncryptionHeaderKeyExistsException extends GenericEncryptionException {
29 29
 
30
-	/**
31
-	 * @param string $key
32
-	 */
33
-	public function __construct($key) {
34
-		parent::__construct('header key "'. $key . '" already reserved by ownCloud');
35
-	}
30
+    /**
31
+     * @param string $key
32
+     */
33
+    public function __construct($key) {
34
+        parent::__construct('header key "'. $key . '" already reserved by ownCloud');
35
+    }
36 36
 }
Please login to merge, or discard this patch.
lib/private/Encryption/DecryptAll.php 1 patch
Indentation   +250 added lines, -250 removed lines patch added patch discarded remove patch
@@ -36,255 +36,255 @@
 block discarded – undo
36 36
 
37 37
 class DecryptAll {
38 38
 
39
-	/** @var  OutputInterface */
40
-	protected $output;
41
-
42
-	/** @var  InputInterface */
43
-	protected $input;
44
-
45
-	/** @var  Manager */
46
-	protected $encryptionManager;
47
-
48
-	/** @var IUserManager */
49
-	protected $userManager;
50
-
51
-	/** @var View */
52
-	protected $rootView;
53
-
54
-	/** @var  array files which couldn't be decrypted */
55
-	protected $failed;
56
-
57
-	/**
58
-	 * @param Manager $encryptionManager
59
-	 * @param IUserManager $userManager
60
-	 * @param View $rootView
61
-	 */
62
-	public function __construct(
63
-		Manager $encryptionManager,
64
-		IUserManager $userManager,
65
-		View $rootView
66
-	) {
67
-		$this->encryptionManager = $encryptionManager;
68
-		$this->userManager = $userManager;
69
-		$this->rootView = $rootView;
70
-		$this->failed = [];
71
-	}
72
-
73
-	/**
74
-	 * start to decrypt all files
75
-	 *
76
-	 * @param InputInterface $input
77
-	 * @param OutputInterface $output
78
-	 * @param string $user which users data folder should be decrypted, default = all users
79
-	 * @return bool
80
-	 * @throws \Exception
81
-	 */
82
-	public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') {
83
-
84
-		$this->input = $input;
85
-		$this->output = $output;
86
-
87
-		if ($user !== '' && $this->userManager->userExists($user) === false) {
88
-			$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
89
-			return false;
90
-		}
91
-
92
-		$this->output->writeln('prepare encryption modules...');
93
-		if ($this->prepareEncryptionModules($user) === false) {
94
-			return false;
95
-		}
96
-		$this->output->writeln(' done.');
97
-
98
-		$this->decryptAllUsersFiles($user);
99
-
100
-		if (empty($this->failed)) {
101
-			$this->output->writeln('all files could be decrypted successfully!');
102
-		} else {
103
-			$this->output->writeln('Files for following users couldn\'t be decrypted, ');
104
-			$this->output->writeln('maybe the user is not set up in a way that supports this operation: ');
105
-			foreach ($this->failed as $uid => $paths) {
106
-				$this->output->writeln('    ' . $uid);
107
-			}
108
-			$this->output->writeln('');
109
-		}
110
-
111
-		return true;
112
-	}
113
-
114
-	/**
115
-	 * prepare encryption modules to perform the decrypt all function
116
-	 *
117
-	 * @param $user
118
-	 * @return bool
119
-	 */
120
-	protected function prepareEncryptionModules($user) {
121
-		// prepare all encryption modules for decrypt all
122
-		$encryptionModules = $this->encryptionManager->getEncryptionModules();
123
-		foreach ($encryptionModules as $moduleDesc) {
124
-			/** @var IEncryptionModule $module */
125
-			$module = call_user_func($moduleDesc['callback']);
126
-			$this->output->writeln('');
127
-			$this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
128
-			$this->output->writeln('');
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!');
131
-				return false;
132
-			}
133
-		}
134
-
135
-		return true;
136
-	}
137
-
138
-	/**
139
-	 * iterate over all user and encrypt their files
140
-	 *
141
-	 * @param string $user which users files should be decrypted, default = all users
142
-	 */
143
-	protected function decryptAllUsersFiles($user = '') {
144
-
145
-		$this->output->writeln("\n");
146
-
147
-		$userList = [];
148
-		if ($user === '') {
149
-
150
-			$fetchUsersProgress = new ProgressBar($this->output);
151
-			$fetchUsersProgress->setFormat(" %message% \n [%bar%]");
152
-			$fetchUsersProgress->start();
153
-			$fetchUsersProgress->setMessage("Fetch list of users...");
154
-			$fetchUsersProgress->advance();
155
-
156
-			foreach ($this->userManager->getBackends() as $backend) {
157
-				$limit = 500;
158
-				$offset = 0;
159
-				do {
160
-					$users = $backend->getUsers('', $limit, $offset);
161
-					foreach ($users as $user) {
162
-						$userList[] = $user;
163
-					}
164
-					$offset += $limit;
165
-					$fetchUsersProgress->advance();
166
-				} while (count($users) >= $limit);
167
-				$fetchUsersProgress->setMessage("Fetch list of users... finished");
168
-				$fetchUsersProgress->finish();
169
-			}
170
-		} else {
171
-			$userList[] = $user;
172
-		}
173
-
174
-		$this->output->writeln("\n\n");
175
-
176
-		$progress = new ProgressBar($this->output);
177
-		$progress->setFormat(" %message% \n [%bar%]");
178
-		$progress->start();
179
-		$progress->setMessage("starting to decrypt files...");
180
-		$progress->advance();
181
-
182
-		$numberOfUsers = count($userList);
183
-		$userNo = 1;
184
-		foreach ($userList as $uid) {
185
-			$userCount = "$uid ($userNo of $numberOfUsers)";
186
-			$this->decryptUsersFiles($uid, $progress, $userCount);
187
-			$userNo++;
188
-		}
189
-
190
-		$progress->setMessage("starting to decrypt files... finished");
191
-		$progress->finish();
192
-
193
-		$this->output->writeln("\n\n");
194
-
195
-	}
196
-
197
-	/**
198
-	 * encrypt files from the given user
199
-	 *
200
-	 * @param string $uid
201
-	 * @param ProgressBar $progress
202
-	 * @param string $userCount
203
-	 */
204
-	protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) {
205
-
206
-		$this->setupUserFS($uid);
207
-		$directories = array();
208
-		$directories[] = '/' . $uid . '/files';
209
-
210
-		while ($root = array_pop($directories)) {
211
-			$content = $this->rootView->getDirectoryContent($root);
212
-			foreach ($content as $file) {
213
-				// only decrypt files owned by the user
214
-				if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
215
-					continue;
216
-				}
217
-				$path = $root . '/' . $file['name'];
218
-				if ($this->rootView->is_dir($path)) {
219
-					$directories[] = $path;
220
-					continue;
221
-				} else {
222
-					try {
223
-						$progress->setMessage("decrypt files for user $userCount: $path");
224
-						$progress->advance();
225
-						if ($file->isEncrypted() === false) {
226
-							$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
227
-							$progress->advance();
228
-						} else {
229
-							if ($this->decryptFile($path) === false) {
230
-								$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
231
-								$progress->advance();
232
-							}
233
-						}
234
-					} catch (\Exception $e) {
235
-						if (isset($this->failed[$uid])) {
236
-							$this->failed[$uid][] = $path;
237
-						} else {
238
-							$this->failed[$uid] = [$path];
239
-						}
240
-					}
241
-				}
242
-			}
243
-		}
244
-	}
245
-
246
-	/**
247
-	 * encrypt file
248
-	 *
249
-	 * @param string $path
250
-	 * @return bool
251
-	 */
252
-	protected function decryptFile($path) {
253
-
254
-		$source = $path;
255
-		$target = $path . '.decrypted.' . $this->getTimestamp();
256
-
257
-		try {
258
-			$this->rootView->copy($source, $target);
259
-			$this->rootView->rename($target, $source);
260
-		} catch (DecryptionFailedException $e) {
261
-			if ($this->rootView->file_exists($target)) {
262
-				$this->rootView->unlink($target);
263
-			}
264
-			return false;
265
-		}
266
-
267
-		return true;
268
-	}
269
-
270
-	/**
271
-	 * get current timestamp
272
-	 *
273
-	 * @return int
274
-	 */
275
-	protected function getTimestamp() {
276
-		return time();
277
-	}
278
-
279
-
280
-	/**
281
-	 * setup user file system
282
-	 *
283
-	 * @param string $uid
284
-	 */
285
-	protected function setupUserFS($uid) {
286
-		\OC_Util::tearDownFS();
287
-		\OC_Util::setupFS($uid);
288
-	}
39
+    /** @var  OutputInterface */
40
+    protected $output;
41
+
42
+    /** @var  InputInterface */
43
+    protected $input;
44
+
45
+    /** @var  Manager */
46
+    protected $encryptionManager;
47
+
48
+    /** @var IUserManager */
49
+    protected $userManager;
50
+
51
+    /** @var View */
52
+    protected $rootView;
53
+
54
+    /** @var  array files which couldn't be decrypted */
55
+    protected $failed;
56
+
57
+    /**
58
+     * @param Manager $encryptionManager
59
+     * @param IUserManager $userManager
60
+     * @param View $rootView
61
+     */
62
+    public function __construct(
63
+        Manager $encryptionManager,
64
+        IUserManager $userManager,
65
+        View $rootView
66
+    ) {
67
+        $this->encryptionManager = $encryptionManager;
68
+        $this->userManager = $userManager;
69
+        $this->rootView = $rootView;
70
+        $this->failed = [];
71
+    }
72
+
73
+    /**
74
+     * start to decrypt all files
75
+     *
76
+     * @param InputInterface $input
77
+     * @param OutputInterface $output
78
+     * @param string $user which users data folder should be decrypted, default = all users
79
+     * @return bool
80
+     * @throws \Exception
81
+     */
82
+    public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') {
83
+
84
+        $this->input = $input;
85
+        $this->output = $output;
86
+
87
+        if ($user !== '' && $this->userManager->userExists($user) === false) {
88
+            $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
89
+            return false;
90
+        }
91
+
92
+        $this->output->writeln('prepare encryption modules...');
93
+        if ($this->prepareEncryptionModules($user) === false) {
94
+            return false;
95
+        }
96
+        $this->output->writeln(' done.');
97
+
98
+        $this->decryptAllUsersFiles($user);
99
+
100
+        if (empty($this->failed)) {
101
+            $this->output->writeln('all files could be decrypted successfully!');
102
+        } else {
103
+            $this->output->writeln('Files for following users couldn\'t be decrypted, ');
104
+            $this->output->writeln('maybe the user is not set up in a way that supports this operation: ');
105
+            foreach ($this->failed as $uid => $paths) {
106
+                $this->output->writeln('    ' . $uid);
107
+            }
108
+            $this->output->writeln('');
109
+        }
110
+
111
+        return true;
112
+    }
113
+
114
+    /**
115
+     * prepare encryption modules to perform the decrypt all function
116
+     *
117
+     * @param $user
118
+     * @return bool
119
+     */
120
+    protected function prepareEncryptionModules($user) {
121
+        // prepare all encryption modules for decrypt all
122
+        $encryptionModules = $this->encryptionManager->getEncryptionModules();
123
+        foreach ($encryptionModules as $moduleDesc) {
124
+            /** @var IEncryptionModule $module */
125
+            $module = call_user_func($moduleDesc['callback']);
126
+            $this->output->writeln('');
127
+            $this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
128
+            $this->output->writeln('');
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!');
131
+                return false;
132
+            }
133
+        }
134
+
135
+        return true;
136
+    }
137
+
138
+    /**
139
+     * iterate over all user and encrypt their files
140
+     *
141
+     * @param string $user which users files should be decrypted, default = all users
142
+     */
143
+    protected function decryptAllUsersFiles($user = '') {
144
+
145
+        $this->output->writeln("\n");
146
+
147
+        $userList = [];
148
+        if ($user === '') {
149
+
150
+            $fetchUsersProgress = new ProgressBar($this->output);
151
+            $fetchUsersProgress->setFormat(" %message% \n [%bar%]");
152
+            $fetchUsersProgress->start();
153
+            $fetchUsersProgress->setMessage("Fetch list of users...");
154
+            $fetchUsersProgress->advance();
155
+
156
+            foreach ($this->userManager->getBackends() as $backend) {
157
+                $limit = 500;
158
+                $offset = 0;
159
+                do {
160
+                    $users = $backend->getUsers('', $limit, $offset);
161
+                    foreach ($users as $user) {
162
+                        $userList[] = $user;
163
+                    }
164
+                    $offset += $limit;
165
+                    $fetchUsersProgress->advance();
166
+                } while (count($users) >= $limit);
167
+                $fetchUsersProgress->setMessage("Fetch list of users... finished");
168
+                $fetchUsersProgress->finish();
169
+            }
170
+        } else {
171
+            $userList[] = $user;
172
+        }
173
+
174
+        $this->output->writeln("\n\n");
175
+
176
+        $progress = new ProgressBar($this->output);
177
+        $progress->setFormat(" %message% \n [%bar%]");
178
+        $progress->start();
179
+        $progress->setMessage("starting to decrypt files...");
180
+        $progress->advance();
181
+
182
+        $numberOfUsers = count($userList);
183
+        $userNo = 1;
184
+        foreach ($userList as $uid) {
185
+            $userCount = "$uid ($userNo of $numberOfUsers)";
186
+            $this->decryptUsersFiles($uid, $progress, $userCount);
187
+            $userNo++;
188
+        }
189
+
190
+        $progress->setMessage("starting to decrypt files... finished");
191
+        $progress->finish();
192
+
193
+        $this->output->writeln("\n\n");
194
+
195
+    }
196
+
197
+    /**
198
+     * encrypt files from the given user
199
+     *
200
+     * @param string $uid
201
+     * @param ProgressBar $progress
202
+     * @param string $userCount
203
+     */
204
+    protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) {
205
+
206
+        $this->setupUserFS($uid);
207
+        $directories = array();
208
+        $directories[] = '/' . $uid . '/files';
209
+
210
+        while ($root = array_pop($directories)) {
211
+            $content = $this->rootView->getDirectoryContent($root);
212
+            foreach ($content as $file) {
213
+                // only decrypt files owned by the user
214
+                if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
215
+                    continue;
216
+                }
217
+                $path = $root . '/' . $file['name'];
218
+                if ($this->rootView->is_dir($path)) {
219
+                    $directories[] = $path;
220
+                    continue;
221
+                } else {
222
+                    try {
223
+                        $progress->setMessage("decrypt files for user $userCount: $path");
224
+                        $progress->advance();
225
+                        if ($file->isEncrypted() === false) {
226
+                            $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
227
+                            $progress->advance();
228
+                        } else {
229
+                            if ($this->decryptFile($path) === false) {
230
+                                $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
231
+                                $progress->advance();
232
+                            }
233
+                        }
234
+                    } catch (\Exception $e) {
235
+                        if (isset($this->failed[$uid])) {
236
+                            $this->failed[$uid][] = $path;
237
+                        } else {
238
+                            $this->failed[$uid] = [$path];
239
+                        }
240
+                    }
241
+                }
242
+            }
243
+        }
244
+    }
245
+
246
+    /**
247
+     * encrypt file
248
+     *
249
+     * @param string $path
250
+     * @return bool
251
+     */
252
+    protected function decryptFile($path) {
253
+
254
+        $source = $path;
255
+        $target = $path . '.decrypted.' . $this->getTimestamp();
256
+
257
+        try {
258
+            $this->rootView->copy($source, $target);
259
+            $this->rootView->rename($target, $source);
260
+        } catch (DecryptionFailedException $e) {
261
+            if ($this->rootView->file_exists($target)) {
262
+                $this->rootView->unlink($target);
263
+            }
264
+            return false;
265
+        }
266
+
267
+        return true;
268
+    }
269
+
270
+    /**
271
+     * get current timestamp
272
+     *
273
+     * @return int
274
+     */
275
+    protected function getTimestamp() {
276
+        return time();
277
+    }
278
+
279
+
280
+    /**
281
+     * setup user file system
282
+     *
283
+     * @param string $uid
284
+     */
285
+    protected function setupUserFS($uid) {
286
+        \OC_Util::tearDownFS();
287
+        \OC_Util::setupFS($uid);
288
+    }
289 289
 
290 290
 }
Please login to merge, or discard this patch.
lib/private/Encryption/EncryptionWrapper.php 1 patch
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -41,85 +41,85 @@
 block discarded – undo
41 41
  */
42 42
 class EncryptionWrapper {
43 43
 
44
-	/** @var ArrayCache  */
45
-	private $arrayCache;
44
+    /** @var ArrayCache  */
45
+    private $arrayCache;
46 46
 
47
-	/** @var  Manager */
48
-	private $manager;
47
+    /** @var  Manager */
48
+    private $manager;
49 49
 
50
-	/** @var  ILogger */
51
-	private $logger;
50
+    /** @var  ILogger */
51
+    private $logger;
52 52
 
53
-	/**
54
-	 * EncryptionWrapper constructor.
55
-	 *
56
-	 * @param ArrayCache $arrayCache
57
-	 * @param Manager $manager
58
-	 * @param ILogger $logger
59
-	 */
60
-	public function __construct(ArrayCache $arrayCache,
61
-								Manager $manager,
62
-								ILogger $logger
63
-	) {
64
-		$this->arrayCache = $arrayCache;
65
-		$this->manager = $manager;
66
-		$this->logger = $logger;
67
-	}
53
+    /**
54
+     * EncryptionWrapper constructor.
55
+     *
56
+     * @param ArrayCache $arrayCache
57
+     * @param Manager $manager
58
+     * @param ILogger $logger
59
+     */
60
+    public function __construct(ArrayCache $arrayCache,
61
+                                Manager $manager,
62
+                                ILogger $logger
63
+    ) {
64
+        $this->arrayCache = $arrayCache;
65
+        $this->manager = $manager;
66
+        $this->logger = $logger;
67
+    }
68 68
 
69
-	/**
70
-	 * Wraps the given storage when it is not a shared storage
71
-	 *
72
-	 * @param string $mountPoint
73
-	 * @param Storage $storage
74
-	 * @param IMountPoint $mount
75
-	 * @return Encryption|Storage
76
-	 */
77
-	public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) {
78
-		$parameters = [
79
-			'storage' => $storage,
80
-			'mountPoint' => $mountPoint,
81
-			'mount' => $mount
82
-		];
69
+    /**
70
+     * Wraps the given storage when it is not a shared storage
71
+     *
72
+     * @param string $mountPoint
73
+     * @param Storage $storage
74
+     * @param IMountPoint $mount
75
+     * @return Encryption|Storage
76
+     */
77
+    public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) {
78
+        $parameters = [
79
+            'storage' => $storage,
80
+            'mountPoint' => $mountPoint,
81
+            'mount' => $mount
82
+        ];
83 83
 
84
-		if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage')
85
-			&& !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')
86
-			&& !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) {
84
+        if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage')
85
+            && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')
86
+            && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) {
87 87
 
88
-			$user = \OC::$server->getUserSession()->getUser();
89
-			$mountManager = Filesystem::getMountManager();
90
-			$uid = $user ? $user->getUID() : null;
91
-			$fileHelper = \OC::$server->getEncryptionFilesHelper();
92
-			$keyStorage = \OC::$server->getEncryptionKeyStorage();
88
+            $user = \OC::$server->getUserSession()->getUser();
89
+            $mountManager = Filesystem::getMountManager();
90
+            $uid = $user ? $user->getUID() : null;
91
+            $fileHelper = \OC::$server->getEncryptionFilesHelper();
92
+            $keyStorage = \OC::$server->getEncryptionKeyStorage();
93 93
 
94
-			$util = new Util(
95
-				new View(),
96
-				\OC::$server->getUserManager(),
97
-				\OC::$server->getGroupManager(),
98
-				\OC::$server->getConfig()
99
-			);
100
-			$update = new Update(
101
-				new View(),
102
-				$util,
103
-				Filesystem::getMountManager(),
104
-				$this->manager,
105
-				$fileHelper,
106
-				$uid
107
-			);
108
-			return new Encryption(
109
-				$parameters,
110
-				$this->manager,
111
-				$util,
112
-				$this->logger,
113
-				$fileHelper,
114
-				$uid,
115
-				$keyStorage,
116
-				$update,
117
-				$mountManager,
118
-				$this->arrayCache
119
-			);
120
-		} else {
121
-			return $storage;
122
-		}
123
-	}
94
+            $util = new Util(
95
+                new View(),
96
+                \OC::$server->getUserManager(),
97
+                \OC::$server->getGroupManager(),
98
+                \OC::$server->getConfig()
99
+            );
100
+            $update = new Update(
101
+                new View(),
102
+                $util,
103
+                Filesystem::getMountManager(),
104
+                $this->manager,
105
+                $fileHelper,
106
+                $uid
107
+            );
108
+            return new Encryption(
109
+                $parameters,
110
+                $this->manager,
111
+                $util,
112
+                $this->logger,
113
+                $fileHelper,
114
+                $uid,
115
+                $keyStorage,
116
+                $update,
117
+                $mountManager,
118
+                $this->arrayCache
119
+            );
120
+        } else {
121
+            return $storage;
122
+        }
123
+    }
124 124
 
125 125
 }
Please login to merge, or discard this patch.