nextcloud / server

lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php

Indentation +8 added lines, -8 removed lines

@@ -35,13 +35,13 @@
  */
 interface IProvidesPersonalSettings extends IProvider {
 
-	/**
-	 * @param IUser $user
-	 *
-	 * @return IPersonalProviderSettings
-	 *
-	 * @since 15.0.0
-	 */
-	public function getPersonalSettings(IUser $user): IPersonalProviderSettings;
+    /**
+     * @param IUser $user
+     *
+     * @return IPersonalProviderSettings
+     *
+     * @since 15.0.0
+     */
+    public function getPersonalSettings(IUser $user): IPersonalProviderSettings;
 
 }

lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php

Indentation +14 added lines, -14 removed lines

@@ -32,19 +32,19 @@
  */
 class ProviderAlreadyExistsException extends HintException {
 
-	/**
-	 * ProviderAlreadyExistsException constructor.
-	 *
-	 * @since 14.0.0
-	 *
-	 * @param string $newProviderId cloud federation provider ID of the new provider
-	 * @param string $existingProviderName name of cloud federation provider which already use the same ID
-	 */
-	public function __construct($newProviderId, $existingProviderName) {
-		$l = \OC::$server->getL10N('federation');
-		$message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
-		$hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
-		parent::__construct($message, $hint);
-	}
+    /**
+     * ProviderAlreadyExistsException constructor.
+     *
+     * @since 14.0.0
+     *
+     * @param string $newProviderId cloud federation provider ID of the new provider
+     * @param string $existingProviderName name of cloud federation provider which already use the same ID
+     */
+    public function __construct($newProviderId, $existingProviderName) {
+        $l = \OC::$server->getL10N('federation');
+        $message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
+        $hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
+        parent::__construct($message, $hint);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 */
 	public function __construct($newProviderId, $existingProviderName) {
 		$l = \OC::$server->getL10N('federation');
-		$message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
+		$message = 'ID "'.$newProviderId.'" already used by cloud federation provider "'.$existingProviderName.'"';
 		$hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
 		parent::__construct($message, $hint);
 	}

core/templates/untrustedDomain.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
 	</p>
 	<br />
 	<p>
-		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="' . $_['docUrl'] . '" target="blank">', '</a>'])); ?>
+		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="'.$_['docUrl'].'" target="blank">', '</a>'])); ?>
 	</p>
 </div>

lib/public/AppFramework/Utility/ITimeFactory.php

Indentation +12 added lines, -12 removed lines

@@ -31,18 +31,18 @@
  */
 interface ITimeFactory {
 
-	/**
-	 * @return int the result of a call to time()
-	 * @since 8.0.0
-	 */
-	public function getTime(): int;
+    /**
+     * @return int the result of a call to time()
+     * @since 8.0.0
+     */
+    public function getTime(): int;
 
-	/**
-	 * @param string $time
-	 * @param \DateTimeZone $timezone
-	 * @return \DateTime
-	 * @since 15.0.0
-	 */
-	public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime;
+    /**
+     * @param string $time
+     * @param \DateTimeZone $timezone
+     * @return \DateTime
+     * @since 15.0.0
+     */
+    public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime;
 
 }

core/Command/TwoFactorAuth/Enforce.php

Spacing +2 added lines, -2 removed lines

@@ -98,10 +98,10 @@
 		if (empty($state->getEnforcedGroups())) {
 			$message = 'Two-factor authentication is enforced for all users';
 		} else {
-			$message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
+			$message = 'Two-factor authentication is enforced for members of the group(s) '.implode(', ', $state->getEnforcedGroups());
 		}
 		if (!empty($state->getExcludedGroups())) {
-			$message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
+			$message .= ', except members of '.implode(', ', $state->getExcludedGroups());
 		}
 		$output->writeln($message);
 	}

Indentation +70 added lines, -70 removed lines

@@ -36,81 +36,81 @@
 
 class Enforce extends Command {
 
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
 
-	public function __construct(MandatoryTwoFactor $mandatoryTwoFactor) {
-		parent::__construct();
+    public function __construct(MandatoryTwoFactor $mandatoryTwoFactor) {
+        parent::__construct();
 
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-	}
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+    }
 
-	protected function configure() {
-		$this->setName('twofactorauth:enforce');
-		$this->setDescription('Enabled/disable enforced two-factor authentication');
-		$this->addOption(
-			'on',
-			null,
-			InputOption::VALUE_NONE,
-			'enforce two-factor authentication'
-		);
-		$this->addOption(
-			'off',
-			null,
-			InputOption::VALUE_NONE,
-			'don\'t enforce two-factor authenticaton'
-		);
-		$this->addOption(
-			'group',
-			null,
-			InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-			'enforce only for the given group(s)'
-		);
-		$this->addOption(
-			'exclude',
-			null,
-			InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-			'exclude mandatory two-factor auth for the given group(s)'
-		);
-	}
+    protected function configure() {
+        $this->setName('twofactorauth:enforce');
+        $this->setDescription('Enabled/disable enforced two-factor authentication');
+        $this->addOption(
+            'on',
+            null,
+            InputOption::VALUE_NONE,
+            'enforce two-factor authentication'
+        );
+        $this->addOption(
+            'off',
+            null,
+            InputOption::VALUE_NONE,
+            'don\'t enforce two-factor authenticaton'
+        );
+        $this->addOption(
+            'group',
+            null,
+            InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+            'enforce only for the given group(s)'
+        );
+        $this->addOption(
+            'exclude',
+            null,
+            InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+            'exclude mandatory two-factor auth for the given group(s)'
+        );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($input->getOption('on')) {
-			$enforcedGroups = $input->getOption('group');
-			$excludedGroups = $input->getOption('exclude');
-			$this->mandatoryTwoFactor->setState(new EnforcementState(true, $enforcedGroups, $excludedGroups));
-		} elseif ($input->getOption('off')) {
-			$this->mandatoryTwoFactor->setState(new EnforcementState(false));
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($input->getOption('on')) {
+            $enforcedGroups = $input->getOption('group');
+            $excludedGroups = $input->getOption('exclude');
+            $this->mandatoryTwoFactor->setState(new EnforcementState(true, $enforcedGroups, $excludedGroups));
+        } elseif ($input->getOption('off')) {
+            $this->mandatoryTwoFactor->setState(new EnforcementState(false));
+        }
 
-		$state = $this->mandatoryTwoFactor->getState();
-		if ($state->isEnforced()) {
-			$this->writeEnforced($output, $state);
-		} else {
-			$this->writeNotEnforced($output);
-		}
-		return 0;
-	}
+        $state = $this->mandatoryTwoFactor->getState();
+        if ($state->isEnforced()) {
+            $this->writeEnforced($output, $state);
+        } else {
+            $this->writeNotEnforced($output);
+        }
+        return 0;
+    }
 
-	/**
-	 * @param OutputInterface $output
-	 */
-	protected function writeEnforced(OutputInterface $output, EnforcementState $state) {
-		if (empty($state->getEnforcedGroups())) {
-			$message = 'Two-factor authentication is enforced for all users';
-		} else {
-			$message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
-		}
-		if (!empty($state->getExcludedGroups())) {
-			$message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
-		}
-		$output->writeln($message);
-	}
+    /**
+     * @param OutputInterface $output
+     */
+    protected function writeEnforced(OutputInterface $output, EnforcementState $state) {
+        if (empty($state->getEnforcedGroups())) {
+            $message = 'Two-factor authentication is enforced for all users';
+        } else {
+            $message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
+        }
+        if (!empty($state->getExcludedGroups())) {
+            $message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
+        }
+        $output->writeln($message);
+    }
 
-	/**
-	 * @param OutputInterface $output
-	 */
-	protected function writeNotEnforced(OutputInterface $output) {
-		$output->writeln('Two-factor authentication is not enforced');
-	}
+    /**
+     * @param OutputInterface $output
+     */
+    protected function writeNotEnforced(OutputInterface $output) {
+        $output->writeln('Two-factor authentication is not enforced');
+    }
 }

lib/private/Dashboard/DashboardManager.php

Indentation +97 added lines, -97 removed lines

@@ -46,103 +46,103 @@
 class DashboardManager implements IDashboardManager {
 
 
-	/** @var IWidgetsService */
-	private $widgetsService;
-
-	/** @var IEventsService */
-	private $eventsService;
-
-
-	/**
-	 * @param IEventsService $eventsService
-	 */
-	public function registerEventsService(IEventsService $eventsService) {
-		$this->eventsService = $eventsService;
-	}
-
-
-	/**
-	 * @param IWidgetsService $widgetsService
-	 */
-	public function registerWidgetsService(IWidgetsService $widgetsService) {
-		$this->widgetsService = $widgetsService;
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param string $userId
-	 *
-	 * @return IWidgetConfig
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function getWidgetConfig(string $widgetId, string $userId): IWidgetConfig {
-		return $this->getWidgetsService()->getWidgetConfig($widgetId, $userId);
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param array $users
-	 * @param array $payload
-	 * @param string $uniqueId
-	 *
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function createUsersEvent(string $widgetId, array $users, array $payload, string $uniqueId = '') {
-		$this->getEventsService()->createUsersEvent($widgetId, $users, $payload, $uniqueId);
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param array $groups
-	 * @param array $payload
-	 * @param string $uniqueId
-	 *
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function createGroupsEvent(string $widgetId, array $groups, array $payload, string $uniqueId = '') {
-		$this->getEventsService()->createGroupsEvent($widgetId, $groups, $payload, $uniqueId);
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param array $payload
-	 * @param string $uniqueId
-	 *
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function createGlobalEvent(string $widgetId, array $payload, string $uniqueId = '') {
-		$this->getEventsService()->createGlobalEvent($widgetId, $payload, $uniqueId);
-	}
-
-
-	/**
-	 * @return IWidgetsService
-	 * @throws DashboardAppNotAvailableException
-	 */
-	private function getWidgetsService() {
-		if ($this->widgetsService === null) {
-			throw new DashboardAppNotAvailableException('No IWidgetsService registered');
-		}
-
-		return $this->widgetsService;
-	}
-
-
-	/**
-	 * @return IEventsService
-	 * @throws DashboardAppNotAvailableException
-	 */
-	private function getEventsService() {
-		if ($this->eventsService === null) {
-			throw new DashboardAppNotAvailableException('No IEventsService registered');
-		}
-
-		return $this->eventsService;
-	}
+    /** @var IWidgetsService */
+    private $widgetsService;
+
+    /** @var IEventsService */
+    private $eventsService;
+
+
+    /**
+     * @param IEventsService $eventsService
+     */
+    public function registerEventsService(IEventsService $eventsService) {
+        $this->eventsService = $eventsService;
+    }
+
+
+    /**
+     * @param IWidgetsService $widgetsService
+     */
+    public function registerWidgetsService(IWidgetsService $widgetsService) {
+        $this->widgetsService = $widgetsService;
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param string $userId
+     *
+     * @return IWidgetConfig
+     * @throws DashboardAppNotAvailableException
+     */
+    public function getWidgetConfig(string $widgetId, string $userId): IWidgetConfig {
+        return $this->getWidgetsService()->getWidgetConfig($widgetId, $userId);
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param array $users
+     * @param array $payload
+     * @param string $uniqueId
+     *
+     * @throws DashboardAppNotAvailableException
+     */
+    public function createUsersEvent(string $widgetId, array $users, array $payload, string $uniqueId = '') {
+        $this->getEventsService()->createUsersEvent($widgetId, $users, $payload, $uniqueId);
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param array $groups
+     * @param array $payload
+     * @param string $uniqueId
+     *
+     * @throws DashboardAppNotAvailableException
+     */
+    public function createGroupsEvent(string $widgetId, array $groups, array $payload, string $uniqueId = '') {
+        $this->getEventsService()->createGroupsEvent($widgetId, $groups, $payload, $uniqueId);
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param array $payload
+     * @param string $uniqueId
+     *
+     * @throws DashboardAppNotAvailableException
+     */
+    public function createGlobalEvent(string $widgetId, array $payload, string $uniqueId = '') {
+        $this->getEventsService()->createGlobalEvent($widgetId, $payload, $uniqueId);
+    }
+
+
+    /**
+     * @return IWidgetsService
+     * @throws DashboardAppNotAvailableException
+     */
+    private function getWidgetsService() {
+        if ($this->widgetsService === null) {
+            throw new DashboardAppNotAvailableException('No IWidgetsService registered');
+        }
+
+        return $this->widgetsService;
+    }
+
+
+    /**
+     * @return IEventsService
+     * @throws DashboardAppNotAvailableException
+     */
+    private function getEventsService() {
+        if ($this->eventsService === null) {
+            throw new DashboardAppNotAvailableException('No IEventsService registered');
+        }
+
+        return $this->eventsService;
+    }
 
 }
 

apps/dav/lib/CalDAV/Outbox.php

Spacing +11 added lines, -11 removed lines

@@ -74,12 +74,12 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		];
@@ -94,23 +94,23 @@ 
 		if ($this->disableFreeBusy) {
 			return array_merge($commonAcl, [
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 			]);
@@ -118,13 +118,13 @@ 
 
 		return array_merge($commonAcl, [
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
 				'principal' => $this->getOwner(),
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		]);

Indentation +91 added lines, -91 removed lines

@@ -34,102 +34,102 @@
  */
 class Outbox extends \Sabre\CalDAV\Schedule\Outbox {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var null|bool */
-	private $disableFreeBusy = null;
+    /** @var null|bool */
+    private $disableFreeBusy = null;
 
-	/**
-	 * Outbox constructor.
-	 *
-	 * @param IConfig $config
-	 * @param string $principalUri
-	 */
-	public function __construct(IConfig $config, string $principalUri) {
-		parent::__construct($principalUri);
-		$this->config = $config;
-	}
+    /**
+     * Outbox constructor.
+     *
+     * @param IConfig $config
+     * @param string $principalUri
+     */
+    public function __construct(IConfig $config, string $principalUri) {
+        parent::__construct($principalUri);
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	public function getACL() {
-		// getACL is called so frequently that we cache the config result
-		if ($this->disableFreeBusy === null) {
-			$this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
-		}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+        // getACL is called so frequently that we cache the config result
+        if ($this->disableFreeBusy === null) {
+            $this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
+        }
 
-		$commonAcl = [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-		];
+        $commonAcl = [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+        ];
 
-		// schedule-send is an aggregate privilege for:
-		// - schedule-send-invite
-		// - schedule-send-reply
-		// - schedule-send-freebusy
-		//
-		// If FreeBusy is disabled, we have to remove the latter privilege
+        // schedule-send is an aggregate privilege for:
+        // - schedule-send-invite
+        // - schedule-send-reply
+        // - schedule-send-freebusy
+        //
+        // If FreeBusy is disabled, we have to remove the latter privilege
 
-		if ($this->disableFreeBusy) {
-			return array_merge($commonAcl, [
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner(),
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner(),
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
-					'protected' => true,
-				],
-			]);
-		}
+        if ($this->disableFreeBusy) {
+            return array_merge($commonAcl, [
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+                    'principal' => $this->getOwner(),
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+                    'principal' => $this->getOwner() . '/calendar-proxy-write',
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+                    'principal' => $this->getOwner(),
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+                    'principal' => $this->getOwner() . '/calendar-proxy-write',
+                    'protected' => true,
+                ],
+            ]);
+        }
 
-		return array_merge($commonAcl, [
-			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-		]);
-	}
+        return array_merge($commonAcl, [
+            [
+                'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+        ]);
+    }
 }

lib/public/BackgroundJob/Job.php

Spacing +3 added lines, -3 removed lines

@@ -73,17 +73,17 @@
 
 		try {
 			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = $this->time->getTime() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Exception $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}

Indentation +102 added lines, -102 removed lines

@@ -40,106 +40,106 @@
  */
 abstract class Job implements IJob {
 
-	/** @var int $id */
-	protected $id;
-
-	/** @var int $lastRun */
-	protected $lastRun;
-
-	/** @var mixed $argument */
-	protected $argument;
-
-	/** @var ITimeFactory */
-	protected $time;
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function __construct(ITimeFactory $time) {
-		$this->time = $time;
-	}
-
-	/**
-	 * The function to prepare the execution of the job.
-	 *
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	public function execute(IJobList $jobList, ILogger $logger = null) {
-		$jobList->setLastRun($this);
-		if ($logger === null) {
-			$logger = \OC::$server->getLogger();
-		}
-
-		try {
-			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
-			$this->run($this->argument);
-			$timeTaken = $this->time->getTime() - $jobStartTime;
-
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
-			$jobList->setExecutionTime($this, $timeTaken);
-		} catch (\Exception $e) {
-			if ($logger) {
-				$logger->logException($e, [
-					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function setId(int $id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function setLastRun(int $lastRun) {
-		$this->lastRun = $lastRun;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function setArgument($argument) {
-		$this->argument = $argument;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function getLastRun(): int {
-		return $this->lastRun;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function getArgument() {
-		return $this->argument;
-	}
-
-	/**
-	 * The actual function that is called to run the job
-	 *
-	 * @param $argument
-	 *
-	 * @since 15.0.0
-	 */
-	abstract protected function run($argument);
+    /** @var int $id */
+    protected $id;
+
+    /** @var int $lastRun */
+    protected $lastRun;
+
+    /** @var mixed $argument */
+    protected $argument;
+
+    /** @var ITimeFactory */
+    protected $time;
+
+    /**
+     * @since 15.0.0
+     */
+    public function __construct(ITimeFactory $time) {
+        $this->time = $time;
+    }
+
+    /**
+     * The function to prepare the execution of the job.
+     *
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    public function execute(IJobList $jobList, ILogger $logger = null) {
+        $jobList->setLastRun($this);
+        if ($logger === null) {
+            $logger = \OC::$server->getLogger();
+        }
+
+        try {
+            $jobStartTime = $this->time->getTime();
+            $logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+            $this->run($this->argument);
+            $timeTaken = $this->time->getTime() - $jobStartTime;
+
+            $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+            $jobList->setExecutionTime($this, $timeTaken);
+        } catch (\Exception $e) {
+            if ($logger) {
+                $logger->logException($e, [
+                    'app' => 'core',
+                    'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function setId(int $id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function setLastRun(int $lastRun) {
+        $this->lastRun = $lastRun;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function setArgument($argument) {
+        $this->argument = $argument;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function getLastRun(): int {
+        return $this->lastRun;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function getArgument() {
+        return $this->argument;
+    }
+
+    /**
+     * The actual function that is called to run the job
+     *
+     * @param $argument
+     *
+     * @since 15.0.0
+     */
+    abstract protected function run($argument);
 }

lib/public/BackgroundJob/QueuedJob.php

Indentation +12 added lines, -12 removed lines

@@ -33,16 +33,16 @@
  */
 abstract class QueuedJob extends Job {
 
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	final public function execute($jobList, ILogger $logger = null) {
-		$jobList->remove($this, $this->argument);
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    final public function execute($jobList, ILogger $logger = null) {
+        $jobList->remove($this, $this->argument);
+        parent::execute($jobList, $logger);
+    }
 }