@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $this->appData = $appData; |
70 | 70 | $this->urlGenerator = $urlGenerator; |
71 | 71 | $this->cacheFactory = $cacheFactory; |
72 | - $this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl())); |
|
72 | + $this->depsCache = $this->cacheFactory->createDistributed('JS-'.md5($this->urlGenerator->getBaseUrl())); |
|
73 | 73 | $this->config = $config; |
74 | 74 | $this->logger = $logger; |
75 | 75 | } |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | return false; |
86 | 86 | } |
87 | 87 | |
88 | - $path = explode('/', $root . '/' . $file); |
|
88 | + $path = explode('/', $root.'/'.$file); |
|
89 | 89 | |
90 | 90 | $fileName = array_pop($path); |
91 | 91 | $path = implode('/', $path); |
92 | 92 | |
93 | 93 | try { |
94 | 94 | $folder = $this->appData->getFolder($app); |
95 | - } catch(NotFoundException $e) { |
|
95 | + } catch (NotFoundException $e) { |
|
96 | 96 | // creating css appdata folder |
97 | 97 | $folder = $this->appData->newFolder($app); |
98 | 98 | } |
99 | 99 | |
100 | - if($this->isCached($fileName, $folder)) { |
|
100 | + if ($this->isCached($fileName, $folder)) { |
|
101 | 101 | return true; |
102 | 102 | } |
103 | 103 | return $this->cache($path, $fileName, $folder); |
@@ -115,9 +115,9 @@ discard block |
||
115 | 115 | return false; |
116 | 116 | } |
117 | 117 | |
118 | - $fileName = $fileName . '.deps'; |
|
118 | + $fileName = $fileName.'.deps'; |
|
119 | 119 | try { |
120 | - $deps = $this->depsCache->get($folder->getName() . '-' . $fileName); |
|
120 | + $deps = $this->depsCache->get($folder->getName().'-'.$fileName); |
|
121 | 121 | if ($deps === null || $deps === '') { |
122 | 122 | $depFile = $folder->getFile($fileName); |
123 | 123 | $deps = $depFile->getContent(); |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | // check again |
127 | 127 | if ($deps === null || $deps === '') { |
128 | - $this->logger->info('JSCombiner: deps file empty: ' . $fileName); |
|
128 | + $this->logger->info('JSCombiner: deps file empty: '.$fileName); |
|
129 | 129 | return false; |
130 | 130 | } |
131 | 131 | |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | return true; |
145 | - } catch(NotFoundException $e) { |
|
145 | + } catch (NotFoundException $e) { |
|
146 | 146 | return false; |
147 | 147 | } |
148 | 148 | } |
@@ -155,17 +155,17 @@ discard block |
||
155 | 155 | */ |
156 | 156 | protected function cache($path, $fileName, ISimpleFolder $folder) { |
157 | 157 | $deps = []; |
158 | - $fullPath = $path . '/' . $fileName; |
|
158 | + $fullPath = $path.'/'.$fileName; |
|
159 | 159 | $data = json_decode(file_get_contents($fullPath)); |
160 | 160 | $deps[$fullPath] = filemtime($fullPath); |
161 | 161 | |
162 | 162 | $res = ''; |
163 | 163 | foreach ($data as $file) { |
164 | - $filePath = $path . '/' . $file; |
|
164 | + $filePath = $path.'/'.$file; |
|
165 | 165 | |
166 | 166 | if (is_file($filePath)) { |
167 | 167 | $res .= file_get_contents($filePath); |
168 | - $res .= PHP_EOL . PHP_EOL; |
|
168 | + $res .= PHP_EOL.PHP_EOL; |
|
169 | 169 | $deps[$filePath] = filemtime($filePath); |
170 | 170 | } |
171 | 171 | } |
@@ -173,11 +173,11 @@ discard block |
||
173 | 173 | $fileName = str_replace('.json', '.js', $fileName); |
174 | 174 | try { |
175 | 175 | $cachedfile = $folder->getFile($fileName); |
176 | - } catch(NotFoundException $e) { |
|
176 | + } catch (NotFoundException $e) { |
|
177 | 177 | $cachedfile = $folder->newFile($fileName); |
178 | 178 | } |
179 | 179 | |
180 | - $depFileName = $fileName . '.deps'; |
|
180 | + $depFileName = $fileName.'.deps'; |
|
181 | 181 | try { |
182 | 182 | $depFile = $folder->getFile($depFileName); |
183 | 183 | } catch (NotFoundException $e) { |
@@ -185,21 +185,21 @@ discard block |
||
185 | 185 | } |
186 | 186 | |
187 | 187 | try { |
188 | - $gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
188 | + $gzipFile = $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
189 | 189 | } catch (NotFoundException $e) { |
190 | - $gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
190 | + $gzipFile = $folder->newFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | try { |
194 | 194 | $cachedfile->putContent($res); |
195 | 195 | $deps = json_encode($deps); |
196 | 196 | $depFile->putContent($deps); |
197 | - $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps); |
|
197 | + $this->depsCache->set($folder->getName().'-'.$depFileName, $deps); |
|
198 | 198 | $gzipFile->putContent(gzencode($res, 9)); |
199 | - $this->logger->debug('JSCombiner: successfully cached: ' . $fileName); |
|
199 | + $this->logger->debug('JSCombiner: successfully cached: '.$fileName); |
|
200 | 200 | return true; |
201 | 201 | } catch (NotPermittedException $e) { |
202 | - $this->logger->error('JSCombiner: unable to cache: ' . $fileName); |
|
202 | + $this->logger->error('JSCombiner: unable to cache: '.$fileName); |
|
203 | 203 | return false; |
204 | 204 | } |
205 | 205 | } |
@@ -224,8 +224,8 @@ discard block |
||
224 | 224 | */ |
225 | 225 | public function getContent($root, $file) { |
226 | 226 | /** @var array $data */ |
227 | - $data = json_decode(file_get_contents($root . '/' . $file)); |
|
228 | - if(!is_array($data)) { |
|
227 | + $data = json_decode(file_get_contents($root.'/'.$file)); |
|
228 | + if (!is_array($data)) { |
|
229 | 229 | return []; |
230 | 230 | } |
231 | 231 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | $result = []; |
237 | 237 | foreach ($data as $f) { |
238 | - $result[] = $path . '/' . $f; |
|
238 | + $result[] = $path.'/'.$f; |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | return $result; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $keys = $this->getServersConfig($referenceConfigkey); |
100 | 100 | |
101 | 101 | $result = array(); |
102 | - foreach($keys as $key) { |
|
102 | + foreach ($keys as $key) { |
|
103 | 103 | $len = strlen($key) - strlen($referenceConfigkey); |
104 | 104 | $prefix = substr($key, 0, $len); |
105 | 105 | $result[$prefix] = $this->config->getAppValue('user_ldap', $key); |
@@ -116,18 +116,18 @@ discard block |
||
116 | 116 | public function getNextServerConfigurationPrefix() { |
117 | 117 | $serverConnections = $this->getServerConfigurationPrefixes(); |
118 | 118 | |
119 | - if(count($serverConnections) === 0) { |
|
119 | + if (count($serverConnections) === 0) { |
|
120 | 120 | return 's01'; |
121 | 121 | } |
122 | 122 | |
123 | 123 | sort($serverConnections); |
124 | 124 | $lastKey = array_pop($serverConnections); |
125 | - $lastNumber = (int)str_replace('s', '', $lastKey); |
|
126 | - return 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT); |
|
125 | + $lastNumber = (int) str_replace('s', '', $lastKey); |
|
126 | + return 's'.str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | private function getServersConfig($value) { |
130 | - $regex = '/' . $value . '$/S'; |
|
130 | + $regex = '/'.$value.'$/S'; |
|
131 | 131 | |
132 | 132 | $keys = $this->config->getAppKeys('user_ldap'); |
133 | 133 | $result = []; |
@@ -146,12 +146,12 @@ discard block |
||
146 | 146 | * @return bool true on success, false otherwise |
147 | 147 | */ |
148 | 148 | public function deleteServerConfiguration($prefix) { |
149 | - if(!in_array($prefix, self::getServerConfigurationPrefixes())) { |
|
149 | + if (!in_array($prefix, self::getServerConfigurationPrefixes())) { |
|
150 | 150 | return false; |
151 | 151 | } |
152 | 152 | |
153 | 153 | $saveOtherConfigurations = ''; |
154 | - if(empty($prefix)) { |
|
154 | + if (empty($prefix)) { |
|
155 | 155 | $saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\''; |
156 | 156 | } |
157 | 157 | |
@@ -165,11 +165,11 @@ discard block |
||
165 | 165 | '); |
166 | 166 | $delRows = $query->execute(array($prefix.'%')); |
167 | 167 | |
168 | - if($delRows === null) { |
|
168 | + if ($delRows === null) { |
|
169 | 169 | return false; |
170 | 170 | } |
171 | 171 | |
172 | - if($delRows === 0) { |
|
172 | + if ($delRows === 0) { |
|
173 | 173 | return false; |
174 | 174 | } |
175 | 175 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $all = $this->getServerConfigurationPrefixes(false); |
186 | 186 | $active = $this->getServerConfigurationPrefixes(true); |
187 | 187 | |
188 | - if(!is_array($all) || !is_array($active)) { |
|
188 | + if (!is_array($all) || !is_array($active)) { |
|
189 | 189 | throw new \Exception('Unexpected Return Value'); |
190 | 190 | } |
191 | 191 | |
@@ -199,14 +199,14 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function getDomainFromURL($url) { |
201 | 201 | $uinfo = parse_url($url); |
202 | - if(!is_array($uinfo)) { |
|
202 | + if (!is_array($uinfo)) { |
|
203 | 203 | return false; |
204 | 204 | } |
205 | 205 | |
206 | 206 | $domain = false; |
207 | - if(isset($uinfo['host'])) { |
|
207 | + if (isset($uinfo['host'])) { |
|
208 | 208 | $domain = $uinfo['host']; |
209 | - } else if(isset($uinfo['path'])) { |
|
209 | + } else if (isset($uinfo['path'])) { |
|
210 | 210 | $domain = $uinfo['path']; |
211 | 211 | } |
212 | 212 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public function setLDAPProvider() { |
222 | 222 | $current = \OC::$server->getConfig()->getSystemValue('ldapProviderFactory', null); |
223 | - if(is_null($current)) { |
|
223 | + if (is_null($current)) { |
|
224 | 224 | \OC::$server->getConfig()->setSystemValue('ldapProviderFactory', LDAPProviderFactory::class); |
225 | 225 | } |
226 | 226 | } |
@@ -232,9 +232,9 @@ discard block |
||
232 | 232 | */ |
233 | 233 | public function sanitizeDN($dn) { |
234 | 234 | //treating multiple base DNs |
235 | - if(is_array($dn)) { |
|
235 | + if (is_array($dn)) { |
|
236 | 236 | $result = array(); |
237 | - foreach($dn as $singleDN) { |
|
237 | + foreach ($dn as $singleDN) { |
|
238 | 238 | $result[] = $this->sanitizeDN($singleDN); |
239 | 239 | } |
240 | 240 | return $result; |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | * @throws \Exception |
286 | 286 | */ |
287 | 287 | public static function loginName2UserName($param) { |
288 | - if(!isset($param['uid'])) { |
|
288 | + if (!isset($param['uid'])) { |
|
289 | 289 | throw new \Exception('key uid is expected to be set in $param'); |
290 | 290 | } |
291 | 291 | |
@@ -300,11 +300,11 @@ discard block |
||
300 | 300 | $userSession = \OC::$server->getUserSession(); |
301 | 301 | $userPluginManager = \OC::$server->query('LDAPUserPluginManager'); |
302 | 302 | |
303 | - $userBackend = new User_Proxy( |
|
303 | + $userBackend = new User_Proxy( |
|
304 | 304 | $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager |
305 | 305 | ); |
306 | - $uid = $userBackend->loginName2UserName($param['uid'] ); |
|
307 | - if($uid !== false) { |
|
306 | + $uid = $userBackend->loginName2UserName($param['uid']); |
|
307 | + if ($uid !== false) { |
|
308 | 308 | $param['uid'] = $uid; |
309 | 309 | } |
310 | 310 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | header('X-Accel-Buffering: no'); |
61 | 61 | $this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true'; |
62 | 62 | if ($this->fallback) { |
63 | - $this->fallBackId = (int)$_GET['fallback_id']; |
|
63 | + $this->fallBackId = (int) $_GET['fallback_id']; |
|
64 | 64 | /** |
65 | 65 | * FIXME: The default content-security-policy of ownCloud forbids inline |
66 | 66 | * JavaScript for security reasons. IE starting on Windows 10 will |
@@ -73,11 +73,11 @@ discard block |
||
73 | 73 | */ |
74 | 74 | header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'"); |
75 | 75 | header("Content-Type: text/html"); |
76 | - echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy |
|
76 | + echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy |
|
77 | 77 | } else { |
78 | 78 | header("Content-Type: text/event-stream"); |
79 | 79 | } |
80 | - if(!\OC::$server->getRequest()->passesStrictCookieCheck()) { |
|
80 | + if (!\OC::$server->getRequest()->passesStrictCookieCheck()) { |
|
81 | 81 | header('Location: '.\OC::$WEBROOT); |
82 | 82 | exit(); |
83 | 83 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function send($type, $data = null) { |
103 | 103 | if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) { |
104 | - throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')'); |
|
104 | + throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')'); |
|
105 | 105 | } |
106 | 106 | $this->init(); |
107 | 107 | if (is_null($data)) { |
@@ -110,13 +110,13 @@ discard block |
||
110 | 110 | } |
111 | 111 | if ($this->fallback) { |
112 | 112 | $response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack(' |
113 | - . $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL; |
|
113 | + . $this->fallBackId.',"'.$type.'",'.OC_JSON::encode($data).')</script>'.PHP_EOL; |
|
114 | 114 | echo $response; |
115 | 115 | } else { |
116 | 116 | if ($type) { |
117 | - echo 'event: ' . $type . PHP_EOL; |
|
117 | + echo 'event: '.$type.PHP_EOL; |
|
118 | 118 | } |
119 | - echo 'data: ' . OC_JSON::encode($data) . PHP_EOL; |
|
119 | + echo 'data: '.OC_JSON::encode($data).PHP_EOL; |
|
120 | 120 | } |
121 | 121 | echo PHP_EOL; |
122 | 122 | flush(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $l = \OC::$server->getL10N('files'); |
33 | 33 | |
34 | 34 | // Load the files |
35 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
35 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
36 | 36 | $dir = \OC\Files\Filesystem::normalizePath($dir); |
37 | 37 | |
38 | 38 | try { |
@@ -43,11 +43,11 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | $data = array(); |
46 | - $baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir='; |
|
46 | + $baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php').'?dir='; |
|
47 | 47 | |
48 | 48 | $permissions = $dirInfo->getPermissions(); |
49 | 49 | |
50 | - $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
50 | + $sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name'; |
|
51 | 51 | $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
52 | 52 | $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
53 | 53 |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * @return bool |
54 | 54 | */ |
55 | 55 | public function isColNameValid($col) { |
56 | - switch($col) { |
|
56 | + switch ($col) { |
|
57 | 57 | case 'ldap_dn': |
58 | 58 | case 'owncloud_name': |
59 | 59 | case 'directory_uuid': |
@@ -72,19 +72,19 @@ discard block |
||
72 | 72 | * @return string|false |
73 | 73 | */ |
74 | 74 | protected function getXbyY($fetchCol, $compareCol, $search) { |
75 | - if(!$this->isColNameValid($fetchCol)) { |
|
75 | + if (!$this->isColNameValid($fetchCol)) { |
|
76 | 76 | //this is used internally only, but we don't want to risk |
77 | 77 | //having SQL injection at all. |
78 | 78 | throw new \Exception('Invalid Column Name'); |
79 | 79 | } |
80 | 80 | $query = $this->dbc->prepare(' |
81 | - SELECT `' . $fetchCol . '` |
|
82 | - FROM `'. $this->getTableName() .'` |
|
83 | - WHERE `' . $compareCol . '` = ? |
|
81 | + SELECT `' . $fetchCol.'` |
|
82 | + FROM `'. $this->getTableName().'` |
|
83 | + WHERE `' . $compareCol.'` = ? |
|
84 | 84 | '); |
85 | 85 | |
86 | 86 | $res = $query->execute(array($search)); |
87 | - if($res !== false) { |
|
87 | + if ($res !== false) { |
|
88 | 88 | return $query->fetchColumn(); |
89 | 89 | } |
90 | 90 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function setDNbyUUID($fdn, $uuid) { |
122 | 122 | $query = $this->dbc->prepare(' |
123 | - UPDATE `' . $this->getTableName() . '` |
|
123 | + UPDATE `' . $this->getTableName().'` |
|
124 | 124 | SET `ldap_dn` = ? |
125 | 125 | WHERE `directory_uuid` = ? |
126 | 126 | '); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function setUUIDbyDN($uuid, $fdn) { |
141 | 141 | $query = $this->dbc->prepare(' |
142 | - UPDATE `' . $this->getTableName() . '` |
|
142 | + UPDATE `' . $this->getTableName().'` |
|
143 | 143 | SET `directory_uuid` = ? |
144 | 144 | WHERE `ldap_dn` = ? |
145 | 145 | '); |
@@ -166,14 +166,14 @@ discard block |
||
166 | 166 | public function getNamesBySearch($search, $prefixMatch = "", $postfixMatch = "") { |
167 | 167 | $query = $this->dbc->prepare(' |
168 | 168 | SELECT `owncloud_name` |
169 | - FROM `'. $this->getTableName() .'` |
|
169 | + FROM `'. $this->getTableName().'` |
|
170 | 170 | WHERE `owncloud_name` LIKE ? |
171 | 171 | '); |
172 | 172 | |
173 | 173 | $res = $query->execute(array($prefixMatch.$this->dbc->escapeLikeParameter($search).$postfixMatch)); |
174 | 174 | $names = array(); |
175 | - if($res !== false) { |
|
176 | - while($row = $query->fetch()) { |
|
175 | + if ($res !== false) { |
|
176 | + while ($row = $query->fetch()) { |
|
177 | 177 | $names[] = $row['owncloud_name']; |
178 | 178 | } |
179 | 179 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | `ldap_dn` AS `dn`, |
212 | 212 | `owncloud_name` AS `name`, |
213 | 213 | `directory_uuid` AS `uuid` |
214 | - FROM `' . $this->getTableName() . '`', |
|
214 | + FROM `' . $this->getTableName().'`', |
|
215 | 215 | $limit, |
216 | 216 | $offset |
217 | 217 | ); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | * @return bool |
229 | 229 | */ |
230 | 230 | public function map($fdn, $name, $uuid) { |
231 | - if(mb_strlen($fdn) > 255) { |
|
231 | + if (mb_strlen($fdn) > 255) { |
|
232 | 232 | \OC::$server->getLogger()->error( |
233 | 233 | 'Cannot map, because the DN exceeds 255 characters: {dn}', |
234 | 234 | [ |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | try { |
249 | 249 | $result = $this->dbc->insertIfNotExist($this->getTableName(), $row); |
250 | 250 | // insertIfNotExist returns values as int |
251 | - return (bool)$result; |
|
251 | + return (bool) $result; |
|
252 | 252 | } catch (\Exception $e) { |
253 | 253 | return false; |
254 | 254 | } |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | */ |
262 | 262 | public function unmap($name) { |
263 | 263 | $query = $this->dbc->prepare(' |
264 | - DELETE FROM `'. $this->getTableName() .'` |
|
264 | + DELETE FROM `'. $this->getTableName().'` |
|
265 | 265 | WHERE `owncloud_name` = ?'); |
266 | 266 | |
267 | 267 | return $this->modify($query, array($name)); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | public function clear() { |
275 | 275 | $sql = $this->dbc |
276 | 276 | ->getDatabasePlatform() |
277 | - ->getTruncateTableSQL('`' . $this->getTableName() . '`'); |
|
277 | + ->getTruncateTableSQL('`'.$this->getTableName().'`'); |
|
278 | 278 | return $this->dbc->prepare($sql)->execute(); |
279 | 279 | } |
280 | 280 | |
@@ -293,9 +293,9 @@ discard block |
||
293 | 293 | ->from($this->getTableName()); |
294 | 294 | $cursor = $picker->execute(); |
295 | 295 | $result = true; |
296 | - while($id = $cursor->fetchColumn(0)) { |
|
296 | + while ($id = $cursor->fetchColumn(0)) { |
|
297 | 297 | $preCallback($id); |
298 | - if($isUnmapped = $this->unmap($id)) { |
|
298 | + if ($isUnmapped = $this->unmap($id)) { |
|
299 | 299 | $postCallback($id); |
300 | 300 | } |
301 | 301 | $result &= $isUnmapped; |
@@ -316,6 +316,6 @@ discard block |
||
316 | 316 | $res = $query->execute(); |
317 | 317 | $count = $res->fetchColumn(); |
318 | 318 | $res->closeCursor(); |
319 | - return (int)$count; |
|
319 | + return (int) $count; |
|
320 | 320 | } |
321 | 321 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | protected function buildPath($path) { |
59 | - $fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path); |
|
59 | + $fullPath = \OC\Files\Filesystem::normalizePath($this->root.'/'.$path); |
|
60 | 60 | return ltrim($fullPath, '/'); |
61 | 61 | } |
62 | 62 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | } catch (FileNotFoundException $e) { |
164 | 164 | return false; |
165 | 165 | } |
166 | - $names = array_map(function ($object) { |
|
166 | + $names = array_map(function($object) { |
|
167 | 167 | return $object['basename']; |
168 | 168 | }, $content); |
169 | 169 | return IteratorDirectory::wrap($names); |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
210 | 210 | } |
211 | 211 | $source = fopen($tmpFile, $mode); |
212 | - return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) { |
|
212 | + return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath) { |
|
213 | 213 | $this->flysystem->putStream($fullPath, fopen($tmpFile, 'r')); |
214 | 214 | unlink($tmpFile); |
215 | 215 | }); |
@@ -91,20 +91,20 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function addFolder($path) { |
93 | 93 | $tmpBase = \OC::$server->getTempManager()->getTemporaryFolder(); |
94 | - $path = rtrim($path, '/') . '/'; |
|
94 | + $path = rtrim($path, '/').'/'; |
|
95 | 95 | if ($this->fileExists($path)) { |
96 | 96 | return false; |
97 | 97 | } |
98 | 98 | $parts = explode('/', $path); |
99 | 99 | $folder = $tmpBase; |
100 | 100 | foreach ($parts as $part) { |
101 | - $folder .= '/' . $part; |
|
101 | + $folder .= '/'.$part; |
|
102 | 102 | if (!is_dir($folder)) { |
103 | 103 | mkdir($folder); |
104 | 104 | } |
105 | 105 | } |
106 | - $result = $this->tar->addModify(array($tmpBase . $path), '', $tmpBase); |
|
107 | - rmdir($tmpBase . $path); |
|
106 | + $result = $this->tar->addModify(array($tmpBase.$path), '', $tmpBase); |
|
107 | + rmdir($tmpBase.$path); |
|
108 | 108 | $this->fileList = false; |
109 | 109 | $this->cachedHeaders = false; |
110 | 110 | return $result; |
@@ -141,12 +141,12 @@ discard block |
||
141 | 141 | //no proper way to delete, rename entire archive, rename file and remake archive |
142 | 142 | $tmp = \OC::$server->getTempManager()->getTemporaryFolder(); |
143 | 143 | $this->tar->extract($tmp); |
144 | - rename($tmp . $source, $tmp . $dest); |
|
144 | + rename($tmp.$source, $tmp.$dest); |
|
145 | 145 | $this->tar = null; |
146 | 146 | unlink($this->path); |
147 | 147 | $types = array(null, 'gz', 'bz'); |
148 | 148 | $this->tar = new \Archive_Tar($this->path, $types[self::getTarType($this->path)]); |
149 | - $this->tar->createModify(array($tmp), '', $tmp . '/'); |
|
149 | + $this->tar->createModify(array($tmp), '', $tmp.'/'); |
|
150 | 150 | $this->fileList = false; |
151 | 151 | $this->cachedHeaders = false; |
152 | 152 | return true; |
@@ -161,9 +161,9 @@ discard block |
||
161 | 161 | } |
162 | 162 | foreach ($this->cachedHeaders as $header) { |
163 | 163 | if ($file == $header['filename'] |
164 | - or $file . '/' == $header['filename'] |
|
165 | - or '/' . $file . '/' == $header['filename'] |
|
166 | - or '/' . $file == $header['filename'] |
|
164 | + or $file.'/' == $header['filename'] |
|
165 | + or '/'.$file.'/' == $header['filename'] |
|
166 | + or '/'.$file == $header['filename'] |
|
167 | 167 | ) { |
168 | 168 | return $header; |
169 | 169 | } |
@@ -262,13 +262,13 @@ discard block |
||
262 | 262 | if (!$this->fileExists($path)) { |
263 | 263 | return false; |
264 | 264 | } |
265 | - if ($this->fileExists('/' . $path)) { |
|
266 | - $success = $this->tar->extractList(array('/' . $path), $tmp); |
|
265 | + if ($this->fileExists('/'.$path)) { |
|
266 | + $success = $this->tar->extractList(array('/'.$path), $tmp); |
|
267 | 267 | } else { |
268 | 268 | $success = $this->tar->extractList(array($path), $tmp); |
269 | 269 | } |
270 | 270 | if ($success) { |
271 | - rename($tmp . $path, $dest); |
|
271 | + rename($tmp.$path, $dest); |
|
272 | 272 | } |
273 | 273 | \OCP\Files::rmdirr($tmp); |
274 | 274 | return $success; |
@@ -292,10 +292,10 @@ discard block |
||
292 | 292 | */ |
293 | 293 | public function fileExists($path) { |
294 | 294 | $files = $this->getFiles(); |
295 | - if ((array_search($path, $files) !== false) or (array_search($path . '/', $files) !== false)) { |
|
295 | + if ((array_search($path, $files) !== false) or (array_search($path.'/', $files) !== false)) { |
|
296 | 296 | return true; |
297 | 297 | } else { |
298 | - $folderPath = rtrim($path, '/') . '/'; |
|
298 | + $folderPath = rtrim($path, '/').'/'; |
|
299 | 299 | $pathLength = strlen($folderPath); |
300 | 300 | foreach ($files as $file) { |
301 | 301 | if (strlen($file) > $pathLength and substr($file, 0, $pathLength) == $folderPath) { |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | } |
305 | 305 | } |
306 | 306 | if ($path[0] != '/') { //not all programs agree on the use of a leading / |
307 | - return $this->fileExists('/' . $path); |
|
307 | + return $this->fileExists('/'.$path); |
|
308 | 308 | } else { |
309 | 309 | return false; |
310 | 310 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | //no proper way to delete, extract entire archive, delete file and remake archive |
326 | 326 | $tmp = \OC::$server->getTempManager()->getTemporaryFolder(); |
327 | 327 | $this->tar->extract($tmp); |
328 | - \OCP\Files::rmdirr($tmp . $path); |
|
328 | + \OCP\Files::rmdirr($tmp.$path); |
|
329 | 329 | $this->tar = null; |
330 | 330 | unlink($this->path); |
331 | 331 | $this->reopen(); |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | return fopen($tmpFile, $mode); |
357 | 357 | } else { |
358 | 358 | $handle = fopen($tmpFile, $mode); |
359 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
359 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
360 | 360 | $this->writeBack($tmpFile, $path); |
361 | 361 | }); |
362 | 362 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | 'post_createUser', |
78 | 78 | $this, |
79 | 79 | 'postCreateUser'); |
80 | - \OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function ($uid) { |
|
80 | + \OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function($uid) { |
|
81 | 81 | $this->postCreateUser(['uid' => $uid]); |
82 | 82 | }); |
83 | 83 | Util::connectHook('OC_User', |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | 'post_deleteUser', |
90 | 90 | $this, |
91 | 91 | 'postDeleteUser'); |
92 | - \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function ($uid) { |
|
92 | + \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function($uid) { |
|
93 | 93 | $this->postDeleteUser(['uid' => $uid]); |
94 | 94 | }); |
95 | 95 | \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', [$this, 'postUnassignedUserId']); |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | public function preDeleteUser($params) { |
108 | 108 | $uid = $params['uid']; |
109 | 109 | $this->usersToDelete[$uid] = $this->userManager->get($uid); |
110 | - $this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/' . $uid); |
|
111 | - $this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/' . $uid); |
|
110 | + $this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/'.$uid); |
|
111 | + $this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/'.$uid); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | public function preUnassignedUserId($uid) { |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | |
118 | 118 | public function postDeleteUser($params) { |
119 | 119 | $uid = $params['uid']; |
120 | - if (isset($this->usersToDelete[$uid])){ |
|
120 | + if (isset($this->usersToDelete[$uid])) { |
|
121 | 121 | $this->syncService->deleteUser($this->usersToDelete[$uid]); |
122 | 122 | } |
123 | 123 | |
124 | 124 | foreach ($this->calendarsToDelete as $calendar) { |
125 | 125 | $this->calDav->deleteCalendar($calendar['id']); |
126 | 126 | } |
127 | - $this->calDav->deleteAllSharesByUser('principals/users/' . $uid); |
|
127 | + $this->calDav->deleteAllSharesByUser('principals/users/'.$uid); |
|
128 | 128 | |
129 | 129 | foreach ($this->addressBooksToDelete as $addressBook) { |
130 | 130 | $this->cardDav->deleteAddressBook($addressBook['id']); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | public function postUnassignedUserId($uid) { |
135 | - if (isset($this->usersToDelete[$uid])){ |
|
135 | + if (isset($this->usersToDelete[$uid])) { |
|
136 | 136 | $this->syncService->deleteUser($this->usersToDelete[$uid]); |
137 | 137 | } |
138 | 138 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | public function firstLogin(IUser $user = null) { |
146 | 146 | if (!is_null($user)) { |
147 | - $principal = 'principals/users/' . $user->getUID(); |
|
147 | + $principal = 'principals/users/'.$user->getUID(); |
|
148 | 148 | if ($this->calDav->getCalendarsForUserCount($principal) === 0) { |
149 | 149 | try { |
150 | 150 | $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [ |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | * @since 5.0.0 |
54 | 54 | * @deprecated 14.0.0 |
55 | 55 | */ |
56 | - static public function rmdirr( $dir ) { |
|
57 | - return \OC_Helper::rmdirr( $dir ); |
|
56 | + static public function rmdirr($dir) { |
|
57 | + return \OC_Helper::rmdirr($dir); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @since 5.0.0 |
66 | 66 | * @deprecated 14.0.0 |
67 | 67 | */ |
68 | - static public function getMimeType( $path ) { |
|
68 | + static public function getMimeType($path) { |
|
69 | 69 | return \OC::$server->getMimeTypeDetector()->detect($path); |
70 | 70 | } |
71 | 71 | |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | * @since 5.0.0 |
89 | 89 | * @deprecated 14.0.0 |
90 | 90 | */ |
91 | - public static function streamCopy( $source, $target ) { |
|
92 | - list($count, ) = \OC_Helper::streamCopy( $source, $target ); |
|
91 | + public static function streamCopy($source, $target) { |
|
92 | + list($count,) = \OC_Helper::streamCopy($source, $target); |
|
93 | 93 | return $count; |
94 | 94 | } |
95 | 95 | |
@@ -114,6 +114,6 @@ discard block |
||
114 | 114 | * @deprecated 14.0.0 use IAppData instead |
115 | 115 | */ |
116 | 116 | public static function getStorage($app) { |
117 | - return \OC_App::getStorage( $app ); |
|
117 | + return \OC_App::getStorage($app); |
|
118 | 118 | } |
119 | 119 | } |