diff options
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CardDAV/ImageExportPlugin.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/Command/MoveCalendar.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/Comments/CommentNode.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php | 6 | ||||
| -rw-r--r-- | apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php index 396d847d883..74faa5d7df9 100644 --- a/apps/dav/lib/CardDAV/ImageExportPlugin.php +++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php @@ -97,7 +97,7 @@ class ImageExportPlugin extends ServerPlugin { $addressbook = $this->server->tree->getNodeForPath($addressbookpath); $response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate'); - $response->setHeader('Etag', $node->getETag() ); + $response->setHeader('Etag', $node->getETag()); $response->setHeader('Pragma', 'public'); try { diff --git a/apps/dav/lib/Command/MoveCalendar.php b/apps/dav/lib/Command/MoveCalendar.php index 9efd63722df..8399fb5ed32 100644 --- a/apps/dav/lib/Command/MoveCalendar.php +++ b/apps/dav/lib/Command/MoveCalendar.php @@ -180,7 +180,7 @@ class MoveCalendar extends Command { */ if (count($shares) > 0) { $this->io->note([ - "Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.", + "Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.", "Sharees will need to change \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userDestination\"" ]); } diff --git a/apps/dav/lib/Comments/CommentNode.php b/apps/dav/lib/Comments/CommentNode.php index d54f81b7a8e..d24c41409ba 100644 --- a/apps/dav/lib/Comments/CommentNode.php +++ b/apps/dav/lib/Comments/CommentNode.php @@ -131,7 +131,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties { protected function checkWriteAccessOnComment() { $user = $this->userSession->getUser(); - if( $this->comment->getActorType() !== 'users' + if($this->comment->getActorType() !== 'users' || is_null($user) || $this->comment->getActorId() !== $user->getUID() ) { diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php index ca9a72b6a90..ff0409c7ea0 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php @@ -80,7 +80,7 @@ class SystemTagsObjectTypeCollection implements ICollection { * @param \Closure $childExistsFunction */ public function __construct( - $objectType, + $objectType, ISystemTagManager $tagManager, ISystemTagObjectMapper $tagMapper, IUserSession $userSession, diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php index 53e1b8d0c8f..a666aec95a7 100644 --- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php @@ -192,7 +192,7 @@ class IMipPluginTest extends TestCase { ->with('dav', 'invitation_link_recipients', 'yes') ->willReturn('yes'); - $message = $this->_testMessage( $veventParams ); + $message = $this->_testMessage($veventParams); $this->_expectSend('frodo@hobb.it', $expectsMail, $expectsMail); @@ -274,8 +274,8 @@ class IMipPluginTest extends TestCase { 'SUMMARY' => 'Fellowship meeting', 'DTSTART' => new \DateTime('2018-01-01 00:00:00') ], $attrs)); - $message->message->VEVENT->add( 'ORGANIZER', 'mailto:gandalf@wiz.ard' ); - $message->message->VEVENT->add( 'ATTENDEE', 'mailto:'.$recipient, [ 'RSVP' => 'TRUE' ] ); + $message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard'); + $message->message->VEVENT->add('ATTENDEE', 'mailto:'.$recipient, [ 'RSVP' => 'TRUE' ]); $message->sender = 'mailto:gandalf@wiz.ard'; $message->senderName = 'Mr. Wizard'; $message->recipient = 'mailto:'.$recipient; diff --git a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php index 24fc561cd9a..ec80d916b58 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php @@ -573,7 +573,7 @@ class SystemTagPluginTest extends \Test\TestCase { $request->expects($this->once()) ->method('getHeader') ->with('Content-Type') - ->willReturn('application/json'); + ->willReturn('application/json'); $request->expects($this->once()) ->method('getUrl') @@ -647,7 +647,7 @@ class SystemTagPluginTest extends \Test\TestCase { $request->expects($this->once()) ->method('getHeader') ->with('Content-Type') - ->willReturn('application/json'); + ->willReturn('application/json'); $request->expects($this->once()) ->method('getBaseUrl') @@ -744,7 +744,7 @@ class SystemTagPluginTest extends \Test\TestCase { $request->expects($this->once()) ->method('getHeader') ->with('Content-Type') - ->willReturn('application/json'); + ->willReturn('application/json'); $this->plugin->httpPost($request, $response); } |