nextcloud / server

apps/files_sharing/lib/Activity/Providers/RemoteShares.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 		return [
 			'type' => 'user',
 			'id' => $remoteUser->getUser(),
-			'name' => $cloudId,// Todo display name from contacts
+			'name' => $cloudId, // Todo display name from contacts
 			'server' => $remoteUser->getRemote(),
 		];
 	}

Indentation +124 added lines, -124 removed lines

@@ -32,128 +32,128 @@
 
 class RemoteShares extends Base {
 
-	protected $cloudIdManager;
-
-	const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
-	const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
-	const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
-	const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($languageFactory, $url, $activityManager, $userManager);
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
-			$subject = $this->l->t('{user} accepted the remote share');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
-			$subject = $this->l->t('{user} declined the remote share');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
-			$subject = $this->l->t('You received a new remote share {file} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
-			$subject = $this->l->t('{user} accepted the remote share of {file}');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
-			$subject = $this->l->t('{user} declined the remote share of {file}');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
-			$subject = $this->l->t('{user} unshared {file} from you');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_REMOTE_SHARE_RECEIVED:
-			case self::SUBJECT_REMOTE_SHARE_UNSHARED:
-				return [
-					'file' => [
-						'type' => 'pending-federated-share',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-					'user' => $this->getFederatedUser($parameters[0]),
-				];
-			case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
-			case self::SUBJECT_REMOTE_SHARE_DECLINED:
-				$fileParameter = $parameters[1];
-				if (!is_array($fileParameter)) {
-					$fileParameter = [$event->getObjectId() => $event->getObjectName()];
-				}
-				return [
-					'file' => $this->getFile($fileParameter),
-					'user' => $this->getFederatedUser($parameters[0]),
-				];
-		}
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function getFederatedUser($cloudId) {
-		$remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
-		return [
-			'type' => 'user',
-			'id' => $remoteUser->getUser(),
-			'name' => $cloudId,// Todo display name from contacts
-			'server' => $remoteUser->getRemote(),
-		];
-	}
+    protected $cloudIdManager;
+
+    const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
+    const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
+    const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
+    const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager
+    ) {
+        parent::__construct($languageFactory, $url, $activityManager, $userManager);
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
+            $subject = $this->l->t('{user} accepted the remote share');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
+            $subject = $this->l->t('{user} declined the remote share');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
+            $subject = $this->l->t('You received a new remote share {file} from {user}');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
+            $subject = $this->l->t('{user} accepted the remote share of {file}');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
+            $subject = $this->l->t('{user} declined the remote share of {file}');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
+            $subject = $this->l->t('{user} unshared {file} from you');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_REMOTE_SHARE_RECEIVED:
+            case self::SUBJECT_REMOTE_SHARE_UNSHARED:
+                return [
+                    'file' => [
+                        'type' => 'pending-federated-share',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                    'user' => $this->getFederatedUser($parameters[0]),
+                ];
+            case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
+            case self::SUBJECT_REMOTE_SHARE_DECLINED:
+                $fileParameter = $parameters[1];
+                if (!is_array($fileParameter)) {
+                    $fileParameter = [$event->getObjectId() => $event->getObjectName()];
+                }
+                return [
+                    'file' => $this->getFile($fileParameter),
+                    'user' => $this->getFederatedUser($parameters[0]),
+                ];
+        }
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function getFederatedUser($cloudId) {
+        $remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
+        return [
+            'type' => 'user',
+            'id' => $remoteUser->getUser(),
+            'name' => $cloudId,// Todo display name from contacts
+            'server' => $remoteUser->getRemote(),
+        ];
+    }
 }

apps/files_sharing/lib/Activity/Settings/PublicLinks.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class PublicLinks implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'public_links';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'public_links';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 20;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 20;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files_sharing/lib/Activity/Filter.php

Indentation +56 added lines, -56 removed lines

@@ -27,69 +27,69 @@
 use OCP\IURLGenerator;
 
 class Filter implements IFilter {
-	const TYPE_REMOTE_SHARE = 'remote_share';
-	const TYPE_SHARED = 'shared';
+    const TYPE_REMOTE_SHARE = 'remote_share';
+    const TYPE_SHARED = 'shared';
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files_sharing';
-	}
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files_sharing';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('File shares');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('File shares');
+    }
 
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 31;
-	}
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 31;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			self::TYPE_SHARED,
-			self::TYPE_REMOTE_SHARE
-		], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            self::TYPE_SHARED,
+            self::TYPE_REMOTE_SHARE
+        ], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files_sharing'];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files_sharing'];
+    }
 }

apps/files_sharing/lib/Controller/ExternalSharesController.php

Indentation +100 added lines, -100 removed lines

@@ -39,112 +39,112 @@
  */
 class ExternalSharesController extends Controller {
 
-	/** @var \OCA\Files_Sharing\External\Manager */
-	private $externalManager;
-	/** @var IClientService */
-	private $clientService;
+    /** @var \OCA\Files_Sharing\External\Manager */
+    private $externalManager;
+    /** @var IClientService */
+    private $clientService;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param \OCA\Files_Sharing\External\Manager $externalManager
-	 * @param IClientService $clientService
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								\OCA\Files_Sharing\External\Manager $externalManager,
-								IClientService $clientService) {
-		parent::__construct($appName, $request);
-		$this->externalManager = $externalManager;
-		$this->clientService = $clientService;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param \OCA\Files_Sharing\External\Manager $externalManager
+     * @param IClientService $clientService
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                \OCA\Files_Sharing\External\Manager $externalManager,
+                                IClientService $clientService) {
+        parent::__construct($appName, $request);
+        $this->externalManager = $externalManager;
+        $this->clientService = $clientService;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function index() {
-		return new JSONResponse($this->externalManager->getOpenShares());
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @return JSONResponse
+     */
+    public function index() {
+        return new JSONResponse($this->externalManager->getOpenShares());
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param int $id
-	 * @return JSONResponse
-	 */
-	public function create($id) {
-		$this->externalManager->acceptShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param int $id
+     * @return JSONResponse
+     */
+    public function create($id) {
+        $this->externalManager->acceptShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param integer $id
-	 * @return JSONResponse
-	 */
-	public function destroy($id) {
-		$this->externalManager->declineShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param integer $id
+     * @return JSONResponse
+     */
+    public function destroy($id) {
+        $this->externalManager->declineShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * Test whether the specified remote is accessible
-	 *
-	 * @param string $remote
-	 * @param bool $checkVersion
-	 * @return bool
-	 */
-	protected function testUrl($remote, $checkVersion = false) {
-		try {
-			$client = $this->clientService->newClient();
-			$response = json_decode($client->get(
-				$remote,
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			)->getBody());
+    /**
+     * Test whether the specified remote is accessible
+     *
+     * @param string $remote
+     * @param bool $checkVersion
+     * @return bool
+     */
+    protected function testUrl($remote, $checkVersion = false) {
+        try {
+            $client = $this->clientService->newClient();
+            $response = json_decode($client->get(
+                $remote,
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            )->getBody());
 
-			if ($checkVersion) {
-				return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
-			} else {
-				return is_object($response);
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+            if ($checkVersion) {
+                return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
+            } else {
+                return is_object($response);
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoOutgoingFederatedSharingRequired
-	 * @NoIncomingFederatedSharingRequired
-	 *
-	 * @param string $remote
-	 * @return DataResponse
-	 */
-	public function testRemote($remote) {
-		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('https');
-		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('http');
-		} else {
-			return new DataResponse(false);
-		}
-	}
+    /**
+     * @PublicPage
+     * @NoOutgoingFederatedSharingRequired
+     * @NoIncomingFederatedSharingRequired
+     *
+     * @param string $remote
+     * @return DataResponse
+     */
+    public function testRemote($remote) {
+        if (
+            $this->testUrl('https://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('https://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('https');
+        } elseif (
+            $this->testUrl('http://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('http://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('http');
+        } else {
+            return new DataResponse(false);
+        }
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -131,15 +131,15 @@
 	 */
 	public function testRemote($remote) {
 		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
+			$this->testUrl('https://'.$remote.'/ocs-provider/') ||
+			$this->testUrl('https://'.$remote.'/ocs-provider/index.php') ||
+			$this->testUrl('https://'.$remote.'/status.php', true)
 		) {
 			return new DataResponse('https');
 		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
+			$this->testUrl('http://'.$remote.'/ocs-provider/') ||
+			$this->testUrl('http://'.$remote.'/ocs-provider/index.php') ||
+			$this->testUrl('http://'.$remote.'/status.php', true)
 		) {
 			return new DataResponse('http');
 		} else {

apps/files_sharing/lib/ISharedStorage.php

Spacing +1 added lines, -1 removed lines

@@ -23,6 +23,6 @@
 
 namespace OCA\Files_Sharing;
 
-interface ISharedStorage{
+interface ISharedStorage {
 
 }

apps/files_sharing/lib/Exceptions/BrokenPath.php

Indentation -1 removed lines

@@ -27,7 +27,6 @@
  * Expected path with a different root
  * Possible Error Codes:
  * 10 - Path not relative to data/ and point to the users file directory
-
  */
 class BrokenPath extends \Exception {
 }

apps/files_sharing/lib/External/Scanner.php

Indentation +87 added lines, -87 removed lines

@@ -32,97 +32,97 @@
 use OCP\Files\StorageNotAvailableException;
 
 class Scanner extends \OC\Files\Cache\Scanner {
-	/** @var \OCA\Files_Sharing\External\Storage */
-	protected $storage;
+    /** @var \OCA\Files_Sharing\External\Storage */
+    protected $storage;
 
-	/** {@inheritDoc} */
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		if(!$this->storage->remoteIsOwnCloud()) {
-			return parent::scan($path, $recursive, $recursive, $lock);
-		}
+    /** {@inheritDoc} */
+    public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
+        if(!$this->storage->remoteIsOwnCloud()) {
+            return parent::scan($path, $recursive, $recursive, $lock);
+        }
 
-		$this->scanAll();
-	}
+        $this->scanAll();
+    }
 
-	/**
-	 * Scan a single file and store it in the cache.
-	 * If an exception happened while accessing the external storage,
-	 * the storage will be checked for availability and removed
-	 * if it is not available any more.
-	 *
-	 * @param string $file file to scan
-	 * @param int $reuseExisting
-	 * @param int $parentId
-	 * @param array | null $cacheData existing data in the cache for the file to be scanned
-	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of metadata of the scanned file
-	 */
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		try {
-			return parent::scanFile($file, $reuseExisting);
-		} catch (ForbiddenException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (NotFoundException $e) {
-			// if the storage isn't found, the call to
-			// checkStorageAvailable() will verify it and remove it
-			// if appropriate
-			$this->storage->checkStorageAvailability();
-		} catch (StorageInvalidException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (StorageNotAvailableException $e) {
-			$this->storage->checkStorageAvailability();
-		}
-	}
+    /**
+     * Scan a single file and store it in the cache.
+     * If an exception happened while accessing the external storage,
+     * the storage will be checked for availability and removed
+     * if it is not available any more.
+     *
+     * @param string $file file to scan
+     * @param int $reuseExisting
+     * @param int $parentId
+     * @param array | null $cacheData existing data in the cache for the file to be scanned
+     * @param bool $lock set to false to disable getting an additional read lock during scanning
+     * @return array an array of metadata of the scanned file
+     */
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        try {
+            return parent::scanFile($file, $reuseExisting);
+        } catch (ForbiddenException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (NotFoundException $e) {
+            // if the storage isn't found, the call to
+            // checkStorageAvailable() will verify it and remove it
+            // if appropriate
+            $this->storage->checkStorageAvailability();
+        } catch (StorageInvalidException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (StorageNotAvailableException $e) {
+            $this->storage->checkStorageAvailability();
+        }
+    }
 
-	/**
-	 * Checks the remote share for changes.
-	 * If changes are available, scan them and update
-	 * the cache.
-	 * @throws NotFoundException
-	 * @throws StorageInvalidException
-	 * @throws \Exception
-	 */
-	public function scanAll() {
-		try {
-			$data = $this->storage->getShareInfo();
-		} catch (\Exception $e) {
-			$this->storage->checkStorageAvailability();
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
-				$e->getMessage()
-			);
-		}
-		if ($data['status'] === 'success') {
-			$this->addResult($data['data'], '');
-		} else {
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
-			);
-		}
-	}
+    /**
+     * Checks the remote share for changes.
+     * If changes are available, scan them and update
+     * the cache.
+     * @throws NotFoundException
+     * @throws StorageInvalidException
+     * @throws \Exception
+     */
+    public function scanAll() {
+        try {
+            $data = $this->storage->getShareInfo();
+        } catch (\Exception $e) {
+            $this->storage->checkStorageAvailability();
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '" ' .
+                $e->getMessage()
+            );
+        }
+        if ($data['status'] === 'success') {
+            $this->addResult($data['data'], '');
+        } else {
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '"'
+            );
+        }
+    }
 
-	/**
-	 * @param array $data
-	 * @param string $path
-	 */
-	private function addResult($data, $path) {
-		$id = $this->cache->put($path, $data);
-		if (isset($data['children'])) {
-			$children = [];
-			foreach ($data['children'] as $child) {
-				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
-			}
+    /**
+     * @param array $data
+     * @param string $path
+     */
+    private function addResult($data, $path) {
+        $id = $this->cache->put($path, $data);
+        if (isset($data['children'])) {
+            $children = [];
+            foreach ($data['children'] as $child) {
+                $children[$child['name']] = true;
+                $this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+            }
 
-			$existingCache = $this->cache->getFolderContentsById($id);
-			foreach ($existingCache as $existingChild) {
-				// if an existing child is not in the new data, remove it
-				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
-				}
-			}
-		}
-	}
+            $existingCache = $this->cache->getFolderContentsById($id);
+            foreach ($existingCache as $existingChild) {
+                // if an existing child is not in the new data, remove it
+                if (!isset($children[$existingChild['name']])) {
+                    $this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+                }
+            }
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 
 	/** {@inheritDoc} */
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		if(!$this->storage->remoteIsOwnCloud()) {
+		if (!$this->storage->remoteIsOwnCloud()) {
 			return parent::scan($path, $recursive, $recursive, $lock);
 		}
 
@@ -88,8 +88,8 @@ 
 		} catch (\Exception $e) {
 			$this->storage->checkStorageAvailability();
 			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
+				'Error while scanning remote share: "'.
+				$this->storage->getRemote().'" '.
 				$e->getMessage()
 			);
 		}
@@ -97,8 +97,8 @@ 
 			$this->addResult($data['data'], '');
 		} else {
 			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
+				'Error while scanning remote share: "'.
+				$this->storage->getRemote().'"'
 			);
 		}
 	}
@@ -113,14 +113,14 @@ 
 			$children = [];
 			foreach ($data['children'] as $child) {
 				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+				$this->addResult($child, ltrim($path.'/'.$child['name'], '/'));
 			}
 
 			$existingCache = $this->cache->getFolderContentsById($id);
 			foreach ($existingCache as $existingChild) {
 				// if an existing child is not in the new data, remove it
 				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+					$this->cache->remove(ltrim($path.'/'.$existingChild['name'], '/'));
 				}
 			}
 		}

apps/files_sharing/lib/External/Cache.php

Indentation +37 added lines, -37 removed lines

@@ -27,44 +27,44 @@
 use OCP\Federation\ICloudId;
 
 class Cache extends \OC\Files\Cache\Cache {
-	/** @var ICloudId */
-	private $cloudId;
-	private $remote;
-	private $remoteUser;
-	private $storage;
+    /** @var ICloudId */
+    private $cloudId;
+    private $remote;
+    private $remoteUser;
+    private $storage;
 
-	/**
-	 * @param \OCA\Files_Sharing\External\Storage $storage
-	 * @param ICloudId $cloudId
-	 */
-	public function __construct($storage, ICloudId $cloudId) {
-		$this->cloudId = $cloudId;
-		$this->storage = $storage;
-		list(, $remote) = explode('://', $cloudId->getRemote(), 2);
-		$this->remote = $remote;
-		$this->remoteUser = $cloudId->getUser();
-		parent::__construct($storage);
-	}
+    /**
+     * @param \OCA\Files_Sharing\External\Storage $storage
+     * @param ICloudId $cloudId
+     */
+    public function __construct($storage, ICloudId $cloudId) {
+        $this->cloudId = $cloudId;
+        $this->storage = $storage;
+        list(, $remote) = explode('://', $cloudId->getRemote(), 2);
+        $this->remote = $remote;
+        $this->remoteUser = $cloudId->getUser();
+        parent::__construct($storage);
+    }
 
-	public function get($file) {
-		$result = parent::get($file);
-		if (!$result) {
-			return false;
-		}
-		$result['displayname_owner'] = $this->cloudId->getDisplayId();
-		if (!$file || $file === '') {
-			$result['is_share_mount_point'] = true;
-			$mountPoint = rtrim($this->storage->getMountPoint());
-			$result['name'] = basename($mountPoint);
-		}
-		return $result;
-	}
+    public function get($file) {
+        $result = parent::get($file);
+        if (!$result) {
+            return false;
+        }
+        $result['displayname_owner'] = $this->cloudId->getDisplayId();
+        if (!$file || $file === '') {
+            $result['is_share_mount_point'] = true;
+            $mountPoint = rtrim($this->storage->getMountPoint());
+            $result['name'] = basename($mountPoint);
+        }
+        return $result;
+    }
 
-	public function getFolderContentsById($id) {
-		$results = parent::getFolderContentsById($id);
-		foreach ($results as &$file) {
-			$file['displayname_owner'] = $this->cloudId->getDisplayId();
-		}
-		return $results;
-	}
+    public function getFolderContentsById($id) {
+        $results = parent::getFolderContentsById($id);
+        foreach ($results as &$file) {
+            $file['displayname_owner'] = $this->cloudId->getDisplayId();
+        }
+        return $results;
+    }
 }

apps/files_sharing/lib/External/MountProvider.php

Indentation +45 added lines, -45 removed lines

@@ -29,59 +29,59 @@
 use OCP\IUser;
 
 class MountProvider implements IMountProvider {
-	const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @var ICloudIdManager
-	 */
-	private $cloudIdManager;
+    /**
+     * @var ICloudIdManager
+     */
+    private $cloudIdManager;
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) {
-		$this->connection = $connection;
-		$this->managerProvider = $managerProvider;
-		$this->cloudIdManager = $cloudIdManager;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) {
+        $this->connection = $connection;
+        $this->managerProvider = $managerProvider;
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
-		$data['HttpClientService'] = \OC::$server->getHTTPClientService();
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
+        $data['HttpClientService'] = \OC::$server->getHTTPClientService();
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$query = $this->connection->prepare('
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $query = $this->connection->prepare('
 				SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
 				FROM `*PREFIX*share_external`
 				WHERE `user` = ? AND `accepted` = ?
 			');
-		$query->execute([$user->getUID(), 1]);
-		$mounts = [];
-		while ($row = $query->fetch()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		return $mounts;
-	}
+        $query->execute([$user->getUID(), 1]);
+        $mounts = [];
+        while ($row = $query->fetch()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        return $mounts;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		$managerProvider = $this->managerProvider;
 		$manager = $managerProvider();
 		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+		$mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/');
 		$data['mountpoint'] = $mountPoint;
 		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
 		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());