@@ -184,12 +184,12 @@ |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | try { |
187 | - $this->getDisplayNameFromContact($user . '@http://' . $server); |
|
187 | + $this->getDisplayNameFromContact($user.'@http://'.$server); |
|
188 | 188 | } catch (\OutOfBoundsException $e) { |
189 | 189 | } |
190 | 190 | |
191 | 191 | try { |
192 | - $this->getDisplayNameFromContact($user . '@https://' . $server); |
|
192 | + $this->getDisplayNameFromContact($user.'@https://'.$server); |
|
193 | 193 | } catch (\OutOfBoundsException $e) { |
194 | 194 | } |
195 | 195 |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $token = $argument['token']; |
106 | 106 | $action = $argument['action']; |
107 | 107 | $data = json_decode($argument['data'], true); |
108 | - $try = (int)$argument['try'] + 1; |
|
108 | + $try = (int) $argument['try'] + 1; |
|
109 | 109 | |
110 | 110 | $result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try); |
111 | 111 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | 'token' => $argument['token'], |
129 | 129 | 'data' => $argument['data'], |
130 | 130 | 'action' => $argument['action'], |
131 | - 'try' => (int)$argument['try'] + 1, |
|
131 | + 'try' => (int) $argument['try'] + 1, |
|
132 | 132 | 'lastRun' => time() |
133 | 133 | ] |
134 | 134 | ); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * @return bool |
142 | 142 | */ |
143 | 143 | protected function shouldRun(array $argument) { |
144 | - $lastRun = (int)$argument['lastRun']; |
|
144 | + $lastRun = (int) $argument['lastRun']; |
|
145 | 145 | return ((time() - $lastRun) > $this->interval); |
146 | 146 | } |
147 | 147 |
@@ -55,7 +55,7 @@ |
||
55 | 55 | public function generateToken() { |
56 | 56 | $token = $this->secureRandom->generate( |
57 | 57 | self::TOKEN_LENGTH, |
58 | - ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS); |
|
58 | + ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS); |
|
59 | 59 | return $token; |
60 | 60 | } |
61 | 61 |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $progress->start(); |
61 | 61 | $this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) { |
62 | 62 | if ($ex instanceof \Exception) { |
63 | - $output->writeln("Error while syncing $url : " . $ex->getMessage()); |
|
63 | + $output->writeln("Error while syncing $url : ".$ex->getMessage()); |
|
64 | 64 | |
65 | 65 | } else { |
66 | 66 | $progress->advance(); |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $client = $this->httpClientService->newClient(); |
222 | 222 | try { |
223 | 223 | $result = $client->get( |
224 | - $url . '/status.php', |
|
224 | + $url.'/status.php', |
|
225 | 225 | [ |
226 | 226 | 'timeout' => 3, |
227 | 227 | 'connect_timeout' => 3, |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | |
233 | 233 | } |
234 | 234 | } catch (\Exception $e) { |
235 | - $this->logger->debug('No Nextcloud server: ' . $e->getMessage()); |
|
235 | + $this->logger->debug('No Nextcloud server: '.$e->getMessage()); |
|
236 | 236 | return false; |
237 | 237 | } |
238 | 238 | |
@@ -273,6 +273,6 @@ discard block |
||
273 | 273 | |
274 | 274 | } |
275 | 275 | |
276 | - return 'https://' . $url; |
|
276 | + return 'https://'.$url; |
|
277 | 277 | } |
278 | 278 | } |
@@ -84,7 +84,7 @@ |
||
84 | 84 | */ |
85 | 85 | private function isRequestPublic(RequestInterface $request) { |
86 | 86 | $url = $request->getPath(); |
87 | - $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) { |
|
87 | + $matchingUrls = array_filter($this->publicURLs, function($publicUrl) use ($url) { |
|
88 | 88 | return strpos($url, $publicUrl, 0) === 0; |
89 | 89 | }); |
90 | 90 | return !empty($matchingUrls); |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | static function xmlDeserialize(Reader $reader) { |
48 | 48 | |
49 | 49 | $elements = $reader->parseInnerTree([ |
50 | - '{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue', |
|
51 | - '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue', |
|
50 | + '{'.Plugin::NS_OWNCLOUD.'}set' => 'Sabre\\Xml\\Element\\KeyValue', |
|
51 | + '{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue', |
|
52 | 52 | ]); |
53 | 53 | |
54 | 54 | $set = []; |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | foreach ($elements as $elem) { |
58 | 58 | switch ($elem['name']) { |
59 | 59 | |
60 | - case '{' . Plugin::NS_OWNCLOUD . '}set' : |
|
60 | + case '{'.Plugin::NS_OWNCLOUD.'}set' : |
|
61 | 61 | $sharee = $elem['value']; |
62 | 62 | |
63 | - $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary'; |
|
64 | - $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name'; |
|
63 | + $sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary'; |
|
64 | + $commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name'; |
|
65 | 65 | |
66 | 66 | $set[] = [ |
67 | 67 | 'href' => $sharee['{DAV:}href'], |
68 | 68 | 'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null, |
69 | 69 | 'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null, |
70 | - 'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee), |
|
70 | + 'readOnly' => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee), |
|
71 | 71 | ]; |
72 | 72 | break; |
73 | 73 | |
74 | - case '{' . Plugin::NS_OWNCLOUD . '}remove' : |
|
74 | + case '{'.Plugin::NS_OWNCLOUD.'}remove' : |
|
75 | 75 | $remove[] = $elem['value']['{DAV:}href']; |
76 | 76 | break; |
77 | 77 |
@@ -121,21 +121,21 @@ discard block |
||
121 | 121 | */ |
122 | 122 | function xmlSerialize(Writer $writer) { |
123 | 123 | |
124 | - $cs = '{' . Plugin::NS_OWNCLOUD . '}'; |
|
124 | + $cs = '{'.Plugin::NS_OWNCLOUD.'}'; |
|
125 | 125 | |
126 | 126 | if (!is_null($this->organizer)) { |
127 | 127 | |
128 | - $writer->startElement($cs . 'organizer'); |
|
128 | + $writer->startElement($cs.'organizer'); |
|
129 | 129 | $writer->writeElement('{DAV:}href', $this->organizer['href']); |
130 | 130 | |
131 | 131 | if (isset($this->organizer['commonName']) && $this->organizer['commonName']) { |
132 | - $writer->writeElement($cs . 'common-name', $this->organizer['commonName']); |
|
132 | + $writer->writeElement($cs.'common-name', $this->organizer['commonName']); |
|
133 | 133 | } |
134 | 134 | if (isset($this->organizer['firstName']) && $this->organizer['firstName']) { |
135 | - $writer->writeElement($cs . 'first-name', $this->organizer['firstName']); |
|
135 | + $writer->writeElement($cs.'first-name', $this->organizer['firstName']); |
|
136 | 136 | } |
137 | 137 | if (isset($this->organizer['lastName']) && $this->organizer['lastName']) { |
138 | - $writer->writeElement($cs . 'last-name', $this->organizer['lastName']); |
|
138 | + $writer->writeElement($cs.'last-name', $this->organizer['lastName']); |
|
139 | 139 | } |
140 | 140 | $writer->endElement(); // organizer |
141 | 141 | |
@@ -143,23 +143,23 @@ discard block |
||
143 | 143 | |
144 | 144 | foreach ($this->users as $user) { |
145 | 145 | |
146 | - $writer->startElement($cs . 'user'); |
|
146 | + $writer->startElement($cs.'user'); |
|
147 | 147 | $writer->writeElement('{DAV:}href', $user['href']); |
148 | 148 | if (isset($user['commonName']) && $user['commonName']) { |
149 | - $writer->writeElement($cs . 'common-name', $user['commonName']); |
|
149 | + $writer->writeElement($cs.'common-name', $user['commonName']); |
|
150 | 150 | } |
151 | - $writer->writeElement($cs . 'invite-accepted'); |
|
151 | + $writer->writeElement($cs.'invite-accepted'); |
|
152 | 152 | |
153 | - $writer->startElement($cs . 'access'); |
|
153 | + $writer->startElement($cs.'access'); |
|
154 | 154 | if ($user['readOnly']) { |
155 | - $writer->writeElement($cs . 'read'); |
|
155 | + $writer->writeElement($cs.'read'); |
|
156 | 156 | } else { |
157 | - $writer->writeElement($cs . 'read-write'); |
|
157 | + $writer->writeElement($cs.'read-write'); |
|
158 | 158 | } |
159 | 159 | $writer->endElement(); // access |
160 | 160 | |
161 | 161 | if (isset($user['summary']) && $user['summary']) { |
162 | - $writer->writeElement($cs . 'summary', $user['summary']); |
|
162 | + $writer->writeElement($cs.'summary', $user['summary']); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | $writer->endElement(); //user |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | */ |
100 | 100 | function initialize(Server $server) { |
101 | 101 | $this->server = $server; |
102 | - $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = 'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest'; |
|
103 | - $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = 'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite'; |
|
102 | + $this->server->xml->elementMap['{'.Plugin::NS_OWNCLOUD.'}share'] = 'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest'; |
|
103 | + $this->server->xml->elementMap['{'.Plugin::NS_OWNCLOUD.'}invite'] = 'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite'; |
|
104 | 104 | |
105 | 105 | $this->server->on('method:POST', [$this, 'httpPost']); |
106 | - $this->server->on('propFind', [$this, 'propFind']); |
|
106 | + $this->server->on('propFind', [$this, 'propFind']); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | // Dealing with the 'share' document, which modified invitees on a |
148 | 148 | // calendar. |
149 | - case '{' . self::NS_OWNCLOUD . '}share' : |
|
149 | + case '{'.self::NS_OWNCLOUD.'}share' : |
|
150 | 150 | |
151 | 151 | // We can only deal with IShareableCalendar objects |
152 | 152 | if (!$node instanceof IShareable) { |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | function propFind(PropFind $propFind, INode $node) { |
190 | 190 | if ($node instanceof IShareable) { |
191 | 191 | |
192 | - $propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function() use ($node) { |
|
192 | + $propFind->handle('{'.Plugin::NS_OWNCLOUD.'}invite', function() use ($node) { |
|
193 | 193 | return new Invite( |
194 | 194 | $node->getShares() |
195 | 195 | ); |