@@ -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 | } |
@@ -58,7 +58,7 @@ |
||
58 | 58 | // always add owner to the list of users with access to the file |
59 | 59 | $userIds = array($owner); |
60 | 60 | |
61 | - if (!$this->util->isFile($owner . '/' . $ownerPath)) { |
|
61 | + if (!$this->util->isFile($owner.'/'.$ownerPath)) { |
|
62 | 62 | return array('users' => $userIds, 'public' => false); |
63 | 63 | } |
64 | 64 |
@@ -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); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function check() { |
57 | 57 | // Look up the cache - it is invalidated all 30 minutes |
58 | - if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) { |
|
58 | + if (((int) $this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) { |
|
59 | 59 | return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true); |
60 | 60 | } |
61 | 61 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $versionString = implode('x', $version); |
80 | 80 | |
81 | 81 | //fetch xml data from updater |
82 | - $url = $updaterUrl . '?version=' . $versionString; |
|
82 | + $url = $updaterUrl.'?version='.$versionString; |
|
83 | 83 | |
84 | 84 | $tmp = []; |
85 | 85 | $xml = $this->getUrlContent($url); |
@@ -88,11 +88,11 @@ discard block |
||
88 | 88 | $data = @simplexml_load_string($xml); |
89 | 89 | libxml_disable_entity_loader($loadEntities); |
90 | 90 | if ($data !== false) { |
91 | - $tmp['version'] = (string)$data->version; |
|
92 | - $tmp['versionstring'] = (string)$data->versionstring; |
|
93 | - $tmp['url'] = (string)$data->url; |
|
94 | - $tmp['web'] = (string)$data->web; |
|
95 | - $tmp['autoupdater'] = (string)$data->autoupdater; |
|
91 | + $tmp['version'] = (string) $data->version; |
|
92 | + $tmp['versionstring'] = (string) $data->versionstring; |
|
93 | + $tmp['url'] = (string) $data->url; |
|
94 | + $tmp['web'] = (string) $data->web; |
|
95 | + $tmp['autoupdater'] = (string) $data->autoupdater; |
|
96 | 96 | } else { |
97 | 97 | libxml_clear_errors(); |
98 | 98 | } |
@@ -51,10 +51,10 @@ discard block |
||
51 | 51 | $rootView = new View(); |
52 | 52 | $user = \OC::$server->getUserSession()->getUser(); |
53 | 53 | Filesystem::initMountPoints($user->getUID()); |
54 | - if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) { |
|
55 | - $rootView->mkdir('/' . $user->getUID() . '/cache'); |
|
54 | + if (!$rootView->file_exists('/'.$user->getUID().'/cache')) { |
|
55 | + $rootView->mkdir('/'.$user->getUID().'/cache'); |
|
56 | 56 | } |
57 | - $this->storage = new View('/' . $user->getUID() . '/cache'); |
|
57 | + $this->storage = new View('/'.$user->getUID().'/cache'); |
|
58 | 58 | return $this->storage; |
59 | 59 | } else { |
60 | 60 | \OCP\Util::writeLog('core', 'Can\'t get cache storage, user not logged in', \OCP\Util::ERROR); |
@@ -104,12 +104,12 @@ discard block |
||
104 | 104 | // unique id to avoid chunk collision, just in case |
105 | 105 | $uniqueId = \OC::$server->getSecureRandom()->generate( |
106 | 106 | 16, |
107 | - ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER |
|
107 | + ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER |
|
108 | 108 | ); |
109 | 109 | |
110 | 110 | // use part file to prevent hasKey() to find the key |
111 | 111 | // while it is being written |
112 | - $keyPart = $key . '.' . $uniqueId . '.part'; |
|
112 | + $keyPart = $key.'.'.$uniqueId.'.part'; |
|
113 | 113 | if ($storage and $storage->file_put_contents($keyPart, $value)) { |
114 | 114 | if ($ttl === 0) { |
115 | 115 | $ttl = 86400; // 60*60*24 |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | if (is_resource($dh)) { |
159 | 159 | while (($file = readdir($dh)) !== false) { |
160 | 160 | if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) { |
161 | - $storage->unlink('/' . $file); |
|
161 | + $storage->unlink('/'.$file); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | } |
@@ -183,17 +183,17 @@ discard block |
||
183 | 183 | while (($file = readdir($dh)) !== false) { |
184 | 184 | if ($file != '.' and $file != '..') { |
185 | 185 | try { |
186 | - $mtime = $storage->filemtime('/' . $file); |
|
186 | + $mtime = $storage->filemtime('/'.$file); |
|
187 | 187 | if ($mtime < $now) { |
188 | - $storage->unlink('/' . $file); |
|
188 | + $storage->unlink('/'.$file); |
|
189 | 189 | } |
190 | 190 | } catch (\OCP\Lock\LockedException $e) { |
191 | 191 | // ignore locked chunks |
192 | - \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core')); |
|
192 | + \OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', array('app' => 'core')); |
|
193 | 193 | } catch (\OCP\Files\ForbiddenException $e) { |
194 | - \OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', array('app' => 'core')); |
|
194 | + \OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "'.$file.'"', array('app' => 'core')); |
|
195 | 195 | } catch (\OCP\Files\LockNotAcquiredException $e) { |
196 | - \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core')); |
|
196 | + \OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', array('app' => 'core')); |
|
197 | 197 | } |
198 | 198 | } |
199 | 199 | } |