|
@@ -96,7 +96,7 @@ discard block |
|
|
block discarded – undo |
|
96
|
96
|
*/ |
|
97
|
97
|
public function __construct(SettingsService $settings) { |
|
98
|
98
|
$this->cipher = $settings->getAppSetting('server_side_encryption'); |
|
99
|
|
- $this->rounds = (int)100; |
|
|
99
|
+ $this->rounds = (int) 100; |
|
100
|
100
|
$this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', ''); |
|
101
|
101
|
} |
|
102
|
102
|
|
|
@@ -308,7 +308,7 @@ discard block |
|
|
block discarded – undo |
|
308
|
308
|
$userKey = (isset($sk)) ? $sk : $credential->getUserId(); |
|
309
|
309
|
} |
|
310
|
310
|
|
|
311
|
|
- if(is_array($credential)){ |
|
|
311
|
+ if (is_array($credential)) { |
|
312
|
312
|
$userSuppliedKey = $credential['label']; |
|
313
|
313
|
$userKey = (isset($credential['shared_key'])) ? $credential['shared_key'] : $credential['user_id']; |
|
314
|
314
|
} |
Please login to merge, or discard this patch.