nextcloud / server

lib/public/Remote/IInstanceFactory.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
  * @since 13.0.0
  */
 interface IInstanceFactory {
-	/**
-	 * @param string $url
-	 * @return IInstance
-	 *
-	 * @since 13.0.0
-	 */
-	public function getInstance($url);
+    /**
+     * @param string $url
+     * @return IInstance
+     *
+     * @since 13.0.0
+     */
+    public function getInstance($url);
 }

lib/private/Remote/Api/ApiFactory.php

Indentation +8 added lines, -8 removed lines

@@ -28,14 +28,14 @@
 use OCP\Remote\IInstance;
 
 class ApiFactory implements IApiFactory {
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IClientService $clientService) {
-		$this->clientService = $clientService;
-	}
+    public function __construct(IClientService $clientService) {
+        $this->clientService = $clientService;
+    }
 
-	public function getApiCollection(IInstance $instance, ICredentials $credentials) {
-		return new ApiCollection($instance, $credentials, $this->clientService);
-	}
+    public function getApiCollection(IInstance $instance, ICredentials $credentials) {
+        return new ApiCollection($instance, $credentials, $this->clientService);
+    }
 }

lib/private/Remote/Api/ApiCollection.php

Indentation +17 added lines, -17 removed lines

@@ -28,24 +28,24 @@
 use OCP\Remote\IInstance;
 
 class ApiCollection implements IApiCollection {
-	/** @var IInstance */
-	private $instance;
-	/** @var ICredentials */
-	private $credentials;
-	/** @var IClientService */
-	private $clientService;
+    /** @var IInstance */
+    private $instance;
+    /** @var ICredentials */
+    private $credentials;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
-		$this->instance = $instance;
-		$this->credentials = $credentials;
-		$this->clientService = $clientService;
-	}
+    public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
+        $this->instance = $instance;
+        $this->credentials = $credentials;
+        $this->clientService = $clientService;
+    }
 
-	public function getCapabilitiesApi() {
-		return new OCS($this->instance, $this->credentials, $this->clientService);
-	}
+    public function getCapabilitiesApi() {
+        return new OCS($this->instance, $this->credentials, $this->clientService);
+    }
 
-	public function getUserApi() {
-		return new OCS($this->instance, $this->credentials, $this->clientService);
-	}
+    public function getUserApi() {
+        return new OCS($this->instance, $this->credentials, $this->clientService);
+    }
 }

lib/private/Remote/InstanceFactory.php

Indentation +11 added lines, -11 removed lines

@@ -27,17 +27,17 @@
 use OCP\Remote\IInstanceFactory;
 
 class InstanceFactory implements IInstanceFactory {
-	/** @var ICache */
-	private $cache;
-	/** @var IClientService */
-	private $clientService;
+    /** @var ICache */
+    private $cache;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(ICache $cache, IClientService $clientService) {
-		$this->cache = $cache;
-		$this->clientService = $clientService;
-	}
+    public function __construct(ICache $cache, IClientService $clientService) {
+        $this->cache = $cache;
+        $this->clientService = $clientService;
+    }
 
-	public function getInstance($url) {
-		return new Instance($url, $this->cache, $this->clientService);
-	}
+    public function getInstance($url) {
+        return new Instance($url, $this->cache, $this->clientService);
+    }
 }

apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 * @param RequestInterface $request
 	 * @param ResponseInterface $response
 	 *
-	 * @return bool|void
+	 * @return null|false
 	 */
 	public function httpPost(RequestInterface $request, ResponseInterface $response) {
 		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 *
 	 * @return string
 	 */
-	public function getPluginName()	{
+	public function getPluginName() {
 		return 'nc-enable-birthday-calendar';
 	}
 

Indentation +98 added lines, -98 removed lines

@@ -38,102 +38,102 @@
  * @package OCA\DAV\CalDAV\BirthdayCalendar
  */
 class EnablePlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var BirthdayService
-	 */
-	protected $birthdayService;
-
-	/**
-	 * @var Server
-	 */
-	protected $server;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	public function __construct(IConfig $config, BirthdayService $birthdayService) {
-		$this->config = $config;
-		$this->birthdayService = $birthdayService;
-	}
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		return ['nc-enable-birthday-calendar'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName()	{
-		return 'nc-enable-birthday-calendar';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendar homes.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return bool|void
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		if (!($node instanceof CalendarHome)) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-		if ($documentType !== '{'.self::NS_Nextcloud.'}enable-birthday-calendar') {
-			return;
-		}
-
-		$principalUri = $node->getOwner();
-		$userId = substr($principalUri, 17);
-
-		$this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-		$this->birthdayService->syncUser($userId);
-
-		$this->server->httpResponse->setStatus(204);
-
-		return false;
-	}
+    const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var BirthdayService
+     */
+    protected $birthdayService;
+
+    /**
+     * @var Server
+     */
+    protected $server;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    public function __construct(IConfig $config, BirthdayService $birthdayService) {
+        $this->config = $config;
+        $this->birthdayService = $birthdayService;
+    }
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        return ['nc-enable-birthday-calendar'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName()	{
+        return 'nc-enable-birthday-calendar';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendar homes.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return bool|void
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        if (!($node instanceof CalendarHome)) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+        if ($documentType !== '{'.self::NS_Nextcloud.'}enable-birthday-calendar') {
+            return;
+        }
+
+        $principalUri = $node->getOwner();
+        $userId = substr($principalUri, 17);
+
+        $this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+        $this->birthdayService->syncUser($userId);
+
+        $this->server->httpResponse->setStatus(204);
+
+        return false;
+    }
 }

lib/private/Remote/Api/OCS.php

Indentation +62 added lines, -62 removed lines

@@ -30,70 +30,70 @@
 use OCP\Remote\Api\IUserApi;
 
 class OCS extends ApiBase implements ICapabilitiesApi, IUserApi {
-	/**
-	 * @param string $method
-	 * @param string $url
-	 * @param array $body
-	 * @param array $query
-	 * @param array $headers
-	 * @return array
-	 * @throws ForbiddenException
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
-		try {
-			$response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
-		} catch (ClientException $e) {
-			if ($e->getResponse()->getStatusCode() === 404) {
-				throw new NotFoundException();
-			} else if ($e->getResponse()->getStatusCode() === 403 || $e->getResponse()->getStatusCode() === 401) {
-				throw new ForbiddenException();
-			} else {
-				throw $e;
-			}
-		}
-		if (!isset($response['ocs']) || !isset($response['ocs']['meta'])) {
-			throw new \Exception('Invalid ocs response');
-		}
-		if ($response['ocs']['meta']['statuscode'] === API::RESPOND_UNAUTHORISED) {
-			throw new ForbiddenException();
-		}
-		if ($response['ocs']['meta']['statuscode'] === API::RESPOND_NOT_FOUND) {
-			throw new NotFoundException();
-		}
-		if ($response['ocs']['meta']['status'] !== 'ok') {
-			throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
-		}
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array $body
+     * @param array $query
+     * @param array $headers
+     * @return array
+     * @throws ForbiddenException
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
+        try {
+            $response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
+        } catch (ClientException $e) {
+            if ($e->getResponse()->getStatusCode() === 404) {
+                throw new NotFoundException();
+            } else if ($e->getResponse()->getStatusCode() === 403 || $e->getResponse()->getStatusCode() === 401) {
+                throw new ForbiddenException();
+            } else {
+                throw $e;
+            }
+        }
+        if (!isset($response['ocs']) || !isset($response['ocs']['meta'])) {
+            throw new \Exception('Invalid ocs response');
+        }
+        if ($response['ocs']['meta']['statuscode'] === API::RESPOND_UNAUTHORISED) {
+            throw new ForbiddenException();
+        }
+        if ($response['ocs']['meta']['statuscode'] === API::RESPOND_NOT_FOUND) {
+            throw new NotFoundException();
+        }
+        if ($response['ocs']['meta']['status'] !== 'ok') {
+            throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
+        }
 
-		return $response['ocs']['data'];
-	}
+        return $response['ocs']['data'];
+    }
 
-	/**
-	 * @param array $data
-	 * @param string $type
-	 * @param string[] $keys
-	 * @throws \Exception
-	 */
-	private function checkResponseArray(array $data, $type, array $keys) {
-		foreach ($keys as $key) {
-			if (!array_key_exists($key, $data)) {
-				throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
-			}
-		}
-	}
+    /**
+     * @param array $data
+     * @param string $type
+     * @param string[] $keys
+     * @throws \Exception
+     */
+    private function checkResponseArray(array $data, $type, array $keys) {
+        foreach ($keys as $key) {
+            if (!array_key_exists($key, $data)) {
+                throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
+            }
+        }
+    }
 
-	public function getUser($userId) {
-		$result = $this->request('get', 'cloud/users/' . $userId);
-		$this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
-		return new User($result);
-	}
+    public function getUser($userId) {
+        $result = $this->request('get', 'cloud/users/' . $userId);
+        $this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
+        return new User($result);
+    }
 
-	/**
-	 * @return array The capabilities in the form of [$appId => [$capability => $value]]
-	 */
-	public function getCapabilities() {
-		$result = $this->request('get', 'cloud/capabilities');
-		return $result['capabilities'];
-	}
+    /**
+     * @return array The capabilities in the form of [$appId => [$capability => $value]]
+     */
+    public function getCapabilities() {
+        $result = $this->request('get', 'cloud/capabilities');
+        return $result['capabilities'];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
 		try {
-			$response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
+			$response = json_decode(parent::request($method, 'ocs/v2.php/'.$url, $body, $query, $headers), true);
 		} catch (ClientException $e) {
 			if ($e->getResponse()->getStatusCode() === 404) {
 				throw new NotFoundException();
@@ -63,7 +63,7 @@ 
 			throw new NotFoundException();
 		}
 		if ($response['ocs']['meta']['status'] !== 'ok') {
-			throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
+			throw new \Exception('Unknown ocs error '.$response['ocs']['meta']['message']);
 		}
 
 		return $response['ocs']['data'];
@@ -78,13 +78,13 @@ 
 	private function checkResponseArray(array $data, $type, array $keys) {
 		foreach ($keys as $key) {
 			if (!array_key_exists($key, $data)) {
-				throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
+				throw new \Exception('Invalid '.$type.' response, expected field '.$key.' not found');
 			}
 		}
 	}
 
 	public function getUser($userId) {
-		$result = $this->request('get', 'cloud/users/' . $userId);
+		$result = $this->request('get', 'cloud/users/'.$userId);
 		$this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
 		return new User($result);
 	}

lib/private/Remote/User.php

Indentation +110 added lines, -110 removed lines

@@ -25,114 +25,114 @@
 use OCP\Remote\IUser;
 
 class User implements IUser {
-	const EXPECTED_KEYS = [
-		'id',
-		'email',
-		'displayname',
-		'phone',
-		'address',
-		'website',
-		'groups',
-		'language',
-		'quota'
-	];
-
-	/** @var array */
-	private $data;
-
-	public function __construct(array $data) {
-		$this->data = $data;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getUserId() {
-		return $this->data['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEmail() {
-		return $this->data['email'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getDisplayName() {
-		return $this->data['displayname'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPhone() {
-		return $this->data['phone'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAddress() {
-		return $this->data['address'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getWebsite() {
-		return $this->data['website'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getTwitter() {
-		return isset($this->data['twitter']) ? $this->data['twitter'] : '';
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getGroups() {
-		return $this->data['groups'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getLanguage() {
-		return $this->data['language'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getUsedSpace() {
-		return $this->data['quota']['used'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getFreeSpace() {
-		return $this->data['quota']['free'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalSpace() {
-		return $this->data['quota']['total'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getQuota() {
-		return $this->data['quota']['quota'];
-	}
+    const EXPECTED_KEYS = [
+        'id',
+        'email',
+        'displayname',
+        'phone',
+        'address',
+        'website',
+        'groups',
+        'language',
+        'quota'
+    ];
+
+    /** @var array */
+    private $data;
+
+    public function __construct(array $data) {
+        $this->data = $data;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getUserId() {
+        return $this->data['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail() {
+        return $this->data['email'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getDisplayName() {
+        return $this->data['displayname'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPhone() {
+        return $this->data['phone'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getAddress() {
+        return $this->data['address'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getWebsite() {
+        return $this->data['website'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getTwitter() {
+        return isset($this->data['twitter']) ? $this->data['twitter'] : '';
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getGroups() {
+        return $this->data['groups'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getLanguage() {
+        return $this->data['language'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getUsedSpace() {
+        return $this->data['quota']['used'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getFreeSpace() {
+        return $this->data['quota']['free'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalSpace() {
+        return $this->data['quota']['total'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getQuota() {
+        return $this->data['quota']['quota'];
+    }
 }

apps/dav/lib/Command/SyncBirthdayCalendar.php

Indentation +82 added lines, -82 removed lines

@@ -34,86 +34,86 @@
 
 class SyncBirthdayCalendar extends Command {
 
-	/** @var BirthdayService */
-	private $birthdayService;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	function __construct(IUserManager $userManager, IConfig $config,
-						 BirthdayService $birthdayService) {
-		parent::__construct();
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		$this
-			->setName('dav:sync-birthday-calendar')
-			->setDescription('Synchronizes the birthday calendar')
-			->addArgument('user',
-				InputArgument::OPTIONAL,
-				'User for whom the birthday calendar will be synchronized');
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->verifyEnabled();
-
-		$user = $input->getArgument('user');
-		if (!is_null($user)) {
-			if (!$this->userManager->userExists($user)) {
-				throw new \InvalidArgumentException("User <$user> in unknown.");
-			}
-
-			// re-enable the birthday calendar in case it's called directly with a user name
-			$isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				$this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-				$output->writeln("Re-enabling birthday calendar for $user");
-			}
-
-			$output->writeln("Start birthday calendar sync for $user");
-			$this->birthdayService->syncUser($user);
-			return;
-		}
-		$output->writeln("Start birthday calendar sync for all users ...");
-		$p = new ProgressBar($output);
-		$p->start();
-		$this->userManager->callForAllUsers(function($user) use ($p)  {
-			$p->advance();
-
-			$userId = $user->getUID();
-			$isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				return;
-			}
-
-			/** @var IUser $user */
-			$this->birthdayService->syncUser($user->getUID());
-		});
-
-		$p->finish();
-		$output->writeln('');
-	}
-
-	protected function verifyEnabled () {
-		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-
-		if ($isEnabled !== 'yes') {
-			throw new \InvalidArgumentException('Birthday calendars are disabled');
-		}
-	}
+    /** @var BirthdayService */
+    private $birthdayService;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    function __construct(IUserManager $userManager, IConfig $config,
+                            BirthdayService $birthdayService) {
+        parent::__construct();
+        $this->birthdayService = $birthdayService;
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('dav:sync-birthday-calendar')
+            ->setDescription('Synchronizes the birthday calendar')
+            ->addArgument('user',
+                InputArgument::OPTIONAL,
+                'User for whom the birthday calendar will be synchronized');
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->verifyEnabled();
+
+        $user = $input->getArgument('user');
+        if (!is_null($user)) {
+            if (!$this->userManager->userExists($user)) {
+                throw new \InvalidArgumentException("User <$user> in unknown.");
+            }
+
+            // re-enable the birthday calendar in case it's called directly with a user name
+            $isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                $this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+                $output->writeln("Re-enabling birthday calendar for $user");
+            }
+
+            $output->writeln("Start birthday calendar sync for $user");
+            $this->birthdayService->syncUser($user);
+            return;
+        }
+        $output->writeln("Start birthday calendar sync for all users ...");
+        $p = new ProgressBar($output);
+        $p->start();
+        $this->userManager->callForAllUsers(function($user) use ($p)  {
+            $p->advance();
+
+            $userId = $user->getUID();
+            $isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                return;
+            }
+
+            /** @var IUser $user */
+            $this->birthdayService->syncUser($user->getUID());
+        });
+
+        $p->finish();
+        $output->writeln('');
+    }
+
+    protected function verifyEnabled () {
+        $isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+
+        if ($isEnabled !== 'yes') {
+            throw new \InvalidArgumentException('Birthday calendars are disabled');
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 		$output->writeln('');
 	}
 
-	protected function verifyEnabled () {
+	protected function verifyEnabled() {
 		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
 
 		if ($isEnabled !== 'yes') {

apps/dav/lib/CalDAV/CalendarObject.php

Spacing +6 added lines, -6 removed lines

@@ -72,19 +72,19 @@ 
 	private static function createConfidentialObject(Component\VCalendar $vObject) {
 		/** @var Component $vElement */
 		$vElement = null;
-		if(isset($vObject->VEVENT)) {
+		if (isset($vObject->VEVENT)) {
 			$vElement = $vObject->VEVENT;
 		}
-		if(isset($vObject->VJOURNAL)) {
+		if (isset($vObject->VJOURNAL)) {
 			$vElement = $vObject->VJOURNAL;
 		}
-		if(isset($vObject->VTODO)) {
+		if (isset($vObject->VTODO)) {
 			$vElement = $vObject->VTODO;
 		}
-		if(!is_null($vElement)) {
+		if (!is_null($vElement)) {
 			foreach ($vElement->children() as &$property) {
 				/** @var Property $property */
-				switch($property->name) {
+				switch ($property->name) {
 					case 'CREATED':
 					case 'DTSTART':
 					case 'RRULE':
@@ -112,7 +112,7 @@ 
 	private function removeVAlarms(Component\VCalendar $vObject) {
 		$subcomponents = $vObject->getComponents();
 
-		foreach($subcomponents as $subcomponent) {
+		foreach ($subcomponents as $subcomponent) {
 			unset($subcomponent->VALARM);
 		}
 	}

Indentation +110 added lines, -110 removed lines

@@ -32,114 +32,114 @@
 
 class CalendarObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * CalendarObject constructor.
-	 *
-	 * @param CalDavBackend $caldavBackend
-	 * @param array $calendarInfo
-	 * @param array $objectData
-	 */
-	public function __construct(CalDavBackend $caldavBackend, array $calendarInfo,
-								array $objectData) {
-		parent::__construct($caldavBackend, $calendarInfo, $objectData);
-
-		if ($this->isShared()) {
-			unset($this->objectData['size']);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get() {
-		$data = parent::get();
-
-		if (!$this->isShared()) {
-			return $data;
-		}
-
-		$vObject = Reader::read($data);
-
-		// remove VAlarms if calendar is shared read-only
-		if (!$this->canWrite()) {
-			$this->removeVAlarms($vObject);
-		}
-
-		// shows as busy if event is declared confidential
-		if ($this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
-			$this->createConfidentialObject($vObject);
-		}
-
-		return $vObject->serialize();
-	}
-
-	protected function isShared() {
-		if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return false;
-		}
-
-		return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
-	}
-
-	/**
-	 * @param Component\VCalendar $vObject
-	 * @return void
-	 */
-	private static function createConfidentialObject(Component\VCalendar $vObject) {
-		/** @var Component $vElement */
-		$vElement = null;
-		if(isset($vObject->VEVENT)) {
-			$vElement = $vObject->VEVENT;
-		}
-		if(isset($vObject->VJOURNAL)) {
-			$vElement = $vObject->VJOURNAL;
-		}
-		if(isset($vObject->VTODO)) {
-			$vElement = $vObject->VTODO;
-		}
-		if(!is_null($vElement)) {
-			foreach ($vElement->children() as &$property) {
-				/** @var Property $property */
-				switch($property->name) {
-					case 'CREATED':
-					case 'DTSTART':
-					case 'RRULE':
-					case 'DURATION':
-					case 'DTEND':
-					case 'CLASS':
-					case 'UID':
-						break;
-					case 'SUMMARY':
-						$property->setValue('Busy');
-						break;
-					default:
-						$vElement->__unset($property->name);
-						unset($property);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param Component\VCalendar $vObject
-	 * @return void
-	 */
-	private function removeVAlarms(Component\VCalendar $vObject) {
-		$subcomponents = $vObject->getComponents();
-
-		foreach($subcomponents as $subcomponent) {
-			unset($subcomponent->VALARM);
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function canWrite() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
-			return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
-		}
-		return true;
-	}
+    /**
+     * CalendarObject constructor.
+     *
+     * @param CalDavBackend $caldavBackend
+     * @param array $calendarInfo
+     * @param array $objectData
+     */
+    public function __construct(CalDavBackend $caldavBackend, array $calendarInfo,
+                                array $objectData) {
+        parent::__construct($caldavBackend, $calendarInfo, $objectData);
+
+        if ($this->isShared()) {
+            unset($this->objectData['size']);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get() {
+        $data = parent::get();
+
+        if (!$this->isShared()) {
+            return $data;
+        }
+
+        $vObject = Reader::read($data);
+
+        // remove VAlarms if calendar is shared read-only
+        if (!$this->canWrite()) {
+            $this->removeVAlarms($vObject);
+        }
+
+        // shows as busy if event is declared confidential
+        if ($this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
+            $this->createConfidentialObject($vObject);
+        }
+
+        return $vObject->serialize();
+    }
+
+    protected function isShared() {
+        if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return false;
+        }
+
+        return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
+    }
+
+    /**
+     * @param Component\VCalendar $vObject
+     * @return void
+     */
+    private static function createConfidentialObject(Component\VCalendar $vObject) {
+        /** @var Component $vElement */
+        $vElement = null;
+        if(isset($vObject->VEVENT)) {
+            $vElement = $vObject->VEVENT;
+        }
+        if(isset($vObject->VJOURNAL)) {
+            $vElement = $vObject->VJOURNAL;
+        }
+        if(isset($vObject->VTODO)) {
+            $vElement = $vObject->VTODO;
+        }
+        if(!is_null($vElement)) {
+            foreach ($vElement->children() as &$property) {
+                /** @var Property $property */
+                switch($property->name) {
+                    case 'CREATED':
+                    case 'DTSTART':
+                    case 'RRULE':
+                    case 'DURATION':
+                    case 'DTEND':
+                    case 'CLASS':
+                    case 'UID':
+                        break;
+                    case 'SUMMARY':
+                        $property->setValue('Busy');
+                        break;
+                    default:
+                        $vElement->__unset($property->name);
+                        unset($property);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param Component\VCalendar $vObject
+     * @return void
+     */
+    private function removeVAlarms(Component\VCalendar $vObject) {
+        $subcomponents = $vObject->getComponents();
+
+        foreach($subcomponents as $subcomponent) {
+            unset($subcomponent->VALARM);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    private function canWrite() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
+            return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
+        }
+        return true;
+    }
 }