|
@@ -247,7 +247,7 @@ discard block |
|
|
block discarded – undo |
|
247
|
247
|
return StorageNotAvailableException::STATUS_SUCCESS; |
|
248
|
248
|
} |
|
249
|
249
|
foreach ($options as $key => &$option) { |
|
250
|
|
- if($key === 'password') { |
|
|
250
|
+ if ($key === 'password') { |
|
251
|
251
|
// no replacements in passwords |
|
252
|
252
|
continue; |
|
253
|
253
|
} |
|
@@ -284,11 +284,11 @@ discard block |
|
|
block discarded – undo |
|
284
|
284
|
*/ |
|
285
|
285
|
public static function readData($user = null) { |
|
286
|
286
|
if (isset($user)) { |
|
287
|
|
- $jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json'; |
|
|
287
|
+ $jsonFile = \OC::$server->getUserManager()->get($user)->getHome().'/mount.json'; |
|
288
|
288
|
} else { |
|
289
|
289
|
$config = \OC::$server->getConfig(); |
|
290
|
|
- $datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/'); |
|
291
|
|
- $jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json'); |
|
|
290
|
+ $datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data/'); |
|
|
291
|
+ $jsonFile = $config->getSystemValue('mount_file', $datadir.'/mount.json'); |
|
292
|
292
|
} |
|
293
|
293
|
if (is_file($jsonFile)) { |
|
294
|
294
|
$mountPoints = json_decode(file_get_contents($jsonFile), true); |
|
@@ -314,7 +314,7 @@ discard block |
|
|
block discarded – undo |
|
314
|
314
|
foreach ($backends as $backend) { |
|
315
|
315
|
foreach ($backend->checkDependencies() as $dependency) { |
|
316
|
316
|
if ($message = $dependency->getMessage()) { |
|
317
|
|
- $message .= '<p>' . $message . '</p>'; |
|
|
317
|
+ $message .= '<p>'.$message.'</p>'; |
|
318
|
318
|
} else { |
|
319
|
319
|
$dependencyGroups[$dependency->getDependency()][] = $backend; |
|
320
|
320
|
} |
|
@@ -323,9 +323,9 @@ discard block |
|
|
block discarded – undo |
|
323
|
323
|
|
|
324
|
324
|
foreach ($dependencyGroups as $module => $dependants) { |
|
325
|
325
|
$backends = implode(', ', array_map(function($backend) { |
|
326
|
|
- return '"' . $backend->getText() . '"'; |
|
|
326
|
+ return '"'.$backend->getText().'"'; |
|
327
|
327
|
}, $dependants)); |
|
328
|
|
- $message .= '<p>' . OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends) . '</p>'; |
|
|
328
|
+ $message .= '<p>'.OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends).'</p>'; |
|
329
|
329
|
} |
|
330
|
330
|
|
|
331
|
331
|
return $message; |
|
@@ -342,11 +342,11 @@ discard block |
|
|
block discarded – undo |
|
342
|
342
|
private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) { |
|
343
|
343
|
switch (strtolower($module)) { |
|
344
|
344
|
case 'curl': |
|
345
|
|
- return (string)$l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]); |
|
|
345
|
+ return (string) $l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]); |
|
346
|
346
|
case 'ftp': |
|
347
|
|
- return (string)$l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]); |
|
|
347
|
+ return (string) $l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]); |
|
348
|
348
|
default: |
|
349
|
|
- return (string)$l->t('"%1$s" is not installed. Mounting of %2$s is not possible. Please ask your system administrator to install it.', [$module, $backend]); |
|
|
349
|
+ return (string) $l->t('"%1$s" is not installed. Mounting of %2$s is not possible. Please ask your system administrator to install it.', [$module, $backend]); |
|
350
|
350
|
} |
|
351
|
351
|
} |
|
352
|
352
|
|
|
@@ -391,7 +391,7 @@ discard block |
|
|
block discarded – undo |
|
391
|
391
|
$cipher = self::getCipher(); |
|
392
|
392
|
$iv = \OC::$server->getSecureRandom()->generate(16); |
|
393
|
393
|
$cipher->setIV($iv); |
|
394
|
|
- return base64_encode($iv . $cipher->encrypt($password)); |
|
|
394
|
+ return base64_encode($iv.$cipher->encrypt($password)); |
|
395
|
395
|
} |
|
396
|
396
|
|
|
397
|
397
|
/** |