@@ -54,7 +54,7 @@ |
||
| 54 | 54 | $output->writeln('Syncing users ...'); |
| 55 | 55 | $progress = new ProgressBar($output); |
| 56 | 56 | $progress->start(); |
| 57 | - $this->syncService->syncInstance(function () use ($progress) { |
|
| 57 | + $this->syncService->syncInstance(function() use ($progress) { |
|
| 58 | 58 | $progress->advance(); |
| 59 | 59 | }); |
| 60 | 60 | |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | public function getChild($name) { |
| 59 | 59 | $elements = pathinfo($name); |
| 60 | 60 | $ext = isset($elements['extension']) ? $elements['extension'] : ''; |
| 61 | - $size = (int)(isset($elements['filename']) ? $elements['filename'] : '64'); |
|
| 61 | + $size = (int) (isset($elements['filename']) ? $elements['filename'] : '64'); |
|
| 62 | 62 | if (!in_array($ext, ['jpeg', 'png'], true)) { |
| 63 | 63 | throw new MethodNotAllowed('File format not allowed'); |
| 64 | 64 | } |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | public function getLastModified() { |
| 90 | 90 | $timestamp = $this->avatar->getFile($this->size)->getMTime(); |
| 91 | 91 | if (!empty($timestamp)) { |
| 92 | - return (int)$timestamp; |
|
| 92 | + return (int) $timestamp; |
|
| 93 | 93 | } |
| 94 | 94 | return $timestamp; |
| 95 | 95 | } |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | public function xmlSerialize(Writer $writer) { |
| 41 | 41 | foreach ($this->groups as $group) { |
| 42 | - $writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group); |
|
| 42 | + $writer->writeElement('{'.self::NS_OWNCLOUD.'}group', $group); |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) { |
| 97 | 97 | // remote server revoked access to the address book, remove it |
| 98 | 98 | $this->backend->deleteAddressBook($addressBookId); |
| 99 | - $this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']); |
|
| 99 | + $this->logger->info('Authorization failed, remove address book: '.$url, ['app' => 'dav']); |
|
| 100 | 100 | throw $ex; |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | protected function getClient($url, $userName, $sharedSecret) { |
| 171 | 171 | $settings = [ |
| 172 | - 'baseUri' => $url . '/', |
|
| 172 | + 'baseUri' => $url.'/', |
|
| 173 | 173 | 'userName' => $userName, |
| 174 | 174 | 'password' => $sharedSecret, |
| 175 | 175 | ]; |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | if (is_null($this->localSystemAddressBook)) { |
| 307 | 307 | $systemPrincipal = "principals/system/system"; |
| 308 | 308 | $this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [ |
| 309 | - '{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance' |
|
| 309 | + '{'.Plugin::NS_CARDDAV.'}addressbook-description' => 'System addressbook which holds all users of this instance' |
|
| 310 | 310 | ]); |
| 311 | 311 | } |
| 312 | 312 | |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | public function syncInstance(\Closure $progressCallback = null) { |
| 317 | 317 | $systemAddressBook = $this->getLocalSystemAddressBook(); |
| 318 | - $this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) { |
|
| 318 | + $this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) { |
|
| 319 | 319 | $this->updateUser($user); |
| 320 | 320 | if (!is_null($progressCallback)) { |
| 321 | 321 | $progressCallback(); |
@@ -116,42 +116,42 @@ |
||
| 116 | 116 | * @return void |
| 117 | 117 | */ |
| 118 | 118 | public function xmlSerialize(Writer $writer) { |
| 119 | - $cs = '{' . Plugin::NS_OWNCLOUD . '}'; |
|
| 119 | + $cs = '{'.Plugin::NS_OWNCLOUD.'}'; |
|
| 120 | 120 | |
| 121 | 121 | if (!is_null($this->organizer)) { |
| 122 | - $writer->startElement($cs . 'organizer'); |
|
| 122 | + $writer->startElement($cs.'organizer'); |
|
| 123 | 123 | $writer->writeElement('{DAV:}href', $this->organizer['href']); |
| 124 | 124 | |
| 125 | 125 | if (isset($this->organizer['commonName']) && $this->organizer['commonName']) { |
| 126 | - $writer->writeElement($cs . 'common-name', $this->organizer['commonName']); |
|
| 126 | + $writer->writeElement($cs.'common-name', $this->organizer['commonName']); |
|
| 127 | 127 | } |
| 128 | 128 | if (isset($this->organizer['firstName']) && $this->organizer['firstName']) { |
| 129 | - $writer->writeElement($cs . 'first-name', $this->organizer['firstName']); |
|
| 129 | + $writer->writeElement($cs.'first-name', $this->organizer['firstName']); |
|
| 130 | 130 | } |
| 131 | 131 | if (isset($this->organizer['lastName']) && $this->organizer['lastName']) { |
| 132 | - $writer->writeElement($cs . 'last-name', $this->organizer['lastName']); |
|
| 132 | + $writer->writeElement($cs.'last-name', $this->organizer['lastName']); |
|
| 133 | 133 | } |
| 134 | 134 | $writer->endElement(); // organizer |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | foreach ($this->users as $user) { |
| 138 | - $writer->startElement($cs . 'user'); |
|
| 138 | + $writer->startElement($cs.'user'); |
|
| 139 | 139 | $writer->writeElement('{DAV:}href', $user['href']); |
| 140 | 140 | if (isset($user['commonName']) && $user['commonName']) { |
| 141 | - $writer->writeElement($cs . 'common-name', $user['commonName']); |
|
| 141 | + $writer->writeElement($cs.'common-name', $user['commonName']); |
|
| 142 | 142 | } |
| 143 | - $writer->writeElement($cs . 'invite-accepted'); |
|
| 143 | + $writer->writeElement($cs.'invite-accepted'); |
|
| 144 | 144 | |
| 145 | - $writer->startElement($cs . 'access'); |
|
| 145 | + $writer->startElement($cs.'access'); |
|
| 146 | 146 | if ($user['readOnly']) { |
| 147 | - $writer->writeElement($cs . 'read'); |
|
| 147 | + $writer->writeElement($cs.'read'); |
|
| 148 | 148 | } else { |
| 149 | - $writer->writeElement($cs . 'read-write'); |
|
| 149 | + $writer->writeElement($cs.'read-write'); |
|
| 150 | 150 | } |
| 151 | 151 | $writer->endElement(); // access |
| 152 | 152 | |
| 153 | 153 | if (isset($user['summary']) && $user['summary']) { |
| 154 | - $writer->writeElement($cs . 'summary', $user['summary']); |
|
| 154 | + $writer->writeElement($cs.'summary', $user['summary']); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | $writer->endElement(); //user |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | public static function xmlDeserialize(Reader $reader) { |
| 45 | 45 | $elements = $reader->parseInnerTree([ |
| 46 | - '{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue', |
|
| 47 | - '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue', |
|
| 46 | + '{'.Plugin::NS_OWNCLOUD.'}set' => 'Sabre\\Xml\\Element\\KeyValue', |
|
| 47 | + '{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue', |
|
| 48 | 48 | ]); |
| 49 | 49 | |
| 50 | 50 | $set = []; |
@@ -53,21 +53,21 @@ discard block |
||
| 53 | 53 | foreach ($elements as $elem) { |
| 54 | 54 | switch ($elem['name']) { |
| 55 | 55 | |
| 56 | - case '{' . Plugin::NS_OWNCLOUD . '}set': |
|
| 56 | + case '{'.Plugin::NS_OWNCLOUD.'}set': |
|
| 57 | 57 | $sharee = $elem['value']; |
| 58 | 58 | |
| 59 | - $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary'; |
|
| 60 | - $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name'; |
|
| 59 | + $sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary'; |
|
| 60 | + $commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name'; |
|
| 61 | 61 | |
| 62 | 62 | $set[] = [ |
| 63 | 63 | 'href' => $sharee['{DAV:}href'], |
| 64 | 64 | 'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null, |
| 65 | 65 | 'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null, |
| 66 | - 'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee), |
|
| 66 | + 'readOnly' => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee), |
|
| 67 | 67 | ]; |
| 68 | 68 | break; |
| 69 | 69 | |
| 70 | - case '{' . Plugin::NS_OWNCLOUD . '}remove': |
|
| 70 | + case '{'.Plugin::NS_OWNCLOUD.'}remove': |
|
| 71 | 71 | $remove[] = $elem['value']['{DAV:}href']; |
| 72 | 72 | break; |
| 73 | 73 | |
@@ -191,13 +191,13 @@ discard block |
||
| 191 | 191 | foreach ($shares as $share) { |
| 192 | 192 | $acl[] = [ |
| 193 | 193 | 'privilege' => '{DAV:}read', |
| 194 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
| 194 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
| 195 | 195 | 'protected' => true, |
| 196 | 196 | ]; |
| 197 | 197 | if (!$share['readOnly']) { |
| 198 | 198 | $acl[] = [ |
| 199 | 199 | 'privilege' => '{DAV:}write', |
| 200 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
| 200 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
| 201 | 201 | 'protected' => true, |
| 202 | 202 | ]; |
| 203 | 203 | } elseif ($this->resourceType === 'calendar') { |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | // so users can change the visibility. |
| 206 | 206 | $acl[] = [ |
| 207 | 207 | 'privilege' => '{DAV:}write-properties', |
| 208 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
| 208 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
| 209 | 209 | 'protected' => true, |
| 210 | 210 | ]; |
| 211 | 211 | } |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | private function setupUserFs($userId) { |
| 64 | 64 | \OC_Util::setupFS($userId); |
| 65 | 65 | $this->session->close(); |
| 66 | - return $this->principalPrefix . $userId; |
|
| 66 | + return $this->principalPrefix.$userId; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |