nextcloud / server

apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php

Spacing +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
 		$token = $argument['token'];
 		$action = $argument['action'];
 		$data = json_decode($argument['data'], true);
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
 		$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
 		
@@ -128,7 +128,7 @@ 
 				'token' => $argument['token'],
 				'data' => $argument['data'],
 				'action' => $argument['action'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -141,7 +141,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}
 

Indentation +100 added lines, -100 removed lines

@@ -45,105 +45,105 @@
  */
 class RetryJob extends Job {
 
-	/** @var  bool */
-	private $retainJob = true;
-
-	/** @var Notifications */
-	private $notifications;
-
-	/** @var int max number of attempts to send the request */
-	private $maxTry = 20;
-
-	/** @var int how much time should be between two tries (10 minutes) */
-	private $interval = 600;
-
-	/**
-	 * UnShare constructor.
-	 *
-	 * @param Notifications $notifications
-	 */
-	public function __construct(Notifications $notifications = null) {
-		if ($notifications) {
-			$this->notifications = $notifications;
-		} else {
-			$addressHandler = new AddressHandler(
-				\OC::$server->getURLGenerator(),
-				\OC::$server->getL10N('federatedfilesharing'),
-				\OC::$server->getCloudIdManager()
-			);
-			$this->notifications = new Notifications(
-				$addressHandler,
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
-				\OC::$server->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory()
-			);
-		}
-
-	}
-
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			}
-		}
-	}
-
-	protected function run($argument) {
-		$remote = $argument['remote'];
-		$remoteId = $argument['remoteId'];
-		$token = $argument['token'];
-		$action = $argument['action'];
-		$data = json_decode($argument['data'], true);
-		$try = (int)$argument['try'] + 1;
-
-		$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
-
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
-
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add(RetryJob::class,
-			[
-				'remote' => $argument['remote'],
-				'remoteId' => $argument['remoteId'],
-				'token' => $argument['token'],
-				'data' => $argument['data'],
-				'action' => $argument['action'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => time()
-			]
-		);
-	}
-
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return ((time() - $lastRun) > $this->interval);
-	}
+    /** @var  bool */
+    private $retainJob = true;
+
+    /** @var Notifications */
+    private $notifications;
+
+    /** @var int max number of attempts to send the request */
+    private $maxTry = 20;
+
+    /** @var int how much time should be between two tries (10 minutes) */
+    private $interval = 600;
+
+    /**
+     * UnShare constructor.
+     *
+     * @param Notifications $notifications
+     */
+    public function __construct(Notifications $notifications = null) {
+        if ($notifications) {
+            $this->notifications = $notifications;
+        } else {
+            $addressHandler = new AddressHandler(
+                \OC::$server->getURLGenerator(),
+                \OC::$server->getL10N('federatedfilesharing'),
+                \OC::$server->getCloudIdManager()
+            );
+            $this->notifications = new Notifications(
+                $addressHandler,
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
+                \OC::$server->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory()
+            );
+        }
+
+    }
+
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            }
+        }
+    }
+
+    protected function run($argument) {
+        $remote = $argument['remote'];
+        $remoteId = $argument['remoteId'];
+        $token = $argument['token'];
+        $action = $argument['action'];
+        $data = json_decode($argument['data'], true);
+        $try = (int)$argument['try'] + 1;
+
+        $result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
+
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
+
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add(RetryJob::class,
+            [
+                'remote' => $argument['remote'],
+                'remoteId' => $argument['remoteId'],
+                'token' => $argument['token'],
+                'data' => $argument['data'],
+                'action' => $argument['action'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => time()
+            ]
+        );
+    }
+
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return ((time() - $lastRun) > $this->interval);
+    }
 
 }

apps/federatedfilesharing/lib/TokenHandler.php

Indentation +25 added lines, -25 removed lines

@@ -33,30 +33,30 @@
  */
 class TokenHandler {
 
-	const TOKEN_LENGTH = 15;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/**
-	 * TokenHandler constructor.
-	 *
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(ISecureRandom $secureRandom) {
-		$this->secureRandom = $secureRandom;
-	}
-
-	/**
-	 * generate to token used to authenticate federated shares
-	 *
-	 * @return string
-	 */
-	public function generateToken() {
-		$token = $this->secureRandom->generate(
-			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		return $token;
-	}
+    const TOKEN_LENGTH = 15;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /**
+     * TokenHandler constructor.
+     *
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(ISecureRandom $secureRandom) {
+        $this->secureRandom = $secureRandom;
+    }
+
+    /**
+     * generate to token used to authenticate federated shares
+     *
+     * @return string
+     */
+    public function generateToken() {
+        $token = $this->secureRandom->generate(
+            self::TOKEN_LENGTH,
+            ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        return $token;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	public function generateToken() {
 		$token = $this->secureRandom->generate(
 			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 		return $token;
 	}
 

apps/federation/templates/settings-admin.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
-				) { ?>
+                } elseif(
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+                ) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>
 					<span class="status error"></span>

Spacing +6 added lines, -6 removed lines

@@ -11,19 +11,19 @@
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
 	<ul id="listOfTrustedServers">
-		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
+		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
-				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+				} elseif (
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
 				) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>

Braces +4 added lines, -1 removed lines

@@ -11,7 +11,10 @@
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) {
+    p('checked');
+}
+?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 

apps/federation/lib/Command/SyncFederationAddressBooks.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		$progress->start();
 		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
 			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+				$output->writeln("Error while syncing $url : ".$ex->getMessage());
 
 			} else {
 				$progress->advance();

Indentation +33 added lines, -33 removed lines

@@ -30,45 +30,45 @@
 
 class SyncFederationAddressBooks extends Command {
 
-	/** @var \OCA\Federation\SyncFederationAddressBooks */
-	private $syncService;
+    /** @var \OCA\Federation\SyncFederationAddressBooks */
+    private $syncService;
 
-	/**
-	 * @param \OCA\Federation\SyncFederationAddressBooks $syncService
-	 */
-	public function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
-		parent::__construct();
+    /**
+     * @param \OCA\Federation\SyncFederationAddressBooks $syncService
+     */
+    public function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
+        parent::__construct();
 
-		$this->syncService = $syncService;
-	}
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('federation:sync-addressbooks')
-			->setDescription('Synchronizes addressbooks of all federated clouds');
-	}
+    protected function configure() {
+        $this
+            ->setName('federation:sync-addressbooks')
+            ->setDescription('Synchronizes addressbooks of all federated clouds');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
-			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
+            if ($ex instanceof \Exception) {
+                $output->writeln("Error while syncing $url : " . $ex->getMessage());
 
-			} else {
-				$progress->advance();
-			}
-		});
+            } else {
+                $progress->advance();
+            }
+        });
 
-		$progress->finish();
-		$output->writeln('');
+        $progress->finish();
+        $output->writeln('');
 
-		return 0;
-	}
+        return 0;
+    }
 }

apps/federation/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -29,41 +29,41 @@
 
 class Admin implements ISettings {
 
-	/** @var TrustedServers */
-	private $trustedServers;
+    /** @var TrustedServers */
+    private $trustedServers;
 
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'trustedServers' => $this->trustedServers->getServers(),
-			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'trustedServers' => $this->trustedServers->getServers(),
+            'autoAddServers' => $this->trustedServers->getAutoAddServers(),
+        ];
 
-		return new TemplateResponse('federation', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('federation', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 30;
+    }
 
 }

apps/federation/lib/Hooks.php

Indentation +20 added lines, -20 removed lines

@@ -27,25 +27,25 @@
 
 class Hooks {
 
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
-
-	/**
-	 * add servers to the list of trusted servers once a federated share was established
-	 *
-	 * @param array $params
-	 */
-	public function addServerHook($params) {
-		if (
-			$this->trustedServers->getAutoAddServers() === true &&
-			$this->trustedServers->isTrustedServer($params['server']) === false
-		) {
-			$this->trustedServers->addServer($params['server']);
-		}
-	}
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
+
+    /**
+     * add servers to the list of trusted servers once a federated share was established
+     *
+     * @param array $params
+     */
+    public function addServerHook($params) {
+        if (
+            $this->trustedServers->getAutoAddServers() === true &&
+            $this->trustedServers->isTrustedServer($params['server']) === false
+        ) {
+            $this->trustedServers->addServer($params['server']);
+        }
+    }
 
 }

apps/dav/lib/DAV/PublicAuth.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 
 class PublicAuth implements BackendInterface {
 
-	/** @var string[] */
-	private $publicURLs;
+    /** @var string[] */
+    private $publicURLs;
 
-	public function __construct() {
-		$this->publicURLs = [
-			'public-calendars',
-			'principals/system/public'
-		];
-	}
+    public function __construct() {
+        $this->publicURLs = [
+            'public-calendars',
+            'principals/system/public'
+        ];
+    }
 
-	/**
-	 * When this method is called, the backend must check if authentication was
-	 * successful.
-	 *
-	 * The returned value must be one of the following
-	 *
-	 * [true, "principals/username"]
-	 * [false, "reason for failure"]
-	 *
-	 * If authentication was successful, it's expected that the authentication
-	 * backend returns a so-called principal url.
-	 *
-	 * Examples of a principal url:
-	 *
-	 * principals/admin
-	 * principals/user1
-	 * principals/users/joe
-	 * principals/uid/123457
-	 *
-	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-	 * return a string such as:
-	 *
-	 * principals/users/[username]
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return array
-	 */
-	function check(RequestInterface $request, ResponseInterface $response) {
+    /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * [true, "principals/username"]
+     * [false, "reason for failure"]
+     *
+     * If authentication was successful, it's expected that the authentication
+     * backend returns a so-called principal url.
+     *
+     * Examples of a principal url:
+     *
+     * principals/admin
+     * principals/user1
+     * principals/users/joe
+     * principals/uid/123457
+     *
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+     * return a string such as:
+     *
+     * principals/users/[username]
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    function check(RequestInterface $request, ResponseInterface $response) {
 
-		if ($this->isRequestPublic($request)) {
-			return [true, "principals/system/public"];
-		}
-		return [false, "No public access to this resource."];
-	}
+        if ($this->isRequestPublic($request)) {
+            return [true, "principals/system/public"];
+        }
+        return [false, "No public access to this resource."];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @return bool
-	 */
-	private function isRequestPublic(RequestInterface $request) {
-		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
-			return strpos($url, $publicUrl, 0) === 0;
-		});
-		return !empty($matchingUrls);
-	}
+    /**
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function isRequestPublic(RequestInterface $request) {
+        $url = $request->getPath();
+        $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+            return strpos($url, $publicUrl, 0) === 0;
+        });
+        return !empty($matchingUrls);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	private function isRequestPublic(RequestInterface $request) {
 		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+		$matchingUrls = array_filter($this->publicURLs, function($publicUrl) use ($url) {
 			return strpos($url, $publicUrl, 0) === 0;
 		});
 		return !empty($matchingUrls);

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

Spacing +7 added lines, -7 removed lines

@@ -47,8 +47,8 @@ 
     static function xmlDeserialize(Reader $reader) {
 
         $elements = $reader->parseInnerTree([
-            '{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-            '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+            '{'.Plugin::NS_OWNCLOUD.'}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+            '{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
         ]);
 
         $set = [];
@@ -57,21 +57,21 @@ 
         foreach ($elements as $elem) {
             switch ($elem['name']) {
 
-                case '{' . Plugin::NS_OWNCLOUD . '}set' :
+                case '{'.Plugin::NS_OWNCLOUD.'}set' :
                     $sharee = $elem['value'];
 
-                    $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-                    $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+                    $sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary';
+                    $commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name';
 
                     $set[] = [
                         'href'       => $sharee['{DAV:}href'],
                         'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
                         'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-                        'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+                        'readOnly'   => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee),
                     ];
                     break;
 
-                case '{' . Plugin::NS_OWNCLOUD . '}remove' :
+                case '{'.Plugin::NS_OWNCLOUD.'}remove' :
                     $remove[] = $elem['value']['{DAV:}href'];
                     break;
 

apps/dav/lib/DAV/Sharing/Xml/Invite.php

Indentation +126 added lines, -126 removed lines

@@ -41,130 +41,130 @@
  */
 class Invite implements XmlSerializable {
 
-	/**
-	 * The list of users a calendar has been shared to.
-	 *
-	 * @var array
-	 */
-	protected $users;
-
-	/**
-	 * The organizer contains information about the person who shared the
-	 * object.
-	 *
-	 * @var array|null
-	 */
-	protected $organizer;
-
-	/**
-	 * Creates the property.
-	 *
-	 * Users is an array. Each element of the array has the following
-	 * properties:
-	 *
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first and lastname for a user.
-	 *   * status - One of the SharingPlugin::STATUS_* constants.
-	 *   * readOnly - true or false
-	 *   * summary - Optional, description of the share
-	 *
-	 * The organizer key is optional to specify. It's only useful when a
-	 * 'sharee' requests the sharing information.
-	 *
-	 * The organizer may have the following properties:
-	 *   * href - Often a mailto: address.
-	 *   * commonName - Optional human-readable name.
-	 *   * firstName - Optional first name.
-	 *   * lastName - Optional last name.
-	 *
-	 * If you wonder why these two structures are so different, I guess a
-	 * valid answer is that the current spec is still a draft.
-	 *
-	 * @param array $users
-	 */
-	function __construct(array $users, array $organizer = null) {
-
-		$this->users = $users;
-		$this->organizer = $organizer;
-
-	}
-
-	/**
-	 * Returns the list of users, as it was passed to the constructor.
-	 *
-	 * @return array
-	 */
-	function getValue() {
-
-		return $this->users;
-
-	}
-
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
-
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
-
-		if (!is_null($this->organizer)) {
-
-			$writer->startElement($cs . 'organizer');
-			$writer->writeElement('{DAV:}href', $this->organizer['href']);
-
-			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
-			}
-			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
-			}
-			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
-			}
-			$writer->endElement(); // organizer
-
-		}
-
-		foreach ($this->users as $user) {
-
-			$writer->startElement($cs . 'user');
-			$writer->writeElement('{DAV:}href', $user['href']);
-			if (isset($user['commonName']) && $user['commonName']) {
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
-			}
-			$writer->writeElement($cs . 'invite-accepted');
-
-			$writer->startElement($cs . 'access');
-			if ($user['readOnly']) {
-				$writer->writeElement($cs . 'read');
-			} else {
-				$writer->writeElement($cs . 'read-write');
-			}
-			$writer->endElement(); // access
-
-			if (isset($user['summary']) && $user['summary']) {
-				$writer->writeElement($cs . 'summary', $user['summary']);
-			}
-
-			$writer->endElement(); //user
-
-		}
-
-	}
+    /**
+     * The list of users a calendar has been shared to.
+     *
+     * @var array
+     */
+    protected $users;
+
+    /**
+     * The organizer contains information about the person who shared the
+     * object.
+     *
+     * @var array|null
+     */
+    protected $organizer;
+
+    /**
+     * Creates the property.
+     *
+     * Users is an array. Each element of the array has the following
+     * properties:
+     *
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first and lastname for a user.
+     *   * status - One of the SharingPlugin::STATUS_* constants.
+     *   * readOnly - true or false
+     *   * summary - Optional, description of the share
+     *
+     * The organizer key is optional to specify. It's only useful when a
+     * 'sharee' requests the sharing information.
+     *
+     * The organizer may have the following properties:
+     *   * href - Often a mailto: address.
+     *   * commonName - Optional human-readable name.
+     *   * firstName - Optional first name.
+     *   * lastName - Optional last name.
+     *
+     * If you wonder why these two structures are so different, I guess a
+     * valid answer is that the current spec is still a draft.
+     *
+     * @param array $users
+     */
+    function __construct(array $users, array $organizer = null) {
+
+        $this->users = $users;
+        $this->organizer = $organizer;
+
+    }
+
+    /**
+     * Returns the list of users, as it was passed to the constructor.
+     *
+     * @return array
+     */
+    function getValue() {
+
+        return $this->users;
+
+    }
+
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+
+        $cs = '{' . Plugin::NS_OWNCLOUD . '}';
+
+        if (!is_null($this->organizer)) {
+
+            $writer->startElement($cs . 'organizer');
+            $writer->writeElement('{DAV:}href', $this->organizer['href']);
+
+            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
+                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+            }
+            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
+                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+            }
+            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
+                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+            }
+            $writer->endElement(); // organizer
+
+        }
+
+        foreach ($this->users as $user) {
+
+            $writer->startElement($cs . 'user');
+            $writer->writeElement('{DAV:}href', $user['href']);
+            if (isset($user['commonName']) && $user['commonName']) {
+                $writer->writeElement($cs . 'common-name', $user['commonName']);
+            }
+            $writer->writeElement($cs . 'invite-accepted');
+
+            $writer->startElement($cs . 'access');
+            if ($user['readOnly']) {
+                $writer->writeElement($cs . 'read');
+            } else {
+                $writer->writeElement($cs . 'read-write');
+            }
+            $writer->endElement(); // access
+
+            if (isset($user['summary']) && $user['summary']) {
+                $writer->writeElement($cs . 'summary', $user['summary']);
+            }
+
+            $writer->endElement(); //user
+
+        }
+
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -121,21 +121,21 @@ 
 	 */
 	function xmlSerialize(Writer $writer) {
 
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
+		$cs = '{'.Plugin::NS_OWNCLOUD.'}';
 
 		if (!is_null($this->organizer)) {
 
-			$writer->startElement($cs . 'organizer');
+			$writer->startElement($cs.'organizer');
 			$writer->writeElement('{DAV:}href', $this->organizer['href']);
 
 			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+				$writer->writeElement($cs.'common-name', $this->organizer['commonName']);
 			}
 			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+				$writer->writeElement($cs.'first-name', $this->organizer['firstName']);
 			}
 			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+				$writer->writeElement($cs.'last-name', $this->organizer['lastName']);
 			}
 			$writer->endElement(); // organizer
 
@@ -143,23 +143,23 @@ 
 
 		foreach ($this->users as $user) {
 
-			$writer->startElement($cs . 'user');
+			$writer->startElement($cs.'user');
 			$writer->writeElement('{DAV:}href', $user['href']);
 			if (isset($user['commonName']) && $user['commonName']) {
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
+				$writer->writeElement($cs.'common-name', $user['commonName']);
 			}
-			$writer->writeElement($cs . 'invite-accepted');
+			$writer->writeElement($cs.'invite-accepted');
 
-			$writer->startElement($cs . 'access');
+			$writer->startElement($cs.'access');
 			if ($user['readOnly']) {
-				$writer->writeElement($cs . 'read');
+				$writer->writeElement($cs.'read');
 			} else {
-				$writer->writeElement($cs . 'read-write');
+				$writer->writeElement($cs.'read-write');
 			}
 			$writer->endElement(); // access
 
 			if (isset($user['summary']) && $user['summary']) {
-				$writer->writeElement($cs . 'summary', $user['summary']);
+				$writer->writeElement($cs.'summary', $user['summary']);
 			}
 
 			$writer->endElement(); //user