@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | |
70 | 70 | public function __construct() { |
71 | 71 | $minutes = \OC::$server->getConfig()->getSystemValue( |
72 | - 'ldapUserCleanupInterval', (string)$this->defaultIntervalMin); |
|
73 | - $this->setInterval((int)$minutes * 60); |
|
72 | + 'ldapUserCleanupInterval', (string) $this->defaultIntervalMin); |
|
73 | + $this->setInterval((int) $minutes * 60); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -83,22 +83,22 @@ discard block |
||
83 | 83 | //pass in app.php we do add here, except something else is passed e.g. |
84 | 84 | //in tests. |
85 | 85 | |
86 | - if(isset($arguments['helper'])) { |
|
86 | + if (isset($arguments['helper'])) { |
|
87 | 87 | $this->ldapHelper = $arguments['helper']; |
88 | 88 | } else { |
89 | 89 | $this->ldapHelper = new Helper(\OC::$server->getConfig()); |
90 | 90 | } |
91 | 91 | |
92 | - if(isset($arguments['ocConfig'])) { |
|
92 | + if (isset($arguments['ocConfig'])) { |
|
93 | 93 | $this->ocConfig = $arguments['ocConfig']; |
94 | 94 | } else { |
95 | 95 | $this->ocConfig = \OC::$server->getConfig(); |
96 | 96 | } |
97 | 97 | |
98 | - if(isset($arguments['userBackend'])) { |
|
98 | + if (isset($arguments['userBackend'])) { |
|
99 | 99 | $this->userBackend = $arguments['userBackend']; |
100 | 100 | } else { |
101 | - $this->userBackend = new User_Proxy( |
|
101 | + $this->userBackend = new User_Proxy( |
|
102 | 102 | $this->ldapHelper->getServerConfigurationPrefixes(true), |
103 | 103 | new LDAP(), |
104 | 104 | $this->ocConfig, |
@@ -108,19 +108,19 @@ discard block |
||
108 | 108 | ); |
109 | 109 | } |
110 | 110 | |
111 | - if(isset($arguments['db'])) { |
|
111 | + if (isset($arguments['db'])) { |
|
112 | 112 | $this->db = $arguments['db']; |
113 | 113 | } else { |
114 | 114 | $this->db = \OC::$server->getDatabaseConnection(); |
115 | 115 | } |
116 | 116 | |
117 | - if(isset($arguments['mapping'])) { |
|
117 | + if (isset($arguments['mapping'])) { |
|
118 | 118 | $this->mapping = $arguments['mapping']; |
119 | 119 | } else { |
120 | 120 | $this->mapping = new UserMapping($this->db); |
121 | 121 | } |
122 | 122 | |
123 | - if(isset($arguments['deletedUsersIndex'])) { |
|
123 | + if (isset($arguments['deletedUsersIndex'])) { |
|
124 | 124 | $this->dui = $arguments['deletedUsersIndex']; |
125 | 125 | } else { |
126 | 126 | $this->dui = new DeletedUsersIndex( |
@@ -135,11 +135,11 @@ discard block |
||
135 | 135 | public function run($argument) { |
136 | 136 | $this->setArguments($argument); |
137 | 137 | |
138 | - if(!$this->isCleanUpAllowed()) { |
|
138 | + if (!$this->isCleanUpAllowed()) { |
|
139 | 139 | return; |
140 | 140 | } |
141 | 141 | $users = $this->mapping->getList($this->getOffset(), $this->limit); |
142 | - if(!is_array($users)) { |
|
142 | + if (!is_array($users)) { |
|
143 | 143 | //something wrong? Let's start from the beginning next time and |
144 | 144 | //abort |
145 | 145 | $this->setOffset(true); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | */ |
166 | 166 | public function isCleanUpAllowed() { |
167 | 167 | try { |
168 | - if($this->ldapHelper->haveDisabledConfigurations()) { |
|
168 | + if ($this->ldapHelper->haveDisabledConfigurations()) { |
|
169 | 169 | return false; |
170 | 170 | } |
171 | 171 | } catch (\Exception $e) { |
@@ -182,8 +182,8 @@ discard block |
||
182 | 182 | * @return bool |
183 | 183 | */ |
184 | 184 | private function isCleanUpEnabled() { |
185 | - return (bool)$this->ocConfig->getSystemValue( |
|
186 | - 'ldapUserCleanupInterval', (string)$this->defaultIntervalMin); |
|
185 | + return (bool) $this->ocConfig->getSystemValue( |
|
186 | + 'ldapUserCleanupInterval', (string) $this->defaultIntervalMin); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | /** |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * @param array $users result from getMappedUsers() |
192 | 192 | */ |
193 | 193 | private function checkUsers(array $users) { |
194 | - foreach($users as $user) { |
|
194 | + foreach ($users as $user) { |
|
195 | 195 | $this->checkUser($user); |
196 | 196 | } |
197 | 197 | } |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | * @param string[] $user |
202 | 202 | */ |
203 | 203 | private function checkUser(array $user) { |
204 | - if($this->userBackend->userExistsOnLDAP($user['name'])) { |
|
204 | + if ($this->userBackend->userExistsOnLDAP($user['name'])) { |
|
205 | 205 | //still available, all good |
206 | 206 | |
207 | 207 | return; |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | * @return int |
216 | 216 | */ |
217 | 217 | private function getOffset() { |
218 | - return (int)$this->ocConfig->getAppValue('user_ldap', 'cleanUpJobOffset', 0); |
|
218 | + return (int) $this->ocConfig->getAppValue('user_ldap', 'cleanUpJobOffset', 0); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -223,8 +223,7 @@ discard block |
||
223 | 223 | * @param bool $reset whether the offset should be set to 0 |
224 | 224 | */ |
225 | 225 | public function setOffset($reset = false) { |
226 | - $newOffset = $reset ? 0 : |
|
227 | - $this->getOffset() + $this->limit; |
|
226 | + $newOffset = $reset ? 0 : $this->getOffset() + $this->limit; |
|
228 | 227 | $this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset); |
229 | 228 | } |
230 | 229 |
@@ -90,16 +90,16 @@ discard block |
||
90 | 90 | * @throws \InvalidArgumentException |
91 | 91 | */ |
92 | 92 | protected function validateOffsetAndLimit($offset, $limit) { |
93 | - if($limit < 0) { |
|
93 | + if ($limit < 0) { |
|
94 | 94 | throw new \InvalidArgumentException('limit must be 0 or greater'); |
95 | 95 | } |
96 | - if($offset < 0) { |
|
96 | + if ($offset < 0) { |
|
97 | 97 | throw new \InvalidArgumentException('offset must be 0 or greater'); |
98 | 98 | } |
99 | - if($limit === 0 && $offset !== 0) { |
|
99 | + if ($limit === 0 && $offset !== 0) { |
|
100 | 100 | throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0'); |
101 | 101 | } |
102 | - if($offset > 0 && ($offset % $limit !== 0)) { |
|
102 | + if ($offset > 0 && ($offset % $limit !== 0)) { |
|
103 | 103 | throw new \InvalidArgumentException('offset must be a multiple of limit'); |
104 | 104 | } |
105 | 105 | } |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
110 | 110 | $ldapWrapper = new LDAP(); |
111 | 111 | |
112 | - $offset = (int)$input->getOption('offset'); |
|
113 | - $limit = (int)$input->getOption('limit'); |
|
112 | + $offset = (int) $input->getOption('offset'); |
|
113 | + $limit = (int) $input->getOption('limit'); |
|
114 | 114 | $this->validateOffsetAndLimit($offset, $limit); |
115 | 115 | |
116 | - if($input->getOption('group')) { |
|
116 | + if ($input->getOption('group')) { |
|
117 | 117 | $proxy = new Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query('LDAPGroupPluginManager')); |
118 | 118 | $getMethod = 'getGroups'; |
119 | 119 | $printID = false; |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | $result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset); |
139 | - foreach($result as $id => $name) { |
|
140 | - $line = $name . ($printID ? ' ('.$id.')' : ''); |
|
139 | + foreach ($result as $id => $name) { |
|
140 | + $line = $name.($printID ? ' ('.$id.')' : ''); |
|
141 | 141 | $output->writeln($line); |
142 | 142 | } |
143 | 143 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function run(IOutput $output) { |
73 | 73 | $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1'); |
74 | - if(version_compare($installedVersion, '1.2.1') !== -1) { |
|
74 | + if (version_compare($installedVersion, '1.2.1') !== -1) { |
|
75 | 75 | return; |
76 | 76 | } |
77 | 77 | |
@@ -82,15 +82,15 @@ discard block |
||
82 | 82 | do { |
83 | 83 | $retry = false; |
84 | 84 | $records = $mapper->getList($offset, $batchSize); |
85 | - if(count($records) === 0){ |
|
85 | + if (count($records) === 0) { |
|
86 | 86 | continue; |
87 | 87 | } |
88 | 88 | try { |
89 | 89 | $this->jobList->add($jobClass, ['records' => $records]); |
90 | 90 | $offset += $batchSize; |
91 | 91 | } catch (\InvalidArgumentException $e) { |
92 | - if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | - $batchSize = (int)floor(count($records) * 0.8); |
|
92 | + if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | + $batchSize = (int) floor(count($records) * 0.8); |
|
94 | 94 | $retry = true; |
95 | 95 | } |
96 | 96 | } |
@@ -32,13 +32,13 @@ |
||
32 | 32 | $serverConnections = $helper->getServerConfigurationPrefixes(); |
33 | 33 | sort($serverConnections); |
34 | 34 | $lk = array_pop($serverConnections); |
35 | -$ln = (int)str_replace('s', '', $lk); |
|
36 | -$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT); |
|
35 | +$ln = (int) str_replace('s', '', $lk); |
|
36 | +$nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT); |
|
37 | 37 | |
38 | 38 | $resultData = array('configPrefix' => $nk); |
39 | 39 | |
40 | 40 | $newConfig = new \OCA\User_LDAP\Configuration($nk, false); |
41 | -if(isset($_POST['copyConfig'])) { |
|
41 | +if (isset($_POST['copyConfig'])) { |
|
42 | 42 | $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
43 | 43 | $newConfig->setConfiguration($originalConfig->getConfiguration()); |
44 | 44 | } else { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | use OCA\Files\Capabilities; |
35 | 35 | |
36 | 36 | class Application extends App { |
37 | - public function __construct(array $urlParams=array()) { |
|
37 | + public function __construct(array $urlParams = array()) { |
|
38 | 38 | parent::__construct('files', $urlParams); |
39 | 39 | $container = $this->getContainer(); |
40 | 40 | $server = $container->getServer(); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | /** |
43 | 43 | * Controllers |
44 | 44 | */ |
45 | - $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
45 | + $container->registerService('APIController', function(IContainer $c) use ($server) { |
|
46 | 46 | return new ApiController( |
47 | 47 | $c->query('AppName'), |
48 | 48 | $c->query('Request'), |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | ); |
56 | 56 | }); |
57 | 57 | |
58 | - $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
58 | + $container->registerService('ViewController', function(IContainer $c) use ($server) { |
|
59 | 59 | return new ViewController( |
60 | 60 | $c->query('AppName'), |
61 | 61 | $c->query('Request'), |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | /** |
80 | 80 | * Services |
81 | 81 | */ |
82 | - $container->registerService('Tagger', function(IContainer $c) { |
|
82 | + $container->registerService('Tagger', function(IContainer $c) { |
|
83 | 83 | return $c->query('ServerContainer')->getTagManager()->load('files'); |
84 | 84 | }); |
85 | 85 | $container->registerService('TagService', function(IContainer $c) use ($server) { |
@@ -90,11 +90,11 @@ |
||
90 | 90 | */ |
91 | 91 | static private function renameChildren($oldPath, $newPath) { |
92 | 92 | |
93 | - $absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath); |
|
94 | - $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath); |
|
93 | + $absNewPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$newPath); |
|
94 | + $absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$oldPath); |
|
95 | 95 | |
96 | 96 | $mountManager = \OC\Files\Filesystem::getMountManager(); |
97 | - $mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath); |
|
97 | + $mountedShares = $mountManager->findIn('/'.\OCP\User::getUser().'/files/'.$oldPath); |
|
98 | 98 | foreach ($mountedShares as $mount) { |
99 | 99 | if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) { |
100 | 100 | $mountPoint = $mount->getMountPoint(); |
@@ -70,7 +70,7 @@ |
||
70 | 70 | |
71 | 71 | $container = $this->getContainer(); |
72 | 72 | |
73 | - $container->registerService(IUserMountCache::class, function (IAppContainer $c) { |
|
73 | + $container->registerService(IUserMountCache::class, function(IAppContainer $c) { |
|
74 | 74 | return $c->getServer()->query('UserMountCache'); |
75 | 75 | }); |
76 | 76 |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | |
46 | 46 | function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) { |
47 | 47 | $access = parent::checkPrivileges($uri, $privileges, $recursion, false); |
48 | - if($access === false && $throwExceptions) { |
|
48 | + if ($access === false && $throwExceptions) { |
|
49 | 49 | /** @var INode $node */ |
50 | 50 | $node = $this->server->tree->getNodeForPath($uri); |
51 | 51 | |
52 | - switch(get_class($node)) { |
|
52 | + switch (get_class($node)) { |
|
53 | 53 | case AddressBook::class: |
54 | 54 | $type = 'Addressbook'; |
55 | 55 | break; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | public function propFind(PropFind $propFind, INode $node) { |
73 | 73 | // If the node is neither readable nor writable then fail unless its of |
74 | 74 | // the standard user-principal |
75 | - if(!($node instanceof User)) { |
|
75 | + if (!($node instanceof User)) { |
|
76 | 76 | $path = $propFind->getPath(); |
77 | 77 | $readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false); |
78 | 78 | $writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | return array(); |
92 | 92 | } |
93 | 93 | |
94 | - $path = $this->getPathToCertificates() . 'uploads/'; |
|
94 | + $path = $this->getPathToCertificates().'uploads/'; |
|
95 | 95 | if (!$this->view->is_dir($path)) { |
96 | 96 | return array(); |
97 | 97 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | while (false !== ($file = readdir($handle))) { |
104 | 104 | if ($file != '.' && $file != '..') { |
105 | 105 | try { |
106 | - $result[] = new Certificate($this->view->file_get_contents($path . $file), $file); |
|
106 | + $result[] = new Certificate($this->view->file_get_contents($path.$file), $file); |
|
107 | 107 | } catch (\Exception $e) { |
108 | 108 | } |
109 | 109 | } |
@@ -123,20 +123,20 @@ discard block |
||
123 | 123 | $this->view->mkdir($path); |
124 | 124 | } |
125 | 125 | |
126 | - $defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); |
|
126 | + $defaultCertificates = file_get_contents(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt'); |
|
127 | 127 | if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle |
128 | 128 | // log as exception so we have a stacktrace |
129 | 129 | $this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle')); |
130 | 130 | return; |
131 | 131 | } |
132 | 132 | |
133 | - $certPath = $path . 'rootcerts.crt'; |
|
134 | - $tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS); |
|
133 | + $certPath = $path.'rootcerts.crt'; |
|
134 | + $tmpPath = $certPath.'.tmp'.$this->random->generate(10, ISecureRandom::CHAR_DIGITS); |
|
135 | 135 | $fhCerts = $this->view->fopen($tmpPath, 'w'); |
136 | 136 | |
137 | 137 | // Write user certificates |
138 | 138 | foreach ($certs as $cert) { |
139 | - $file = $path . '/uploads/' . $cert->getName(); |
|
139 | + $file = $path.'/uploads/'.$cert->getName(); |
|
140 | 140 | $data = $this->view->file_get_contents($file); |
141 | 141 | if (strpos($data, 'BEGIN CERTIFICATE')) { |
142 | 142 | fwrite($fhCerts, $data); |
@@ -172,13 +172,13 @@ discard block |
||
172 | 172 | throw new \Exception('Filename is not valid'); |
173 | 173 | } |
174 | 174 | |
175 | - $dir = $this->getPathToCertificates() . 'uploads/'; |
|
175 | + $dir = $this->getPathToCertificates().'uploads/'; |
|
176 | 176 | if (!$this->view->file_exists($dir)) { |
177 | 177 | $this->view->mkdir($dir); |
178 | 178 | } |
179 | 179 | |
180 | 180 | try { |
181 | - $file = $dir . $name; |
|
181 | + $file = $dir.$name; |
|
182 | 182 | $certificateObject = new Certificate($certificate, $name); |
183 | 183 | $this->view->file_put_contents($file, $certificate); |
184 | 184 | $this->createCertificateBundle(); |
@@ -199,9 +199,9 @@ discard block |
||
199 | 199 | if (!Filesystem::isValidPath($name)) { |
200 | 200 | return false; |
201 | 201 | } |
202 | - $path = $this->getPathToCertificates() . 'uploads/'; |
|
203 | - if ($this->view->file_exists($path . $name)) { |
|
204 | - $this->view->unlink($path . $name); |
|
202 | + $path = $this->getPathToCertificates().'uploads/'; |
|
203 | + if ($this->view->file_exists($path.$name)) { |
|
204 | + $this->view->unlink($path.$name); |
|
205 | 205 | $this->createCertificateBundle(); |
206 | 206 | } |
207 | 207 | return true; |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | if ($uid === '') { |
218 | 218 | $uid = $this->uid; |
219 | 219 | } |
220 | - return $this->getPathToCertificates($uid) . 'rootcerts.crt'; |
|
220 | + return $this->getPathToCertificates($uid).'rootcerts.crt'; |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | /** |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | if ($uid === '') { |
250 | 250 | $uid = $this->uid; |
251 | 251 | } |
252 | - return is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/'; |
|
252 | + return is_null($uid) ? '/files_external/' : '/'.$uid.'/files_external/'; |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null)); |
273 | 273 | } |
274 | 274 | |
275 | - $sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) { |
|
275 | + $sourceMTime = array_reduce($sourceMTimes, function($max, $mtime) { |
|
276 | 276 | return max($max, $mtime); |
277 | 277 | }, 0); |
278 | 278 | return $sourceMTime > $this->view->filemtime($targetBundle); |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | * @return int |
285 | 285 | */ |
286 | 286 | protected function getFilemtimeOfCaBundle() { |
287 | - return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); |
|
287 | + return filemtime(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt'); |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | } |