@@ -84,15 +84,15 @@ |
||
84 | 84 | $tmpPath = \OC::$server->getTempManager()->getTemporaryFile(); |
85 | 85 | |
86 | 86 | if (self::$avconvBinary) { |
87 | - $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) . |
|
88 | - ' -i ' . escapeshellarg($absPath) . |
|
89 | - ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) . |
|
87 | + $cmd = self::$avconvBinary.' -y -ss '.escapeshellarg($second). |
|
88 | + ' -i '.escapeshellarg($absPath). |
|
89 | + ' -an -f mjpeg -vframes 1 -vsync 1 '.escapeshellarg($tmpPath). |
|
90 | 90 | ' > /dev/null 2>&1'; |
91 | 91 | } else { |
92 | - $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) . |
|
93 | - ' -i ' . escapeshellarg($absPath) . |
|
94 | - ' -f mjpeg -vframes 1' . |
|
95 | - ' ' . escapeshellarg($tmpPath) . |
|
92 | + $cmd = self::$ffmpegBinary.' -y -ss '.escapeshellarg($second). |
|
93 | + ' -i '.escapeshellarg($absPath). |
|
94 | + ' -f mjpeg -vframes 1'. |
|
95 | + ' '.escapeshellarg($tmpPath). |
|
96 | 96 | ' > /dev/null 2>&1'; |
97 | 97 | } |
98 | 98 |
@@ -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 | } |
@@ -274,7 +274,7 @@ |
||
274 | 274 | } |
275 | 275 | |
276 | 276 | // check if key storage is mounted correctly |
277 | - if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) { |
|
277 | + if ($this->rootView->file_exists($rootDir.'/'.Storage::KEY_STORAGE_MARKER)) { |
|
278 | 278 | return true; |
279 | 279 | } |
280 | 280 |
@@ -117,8 +117,8 @@ |
||
117 | 117 | if ($aChunk !== $bChunk) { |
118 | 118 | // test first character (character comparison, not number comparison) |
119 | 119 | if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') { |
120 | - $aNum = (int)$aChunk; |
|
121 | - $bNum = (int)$bChunk; |
|
120 | + $aNum = (int) $aChunk; |
|
121 | + $bNum = (int) $bChunk; |
|
122 | 122 | return $aNum - $bNum; |
123 | 123 | } |
124 | 124 | return self::getCollator()->compare($aChunk, $bChunk); |
@@ -20,4 +20,4 @@ |
||
20 | 20 | * |
21 | 21 | */ |
22 | 22 | |
23 | -require_once __DIR__ . '/v1.php'; |
|
23 | +require_once __DIR__.'/v1.php'; |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * |
20 | 20 | */ |
21 | 21 | |
22 | -require_once __DIR__ . '/../lib/base.php'; |
|
22 | +require_once __DIR__.'/../lib/base.php'; |
|
23 | 23 | |
24 | 24 | header('Content-Type: application/json'); |
25 | 25 |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | protected function execute(InputInterface $input, OutputInterface $output) { |
56 | 56 | $outputType = $input->getOption('output'); |
57 | 57 | if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) { |
58 | - $certificates = array_map(function (ICertificate $certificate) { |
|
58 | + $certificates = array_map(function(ICertificate $certificate) { |
|
59 | 59 | return [ |
60 | 60 | 'name' => $certificate->getName(), |
61 | 61 | 'common_name' => $certificate->getCommonName(), |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | 'Issued By' |
82 | 82 | ]); |
83 | 83 | |
84 | - $rows = array_map(function (ICertificate $certificate) { |
|
84 | + $rows = array_map(function(ICertificate $certificate) { |
|
85 | 85 | return [ |
86 | 86 | $certificate->getName(), |
87 | 87 | $certificate->getCommonName(), |
@@ -117,12 +117,12 @@ |
||
117 | 117 | try { |
118 | 118 | $success = $user->setPassword($password); |
119 | 119 | } catch (\Exception $e) { |
120 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
120 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
121 | 121 | return 1; |
122 | 122 | } |
123 | 123 | |
124 | 124 | if ($success) { |
125 | - $output->writeln("<info>Successfully reset password for " . $username . "</info>"); |
|
125 | + $output->writeln("<info>Successfully reset password for ".$username."</info>"); |
|
126 | 126 | } else { |
127 | 127 | $output->writeln("<error>Error while resetting password!</error>"); |
128 | 128 | return 1; |