mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coding style fixes 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2020-07-30 21:18:20 +02:00
parent 69a3829940
commit f13d5a3ec0
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -163,7 +163,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'{DAV:}displayname' => $row['displayname'], '{DAV:}displayname' => $row['displayname'],
'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'], '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
'{http://calendarserver.org/ns/}getctag' => $row['synctoken'], '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
]; ];
$this->addOwnerPrincipal($addressBooks[$row['id']]); $this->addOwnerPrincipal($addressBooks[$row['id']]);
@ -177,7 +177,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$principals = array_map(function ($principal) { $principals = array_map(function ($principal) {
return urldecode($principal); return urldecode($principal);
}, $principals); }, $principals);
$principals[]= $principalUri; $principals[] = $principalUri;
$query = $this->db->getQueryBuilder(); $query = $this->db->getQueryBuilder();
$result = $query->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access']) $result = $query->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access'])
@ -195,7 +195,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
continue; continue;
} }
$readOnly = (int) $row['access'] === Backend::ACCESS_READ; $readOnly = (int)$row['access'] === Backend::ACCESS_READ;
if (isset($addressBooks[$row['id']])) { if (isset($addressBooks[$row['id']])) {
if ($readOnly) { if ($readOnly) {
// New share can not have more permissions then the old one. // New share can not have more permissions then the old one.
@ -219,7 +219,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'{DAV:}displayname' => $displayName, '{DAV:}displayname' => $displayName,
'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'], '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
'{http://calendarserver.org/ns/}getctag' => $row['synctoken'], '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'], '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
$readOnlyPropertyName => $readOnly, $readOnlyPropertyName => $readOnly,
]; ];
@ -249,7 +249,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'{DAV:}displayname' => $row['displayname'], '{DAV:}displayname' => $row['displayname'],
'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'], '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
'{http://calendarserver.org/ns/}getctag' => $row['synctoken'], '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
]; ];
$this->addOwnerPrincipal($addressBooks[$row['id']]); $this->addOwnerPrincipal($addressBooks[$row['id']]);
@ -296,7 +296,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'{DAV:}displayname' => $row['displayname'], '{DAV:}displayname' => $row['displayname'],
'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'], '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
'{http://calendarserver.org/ns/}getctag' => $row['synctoken'], '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
]; ];
$this->addOwnerPrincipal($addressBook); $this->addOwnerPrincipal($addressBook);
@ -330,7 +330,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'{DAV:}displayname' => $row['displayname'], '{DAV:}displayname' => $row['displayname'],
'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'], '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
'{http://calendarserver.org/ns/}getctag' => $row['synctoken'], '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
]; ];
$this->addOwnerPrincipal($addressBook); $this->addOwnerPrincipal($addressBook);
@ -365,7 +365,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
*/ */
$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) { $propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
$updates = []; $updates = [];
foreach ($mutations as $property=>$newValue) { foreach ($mutations as $property => $newValue) {
switch ($property) { switch ($property) {
case '{DAV:}displayname': case '{DAV:}displayname':
$updates['displayname'] = $newValue; $updates['displayname'] = $newValue;
@ -378,7 +378,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$query = $this->db->getQueryBuilder(); $query = $this->db->getQueryBuilder();
$query->update('addressbooks'); $query->update('addressbooks');
foreach ($updates as $key=>$value) { foreach ($updates as $key => $value) {
$query->set($key, $query->createNamedParameter($value)); $query->set($key, $query->createNamedParameter($value));
} }
$query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId))) $query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
@ -408,7 +408,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'synctoken' => 1 'synctoken' => 1
]; ];
foreach ($properties as $property=>$newValue) { foreach ($properties as $property => $newValue) {
switch ($property) { switch ($property) {
case '{DAV:}displayname': case '{DAV:}displayname':
$values['displayname'] = $newValue; $values['displayname'] = $newValue;
@ -634,7 +634,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid))) ->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
->setMaxResults(1); ->setMaxResults(1);
$result = $q->execute(); $result = $q->execute();
$count = (bool) $result->fetchColumn(); $count = (bool)$result->fetchColumn();
$result->closeCursor(); $result->closeCursor();
if ($count) { if ($count) {
throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.'); throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
@ -811,7 +811,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) { public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
// Current synctoken // Current synctoken
$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*addressbooks` WHERE `id` = ?'); $stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*addressbooks` WHERE `id` = ?');
$stmt->execute([ $addressBookId ]); $stmt->execute([$addressBookId]);
$currentToken = $stmt->fetchColumn(0); $currentToken = $stmt->fetchColumn(0);
if (is_null($currentToken)) { if (is_null($currentToken)) {
@ -827,7 +827,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
if ($syncToken) { if ($syncToken) {
$query = "SELECT `uri`, `operation` FROM `*PREFIX*addressbookchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `addressbookid` = ? ORDER BY `synctoken`"; $query = "SELECT `uri`, `operation` FROM `*PREFIX*addressbookchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `addressbookid` = ? ORDER BY `synctoken`";
if ($limit>0) { if ($limit > 0) {
$query .= " LIMIT " . (int)$limit; $query .= " LIMIT " . (int)$limit;
} }
@ -895,7 +895,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
* @param bool $modified * @param bool $modified
* @return string * @return string
*/ */
private function readBlob($cardData, &$modified=false) { private function readBlob($cardData, &$modified = false) {
if (is_resource($cardData)) { if (is_resource($cardData)) {
$cardData = stream_get_contents($cardData); $cardData = stream_get_contents($cardData);
} }
@ -980,7 +980,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$matches = $result->fetchAll(); $matches = $result->fetchAll();
$result->closeCursor(); $result->closeCursor();
$matches = array_map(function ($match) { $matches = array_map(function ($match) {
return (int) $match['cardid']; return (int)$match['cardid'];
}, $matches); }, $matches);
$query = $this->db->getQueryBuilder(); $query = $this->db->getQueryBuilder();
@ -1185,6 +1185,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
/** /**
* For shared address books the sharee is set in the ACL of the address book * For shared address books the sharee is set in the ACL of the address book
*
* @param $addressBookId * @param $addressBookId
* @param $acl * @param $acl
* @return array * @return array

4
apps/federatedfilesharing/lib/Notifier.php
View File

@ -146,14 +146,14 @@ class Notifier implements INotifier {
switch ($action->getLabel()) { switch ($action->getLabel()) {
case 'accept': case 'accept':
$action->setParsedLabel( $action->setParsedLabel(
(string) $l->t('Accept') (string)$l->t('Accept')
) )
->setPrimary(true); ->setPrimary(true);
break; break;
case 'decline': case 'decline':
$action->setParsedLabel( $action->setParsedLabel(
(string) $l->t('Decline') (string)$l->t('Decline')
); );
break; break;
} }