nextcloud / server

lib/private/App/AppStore/Bundles/GroupwareBundle.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Groupware bundle');
+		return (string) $this->l10n->t('Groupware bundle');
 	}
 
 	/**

Indentation +17 added lines, -17 removed lines

@@ -25,23 +25,23 @@
 
 class GroupwareBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Groupware bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Groupware bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'calendar',
-			'contacts',
-			'deck',
-			'mail'
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'calendar',
+            'contacts',
+            'deck',
+            'mail'
+        ];
+    }
 
 }

lib/private/App/AppStore/Bundles/Bundle.php

Indentation +28 added lines, -28 removed lines

@@ -24,36 +24,36 @@
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Get the identifier of the bundle
-	 *
-	 * @return string
-	 */
-	public final function getIdentifier() {
-		return substr(strrchr(get_class($this), '\\'), 1);
-	}
+    /**
+     * Get the identifier of the bundle
+     *
+     * @return string
+     */
+    public final function getIdentifier() {
+        return substr(strrchr(get_class($this), '\\'), 1);
+    }
 
-	/**
-	 * Get the name of the bundle
-	 *
-	 * @return string
-	 */
-	public abstract function getName();
+    /**
+     * Get the name of the bundle
+     *
+     * @return string
+     */
+    public abstract function getName();
 
-	/**
-	 * Get the list of app identifiers in the bundle
-	 *
-	 * @return array
-	 */
-	public abstract function getAppIdentifiers();
+    /**
+     * Get the list of app identifiers in the bundle
+     *
+     * @return array
+     */
+    public abstract function getAppIdentifiers();
 }

core/Command/Db/ConvertMysqlToMB4.php

Indentation +45 added lines, -45 removed lines

@@ -34,59 +34,59 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ConvertMysqlToMB4 extends Command {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param IURLGenerator $urlGenerator
-	 * @param ILogger $logger
-	 */
-	public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) {
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		parent::__construct();
-	}
+    /**
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param IURLGenerator $urlGenerator
+     * @param ILogger $logger
+     */
+    public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) {
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('db:convert-mysql-charset')
-			->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4');
-	}
+    protected function configure() {
+        $this
+            ->setName('db:convert-mysql-charset')
+            ->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->writeln("This command is only valid for MySQL/MariaDB databases.");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->writeln("This command is only valid for MySQL/MariaDB databases.");
+            return 1;
+        }
 
-		$tools = new MySqlTools();
-		if (!$tools->supports4ByteCharset($this->connection)) {
-			$url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
-			$output->writeln("The database is not properly setup to use the charset utf8mb4.");
-			$output->writeln("For more information please read the documentation at $url");
-			return 1;
-		}
+        $tools = new MySqlTools();
+        if (!$tools->supports4ByteCharset($this->connection)) {
+            $url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
+            $output->writeln("The database is not properly setup to use the charset utf8mb4.");
+            $output->writeln("For more information please read the documentation at $url");
+            return 1;
+        }
 
-		// enable charset
-		$this->config->setSystemValue('mysql.utf8mb4', true);
+        // enable charset
+        $this->config->setSystemValue('mysql.utf8mb4', true);
 
-		// run conversion
-		$coll = new Collation($this->config, $this->logger, $this->connection, false);
-		$coll->run(new ConsoleOutput($output));
+        // run conversion
+        $coll = new Collation($this->config, $this->logger, $this->connection, false);
+        $coll->run(new ConsoleOutput($output));
 
-		return 0;
-	}
+        return 0;
+    }
 }

lib/private/Accounts/AccountManager.php

Spacing +6 added lines, -6 removed lines

@@ -195,38 +195,38 @@
 		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
 
 		// keep old verification status if we don't have a new one
-		if(!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
+		if (!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
 			$newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
 		}
 
-		if(!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
+		if (!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
 			$newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
 		}
 
-		if(!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
+		if (!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
 			$newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
 		}
 
 		// reset verification status if a value from a previously verified data was changed
-		if($twitterVerified &&
+		if ($twitterVerified &&
 			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
 		) {
 			$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($websiteVerified &&
+		if ($websiteVerified &&
 			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
 		) {
 			$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($emailVerified &&
+		if ($emailVerified &&
 			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
 		) {
 			$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;

Indentation +300 added lines, -300 removed lines

@@ -43,305 +43,305 @@
  */
 class AccountManager {
 
-	/** nobody can see my account details */
-	const VISIBILITY_PRIVATE = 'private';
-	/** only contacts, especially trusted servers can see my contact details */
-	const VISIBILITY_CONTACTS_ONLY = 'contacts';
-	/** every body ca see my contact detail, will be published to the lookup server */
-	const VISIBILITY_PUBLIC = 'public';
-
-	const PROPERTY_AVATAR = 'avatar';
-	const PROPERTY_DISPLAYNAME = 'displayname';
-	const PROPERTY_PHONE = 'phone';
-	const PROPERTY_EMAIL = 'email';
-	const PROPERTY_WEBSITE = 'website';
-	const PROPERTY_ADDRESS = 'address';
-	const PROPERTY_TWITTER = 'twitter';
-
-	const NOT_VERIFIED = '0';
-	const VERIFICATION_IN_PROGRESS = '1';
-	const VERIFIED = '2';
-
-	/** @var  IDBConnection database connection */
-	private $connection;
-
-	/** @var string table name */
-	private $table = 'accounts';
-
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/**
-	 * AccountManager constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param IJobList $jobList
-	 */
-	public function __construct(IDBConnection $connection,
-								EventDispatcherInterface $eventDispatcher,
-								IJobList $jobList) {
-		$this->connection = $connection;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->jobList = $jobList;
-	}
-
-	/**
-	 * update user record
-	 *
-	 * @param IUser $user
-	 * @param $data
-	 */
-	public function updateUser(IUser $user, $data) {
-		$userData = $this->getUser($user);
-		$updated = true;
-		if (empty($userData)) {
-			$this->insertNewUser($user, $data);
-		} elseif ($userData !== $data) {
-			$data = $this->checkEmailVerification($userData, $data, $user);
-			$data = $this->updateVerifyStatus($userData, $data);
-			$this->updateExistingUser($user, $data);
-		} else {
-			// nothing needs to be done if new and old data set are the same
-			$updated = false;
-		}
-
-		if ($updated) {
-			$this->eventDispatcher->dispatch(
-				'OC\AccountManager::userUpdated',
-				new GenericEvent($user, $data)
-			);
-		}
-	}
-
-	/**
-	 * delete user from accounts table
-	 *
-	 * @param IUser $user
-	 */
-	public function deleteUser(IUser $user) {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
-	}
-
-	/**
-	 * get stored data from a given user
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	public function getUser(IUser $user) {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('data')->from($this->table)
-			->where($query->expr()->eq('uid', $query->createParameter('uid')))
-			->setParameter('uid', $uid);
-		$query->execute();
-		$result = $query->execute()->fetchAll();
-
-		if (empty($result)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			$this->insertNewUser($user, $userData);
-			return $userData;
-		}
-
-		$userDataArray = json_decode($result[0]['data'], true);
-
-		$userDataArray = $this->addMissingDefaultValues($userDataArray);
-
-		return $userDataArray;
-	}
-
-	/**
-	 * check if we need to ask the server for email verification, if yes we create a cronjob
-	 *
-	 * @param $oldData
-	 * @param $newData
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function checkEmailVerification($oldData, $newData, IUser $user) {
-		if ($oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']) {
-			$this->jobList->add(VerifyUserData::class,
-				[
-					'verificationCode' => '',
-					'data' => $newData[self::PROPERTY_EMAIL]['value'],
-					'type' => self::PROPERTY_EMAIL,
-					'uid' => $user->getUID(),
-					'try' => 0,
-					'lastRun' => time()
-				]
-			);
-			$newData[AccountManager::PROPERTY_EMAIL]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
-		}
-
-		return $newData;
-	}
-
-	/**
-	 * make sure that all expected data are set
-	 *
-	 * @param array $userData
-	 * @return array
-	 */
-	protected function addMissingDefaultValues(array $userData) {
-
-		foreach ($userData as $key => $value) {
-			if (!isset($userData[$key]['verified'])) {
-				$userData[$key]['verified'] = self::NOT_VERIFIED;
-			}
-		}
-
-		return $userData;
-	}
-
-	/**
-	 * reset verification status if personal data changed
-	 *
-	 * @param array $oldData
-	 * @param array $newData
-	 * @return array
-	 */
-	protected function updateVerifyStatus($oldData, $newData) {
-
-		// which account was already verified successfully?
-		$twitterVerified = isset($oldData[self::PROPERTY_TWITTER]['verified']) && $oldData[self::PROPERTY_TWITTER]['verified'] === self::VERIFIED;
-		$websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
-		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
-
-		// keep old verification status if we don't have a new one
-		if(!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
-			// keep old verification status if value didn't changed and an old value exists
-			$keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
-			$newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
-		}
-
-		if(!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
-			// keep old verification status if value didn't changed and an old value exists
-			$keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
-			$newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
-		}
-
-		if(!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
-			// keep old verification status if value didn't changed and an old value exists
-			$keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
-			$newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
-		}
-
-		// reset verification status if a value from a previously verified data was changed
-		if($twitterVerified &&
-			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
-		) {
-			$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
-		}
-
-		if($websiteVerified &&
-			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
-		) {
-			$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
-		}
-
-		if($emailVerified &&
-			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
-		) {
-			$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
-		}
-
-		return $newData;
-
-	}
-
-	/**
-	 * add new user to accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function insertNewUser(IUser $user, $data) {
-		$uid = $user->getUID();
-		$jsonEncodedData = json_encode($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->table)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($uid),
-					'data' => $query->createNamedParameter($jsonEncodedData),
-				]
-			)
-			->execute();
-	}
-
-	/**
-	 * update existing user in accounts table
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 */
-	protected function updateExistingUser(IUser $user, $data) {
-		$uid = $user->getUID();
-		$jsonEncodedData = json_encode($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->table)
-			->set('data', $query->createNamedParameter($jsonEncodedData))
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
-	}
-
-	/**
-	 * build default user record in case not data set exists yet
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function buildDefaultUserRecord(IUser $user) {
-		return [
-			self::PROPERTY_DISPLAYNAME =>
-				[
-					'value' => $user->getDisplayName(),
-					'scope' => self::VISIBILITY_CONTACTS_ONLY,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_ADDRESS =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_WEBSITE =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_EMAIL =>
-				[
-					'value' => $user->getEMailAddress(),
-					'scope' => self::VISIBILITY_CONTACTS_ONLY,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_AVATAR =>
-				[
-					'scope' => self::VISIBILITY_CONTACTS_ONLY
-				],
-			self::PROPERTY_PHONE =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-			self::PROPERTY_TWITTER =>
-				[
-					'value' => '',
-					'scope' => self::VISIBILITY_PRIVATE,
-					'verified' => self::NOT_VERIFIED,
-				],
-		];
-	}
+    /** nobody can see my account details */
+    const VISIBILITY_PRIVATE = 'private';
+    /** only contacts, especially trusted servers can see my contact details */
+    const VISIBILITY_CONTACTS_ONLY = 'contacts';
+    /** every body ca see my contact detail, will be published to the lookup server */
+    const VISIBILITY_PUBLIC = 'public';
+
+    const PROPERTY_AVATAR = 'avatar';
+    const PROPERTY_DISPLAYNAME = 'displayname';
+    const PROPERTY_PHONE = 'phone';
+    const PROPERTY_EMAIL = 'email';
+    const PROPERTY_WEBSITE = 'website';
+    const PROPERTY_ADDRESS = 'address';
+    const PROPERTY_TWITTER = 'twitter';
+
+    const NOT_VERIFIED = '0';
+    const VERIFICATION_IN_PROGRESS = '1';
+    const VERIFIED = '2';
+
+    /** @var  IDBConnection database connection */
+    private $connection;
+
+    /** @var string table name */
+    private $table = 'accounts';
+
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /**
+     * AccountManager constructor.
+     *
+     * @param IDBConnection $connection
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param IJobList $jobList
+     */
+    public function __construct(IDBConnection $connection,
+                                EventDispatcherInterface $eventDispatcher,
+                                IJobList $jobList) {
+        $this->connection = $connection;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->jobList = $jobList;
+    }
+
+    /**
+     * update user record
+     *
+     * @param IUser $user
+     * @param $data
+     */
+    public function updateUser(IUser $user, $data) {
+        $userData = $this->getUser($user);
+        $updated = true;
+        if (empty($userData)) {
+            $this->insertNewUser($user, $data);
+        } elseif ($userData !== $data) {
+            $data = $this->checkEmailVerification($userData, $data, $user);
+            $data = $this->updateVerifyStatus($userData, $data);
+            $this->updateExistingUser($user, $data);
+        } else {
+            // nothing needs to be done if new and old data set are the same
+            $updated = false;
+        }
+
+        if ($updated) {
+            $this->eventDispatcher->dispatch(
+                'OC\AccountManager::userUpdated',
+                new GenericEvent($user, $data)
+            );
+        }
+    }
+
+    /**
+     * delete user from accounts table
+     *
+     * @param IUser $user
+     */
+    public function deleteUser(IUser $user) {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->execute();
+    }
+
+    /**
+     * get stored data from a given user
+     *
+     * @param IUser $user
+     * @return array
+     */
+    public function getUser(IUser $user) {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('data')->from($this->table)
+            ->where($query->expr()->eq('uid', $query->createParameter('uid')))
+            ->setParameter('uid', $uid);
+        $query->execute();
+        $result = $query->execute()->fetchAll();
+
+        if (empty($result)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            $this->insertNewUser($user, $userData);
+            return $userData;
+        }
+
+        $userDataArray = json_decode($result[0]['data'], true);
+
+        $userDataArray = $this->addMissingDefaultValues($userDataArray);
+
+        return $userDataArray;
+    }
+
+    /**
+     * check if we need to ask the server for email verification, if yes we create a cronjob
+     *
+     * @param $oldData
+     * @param $newData
+     * @param IUser $user
+     * @return array
+     */
+    protected function checkEmailVerification($oldData, $newData, IUser $user) {
+        if ($oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']) {
+            $this->jobList->add(VerifyUserData::class,
+                [
+                    'verificationCode' => '',
+                    'data' => $newData[self::PROPERTY_EMAIL]['value'],
+                    'type' => self::PROPERTY_EMAIL,
+                    'uid' => $user->getUID(),
+                    'try' => 0,
+                    'lastRun' => time()
+                ]
+            );
+            $newData[AccountManager::PROPERTY_EMAIL]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
+        }
+
+        return $newData;
+    }
+
+    /**
+     * make sure that all expected data are set
+     *
+     * @param array $userData
+     * @return array
+     */
+    protected function addMissingDefaultValues(array $userData) {
+
+        foreach ($userData as $key => $value) {
+            if (!isset($userData[$key]['verified'])) {
+                $userData[$key]['verified'] = self::NOT_VERIFIED;
+            }
+        }
+
+        return $userData;
+    }
+
+    /**
+     * reset verification status if personal data changed
+     *
+     * @param array $oldData
+     * @param array $newData
+     * @return array
+     */
+    protected function updateVerifyStatus($oldData, $newData) {
+
+        // which account was already verified successfully?
+        $twitterVerified = isset($oldData[self::PROPERTY_TWITTER]['verified']) && $oldData[self::PROPERTY_TWITTER]['verified'] === self::VERIFIED;
+        $websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
+        $emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
+
+        // keep old verification status if we don't have a new one
+        if(!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
+            // keep old verification status if value didn't changed and an old value exists
+            $keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
+            $newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
+        }
+
+        if(!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
+            // keep old verification status if value didn't changed and an old value exists
+            $keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
+            $newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
+        }
+
+        if(!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
+            // keep old verification status if value didn't changed and an old value exists
+            $keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
+            $newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
+        }
+
+        // reset verification status if a value from a previously verified data was changed
+        if($twitterVerified &&
+            $oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
+        ) {
+            $newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
+        }
+
+        if($websiteVerified &&
+            $oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
+        ) {
+            $newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
+        }
+
+        if($emailVerified &&
+            $oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
+        ) {
+            $newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
+        }
+
+        return $newData;
+
+    }
+
+    /**
+     * add new user to accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function insertNewUser(IUser $user, $data) {
+        $uid = $user->getUID();
+        $jsonEncodedData = json_encode($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->table)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($uid),
+                    'data' => $query->createNamedParameter($jsonEncodedData),
+                ]
+            )
+            ->execute();
+    }
+
+    /**
+     * update existing user in accounts table
+     *
+     * @param IUser $user
+     * @param array $data
+     */
+    protected function updateExistingUser(IUser $user, $data) {
+        $uid = $user->getUID();
+        $jsonEncodedData = json_encode($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->table)
+            ->set('data', $query->createNamedParameter($jsonEncodedData))
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->execute();
+    }
+
+    /**
+     * build default user record in case not data set exists yet
+     *
+     * @param IUser $user
+     * @return array
+     */
+    protected function buildDefaultUserRecord(IUser $user) {
+        return [
+            self::PROPERTY_DISPLAYNAME =>
+                [
+                    'value' => $user->getDisplayName(),
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_ADDRESS =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_WEBSITE =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_EMAIL =>
+                [
+                    'value' => $user->getEMailAddress(),
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_AVATAR =>
+                [
+                    'scope' => self::VISIBILITY_CONTACTS_ONLY
+                ],
+            self::PROPERTY_PHONE =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+            self::PROPERTY_TWITTER =>
+                [
+                    'value' => '',
+                    'scope' => self::VISIBILITY_PRIVATE,
+                    'verified' => self::NOT_VERIFIED,
+                ],
+        ];
+    }
 
 }

lib/private/Diagnostics/Query.php

Doc Comments +4 added lines, -1 removed lines

@@ -48,6 +48,9 @@ 
 		$this->stack = $stack;
 	}
 
+	/**
+	 * @param double $time
+	 */
 	public function end($time) {
 		$this->end = $time;
 	}
@@ -67,7 +70,7 @@ 
 	}
 
 	/**
-	 * @return float
+	 * @return integer
 	 */
 	public function getStart() {
 		return $this->start;

Indentation +49 added lines, -49 removed lines

@@ -26,65 +26,65 @@
 use OCP\Diagnostics\IQuery;
 
 class Query implements IQuery {
-	private $sql;
+    private $sql;
 
-	private $params;
+    private $params;
 
-	private $start;
+    private $start;
 
-	private $end;
+    private $end;
 
-	private $stack;
+    private $stack;
 
-	/**
-	 * @param string $sql
-	 * @param array $params
-	 * @param int $start
-	 */
-	public function __construct($sql, $params, $start, array $stack) {
-		$this->sql = $sql;
-		$this->params = $params;
-		$this->start = $start;
-		$this->stack = $stack;
-	}
+    /**
+     * @param string $sql
+     * @param array $params
+     * @param int $start
+     */
+    public function __construct($sql, $params, $start, array $stack) {
+        $this->sql = $sql;
+        $this->params = $params;
+        $this->start = $start;
+        $this->stack = $stack;
+    }
 
-	public function end($time) {
-		$this->end = $time;
-	}
+    public function end($time) {
+        $this->end = $time;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getParams() {
-		return $this->params;
-	}
+    /**
+     * @return array
+     */
+    public function getParams() {
+        return $this->params;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getSql() {
-		return $this->sql;
-	}
+    /**
+     * @return string
+     */
+    public function getSql() {
+        return $this->sql;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getStart() {
-		return $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getStart() {
+        return $this->start;
+    }
 	
-	/**
-	 * @return float
-	 */
-	public function getDuration() {
-		return $this->end - $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getDuration() {
+        return $this->end - $this->start;
+    }
 
-	public function getStartTime() {
-		return $this->start;
-	}
+    public function getStartTime() {
+        return $this->start;
+    }
 
-	public function getStacktrace() {
-		return $this->stack;
-	}
+    public function getStacktrace() {
+        return $this->stack;
+    }
 }

lib/public/Diagnostics/IEventLogger.php

Indentation +47 added lines, -47 removed lines

@@ -35,55 +35,55 @@
  * @since 8.0.0
  */
 interface IEventLogger {
-	/**
-	 * Mark the start of an event setting its ID $id and providing event description $description.
-	 *
-	 * @param string $id
-	 * @param string $description
-	 * @since 8.0.0
-	 */
-	public function start($id, $description);
+    /**
+     * Mark the start of an event setting its ID $id and providing event description $description.
+     *
+     * @param string $id
+     * @param string $description
+     * @since 8.0.0
+     */
+    public function start($id, $description);
 
-	/**
-	 * Mark the end of an event with specific ID $id, marked by start() method.
-	 * Ending event should store \OCP\Diagnostics\IEvent to
-	 * be returned with getEvents() method.
-	 *
-	 * @param string $id
-	 * @since 8.0.0
-	 */
-	public function end($id);
+    /**
+     * Mark the end of an event with specific ID $id, marked by start() method.
+     * Ending event should store \OCP\Diagnostics\IEvent to
+     * be returned with getEvents() method.
+     *
+     * @param string $id
+     * @since 8.0.0
+     */
+    public function end($id);
 
-	/**
-	 * Mark the start and the end of an event with specific ID $id and description $description,
-	 * explicitly marking start and end of the event, represented by $start and $end timestamps.
-	 * Logging event should store \OCP\Diagnostics\IEvent to
-	 * be returned with getEvents() method.
-	 *
-	 * @param string $id
-	 * @param string $description
-	 * @param float $start
-	 * @param float $end
-	 * @since 8.0.0
-	 */
-	public function log($id, $description, $start, $end);
+    /**
+     * Mark the start and the end of an event with specific ID $id and description $description,
+     * explicitly marking start and end of the event, represented by $start and $end timestamps.
+     * Logging event should store \OCP\Diagnostics\IEvent to
+     * be returned with getEvents() method.
+     *
+     * @param string $id
+     * @param string $description
+     * @param float $start
+     * @param float $end
+     * @since 8.0.0
+     */
+    public function log($id, $description, $start, $end);
 
-	/**
-	 * This method should return all \OCP\Diagnostics\IEvent objects stored using
-	 * start()/end() or log() methods
-	 *
-	 * @return \OCP\Diagnostics\IEvent[]
-	 * @since 8.0.0
-	 */
-	public function getEvents();
+    /**
+     * This method should return all \OCP\Diagnostics\IEvent objects stored using
+     * start()/end() or log() methods
+     *
+     * @return \OCP\Diagnostics\IEvent[]
+     * @since 8.0.0
+     */
+    public function getEvents();
 
-	/**
-	 * Activate the module for the duration of the request. Deactivated module
-	 * does not create and store \OCP\Diagnostics\IEvent objects.
-	 * Only activated module should create and store objects to be
-	 * returned with getEvents() call.
-	 *
-	 * @since 12.0.0
-	 */
-	public function activate();
+    /**
+     * Activate the module for the duration of the request. Deactivated module
+     * does not create and store \OCP\Diagnostics\IEvent objects.
+     * Only activated module should create and store objects to be
+     * returned with getEvents() call.
+     *
+     * @since 12.0.0
+     */
+    public function activate();
 }

lib/public/Diagnostics/IQuery.php

Indentation +30 added lines, -30 removed lines

@@ -30,38 +30,38 @@
  * @since 8.0.0
  */
 interface IQuery {
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getSql();
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getSql();
 
-	/**
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getParams();
+    /**
+     * @return array
+     * @since 8.0.0
+     */
+    public function getParams();
 
-	/**
-	 * @return float
-	 * @since 8.0.0
-	 */
-	public function getDuration();
+    /**
+     * @return float
+     * @since 8.0.0
+     */
+    public function getDuration();
 
-	/**
-	 * @return float
-	 * @since 11.0.0
-	 */
-	public function getStartTime();
+    /**
+     * @return float
+     * @since 11.0.0
+     */
+    public function getStartTime();
 
-	/**
-	 * @return array
-	 * @since 11.0.0
-	 */
-	public function getStacktrace();
-	/**
-	 * @return array
-	 * @since 12.0.0
-	 */
-	public function getStart();
+    /**
+     * @return array
+     * @since 11.0.0
+     */
+    public function getStacktrace();
+    /**
+     * @return array
+     * @since 12.0.0
+     */
+    public function getStart();
 }

lib/private/Diagnostics/EventLogger.php

Indentation +46 added lines, -46 removed lines

@@ -28,56 +28,56 @@
 use OCP\Diagnostics\IEventLogger;
 
 class EventLogger implements IEventLogger {
-	/**
-	 * @var \OC\Diagnostics\Event[]
-	 */
-	private $events = [];
+    /**
+     * @var \OC\Diagnostics\Event[]
+     */
+    private $events = [];
 	
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function start($id, $description) {
-		if ($this->activated){
-			$this->events[$id] = new Event($id, $description, microtime(true));
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function start($id, $description) {
+        if ($this->activated){
+            $this->events[$id] = new Event($id, $description, microtime(true));
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function end($id) {
-		if ($this->activated && isset($this->events[$id])) {
-			$timing = $this->events[$id];
-			$timing->end(microtime(true));
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function end($id) {
+        if ($this->activated && isset($this->events[$id])) {
+            $timing = $this->events[$id];
+            $timing->end(microtime(true));
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function log($id, $description, $start, $end) {
-		if ($this->activated) {
-			$this->events[$id] = new Event($id, $description, $start);
-			$this->events[$id]->end($end);
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function log($id, $description, $start, $end) {
+        if ($this->activated) {
+            $this->events[$id] = new Event($id, $description, $start);
+            $this->events[$id]->end($end);
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getEvents() {
-		return $this->events;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getEvents() {
+        return $this->events;
+    }
 	
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @inheritdoc
 	 */
 	public function start($id, $description) {
-		if ($this->activated){
+		if ($this->activated) {
 			$this->events[$id] = new Event($id, $description, microtime(true));
 		}
 	}

lib/private/Files/Utils/Scanner.php

Spacing +15 added lines, -15 removed lines

@@ -118,17 +118,17 @@ 
 	protected function attachListener($mount) {
 		$scanner = $mount->getStorage()->getScanner();
 		$emitter = $this;
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint().$path));
 		});
 	}
 
@@ -160,13 +160,13 @@ 
 			$scanner = $storage->getScanner();
 			$this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
 
@@ -219,13 +219,13 @@ 
 			$scanner->setUseTransactions(false);
 			$this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
 
@@ -247,7 +247,7 @@ 
 				}
 				$propagator->commitBatch();
 			} catch (StorageNotAvailableException $e) {
-				$this->logger->error('Storage ' . $storage->getId() . ' not available');
+				$this->logger->error('Storage '.$storage->getId().' not available');
 				$this->logger->logException($e);
 				$this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
 
 	/**
 	 * @param string $dir
-	 * @param $recursive
+	 * @param boolean $recursive
 	 * @param callable|null $mountFilter
 	 * @throws ForbiddenException
 	 * @throws NotFoundException

Indentation +203 added lines, -203 removed lines

@@ -50,233 +50,233 @@
  * @package OC\Files\Utils
  */
 class Scanner extends PublicEmitter {
-	const MAX_ENTRIES_TO_COMMIT = 10000;
+    const MAX_ENTRIES_TO_COMMIT = 10000;
 
-	/**
-	 * @var string $user
-	 */
-	private $user;
+    /**
+     * @var string $user
+     */
+    private $user;
 
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	protected $db;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
+    /**
+     * @var ILogger
+     */
+    protected $logger;
 
-	/**
-	 * Whether to use a DB transaction
-	 *
-	 * @var bool
-	 */
-	protected $useTransaction;
+    /**
+     * Whether to use a DB transaction
+     *
+     * @var bool
+     */
+    protected $useTransaction;
 
-	/**
-	 * Number of entries scanned to commit
-	 *
-	 * @var int
-	 */
-	protected $entriesToCommit;
+    /**
+     * Number of entries scanned to commit
+     *
+     * @var int
+     */
+    protected $entriesToCommit;
 
-	/**
-	 * @param string $user
-	 * @param \OCP\IDBConnection $db
-	 * @param ILogger $logger
-	 */
-	public function __construct($user, $db, ILogger $logger) {
-		$this->logger = $logger;
-		$this->user = $user;
-		$this->db = $db;
-		// when DB locking is used, no DB transactions will be used
-		$this->useTransaction = !(\OC::$server->getLockingProvider() instanceof DBLockingProvider);
-	}
+    /**
+     * @param string $user
+     * @param \OCP\IDBConnection $db
+     * @param ILogger $logger
+     */
+    public function __construct($user, $db, ILogger $logger) {
+        $this->logger = $logger;
+        $this->user = $user;
+        $this->db = $db;
+        // when DB locking is used, no DB transactions will be used
+        $this->useTransaction = !(\OC::$server->getLockingProvider() instanceof DBLockingProvider);
+    }
 
-	/**
-	 * get all storages for $dir
-	 *
-	 * @param string $dir
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	protected function getMounts($dir) {
-		//TODO: move to the node based fileapi once that's done
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($this->user);
+    /**
+     * get all storages for $dir
+     *
+     * @param string $dir
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    protected function getMounts($dir) {
+        //TODO: move to the node based fileapi once that's done
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($this->user);
 
-		$mountManager = Filesystem::getMountManager();
-		$mounts = $mountManager->findIn($dir);
-		$mounts[] = $mountManager->find($dir);
-		$mounts = array_reverse($mounts); //start with the mount of $dir
+        $mountManager = Filesystem::getMountManager();
+        $mounts = $mountManager->findIn($dir);
+        $mounts[] = $mountManager->find($dir);
+        $mounts = array_reverse($mounts); //start with the mount of $dir
 
-		return $mounts;
-	}
+        return $mounts;
+    }
 
-	/**
-	 * attach listeners to the scanner
-	 *
-	 * @param \OC\Files\Mount\MountPoint $mount
-	 */
-	protected function attachListener($mount) {
-		$scanner = $mount->getStorage()->getScanner();
-		$emitter = $this;
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
-		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
-		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
-		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
-		});
-	}
+    /**
+     * attach listeners to the scanner
+     *
+     * @param \OC\Files\Mount\MountPoint $mount
+     */
+    protected function attachListener($mount) {
+        $scanner = $mount->getStorage()->getScanner();
+        $emitter = $this;
+        $scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+        });
+        $scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
+        });
+        $scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
+        });
+        $scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
+        });
+    }
 
-	/**
-	 * @param string $dir
-	 */
-	public function backgroundScan($dir) {
-		$mounts = $this->getMounts($dir);
-		foreach ($mounts as $mount) {
-			$storage = $mount->getStorage();
-			if (is_null($storage)) {
-				continue;
-			}
+    /**
+     * @param string $dir
+     */
+    public function backgroundScan($dir) {
+        $mounts = $this->getMounts($dir);
+        foreach ($mounts as $mount) {
+            $storage = $mount->getStorage();
+            if (is_null($storage)) {
+                continue;
+            }
 
-			// don't bother scanning failed storages (shortcut for same result)
-			if ($storage->instanceOfStorage(FailedStorage::class)) {
-				continue;
-			}
+            // don't bother scanning failed storages (shortcut for same result)
+            if ($storage->instanceOfStorage(FailedStorage::class)) {
+                continue;
+            }
 
-			// don't scan received local shares, these can be scanned when scanning the owner's storage
-			if ($storage->instanceOfStorage(SharedStorage::class)) {
-				continue;
-			}
-			$scanner = $storage->getScanner();
-			$this->attachListener($mount);
+            // don't scan received local shares, these can be scanned when scanning the owner's storage
+            if ($storage->instanceOfStorage(SharedStorage::class)) {
+                continue;
+            }
+            $scanner = $storage->getScanner();
+            $this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
-				$this->triggerPropagator($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
-				$this->triggerPropagator($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
-				$this->triggerPropagator($storage, $path);
-			});
+            $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+                $this->triggerPropagator($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+                $this->triggerPropagator($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+                $this->triggerPropagator($storage, $path);
+            });
 
-			$propagator = $storage->getPropagator();
-			$propagator->beginBatch();
-			$scanner->backgroundScan();
-			$propagator->commitBatch();
-		}
-	}
+            $propagator = $storage->getPropagator();
+            $propagator->beginBatch();
+            $scanner->backgroundScan();
+            $propagator->commitBatch();
+        }
+    }
 
-	/**
-	 * @param string $dir
-	 * @param $recursive
-	 * @param callable|null $mountFilter
-	 * @throws ForbiddenException
-	 * @throws NotFoundException
-	 */
-	public function scan($dir = '', $recursive = \OC\Files\Cache\Scanner::SCAN_RECURSIVE, callable $mountFilter = null) {
-		if (!Filesystem::isValidPath($dir)) {
-			throw new \InvalidArgumentException('Invalid path to scan');
-		}
-		$mounts = $this->getMounts($dir);
-		foreach ($mounts as $mount) {
-			if ($mountFilter && !$mountFilter($mount)) {
-				continue;
-			}
-			$storage = $mount->getStorage();
-			if (is_null($storage)) {
-				continue;
-			}
+    /**
+     * @param string $dir
+     * @param $recursive
+     * @param callable|null $mountFilter
+     * @throws ForbiddenException
+     * @throws NotFoundException
+     */
+    public function scan($dir = '', $recursive = \OC\Files\Cache\Scanner::SCAN_RECURSIVE, callable $mountFilter = null) {
+        if (!Filesystem::isValidPath($dir)) {
+            throw new \InvalidArgumentException('Invalid path to scan');
+        }
+        $mounts = $this->getMounts($dir);
+        foreach ($mounts as $mount) {
+            if ($mountFilter && !$mountFilter($mount)) {
+                continue;
+            }
+            $storage = $mount->getStorage();
+            if (is_null($storage)) {
+                continue;
+            }
 
-			// don't bother scanning failed storages (shortcut for same result)
-			if ($storage->instanceOfStorage(FailedStorage::class)) {
-				continue;
-			}
+            // don't bother scanning failed storages (shortcut for same result)
+            if ($storage->instanceOfStorage(FailedStorage::class)) {
+                continue;
+            }
 
-			// if the home storage isn't writable then the scanner is run as the wrong user
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
-				(!$storage->isCreatable('') or !$storage->isCreatable('files'))
-			) {
-				if ($storage->file_exists('') or $storage->getCache()->inCache('')) {
-					throw new ForbiddenException();
-				} else {// if the root exists in neither the cache nor the storage the user isn't setup yet
-					break;
-				}
+            // if the home storage isn't writable then the scanner is run as the wrong user
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
+                (!$storage->isCreatable('') or !$storage->isCreatable('files'))
+            ) {
+                if ($storage->file_exists('') or $storage->getCache()->inCache('')) {
+                    throw new ForbiddenException();
+                } else {// if the root exists in neither the cache nor the storage the user isn't setup yet
+                    break;
+                }
 
-			}
+            }
 
-			// don't scan received local shares, these can be scanned when scanning the owner's storage
-			if ($storage->instanceOfStorage(SharedStorage::class)) {
-				continue;
-			}
-			$relativePath = $mount->getInternalPath($dir);
-			$scanner = $storage->getScanner();
-			$scanner->setUseTransactions(false);
-			$this->attachListener($mount);
+            // don't scan received local shares, these can be scanned when scanning the owner's storage
+            if ($storage->instanceOfStorage(SharedStorage::class)) {
+                continue;
+            }
+            $relativePath = $mount->getInternalPath($dir);
+            $scanner = $storage->getScanner();
+            $scanner->setUseTransactions(false);
+            $this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
-				$this->postProcessEntry($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
-				$this->postProcessEntry($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
-				$this->postProcessEntry($storage, $path);
-			});
+            $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+                $this->postProcessEntry($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+                $this->postProcessEntry($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+                $this->postProcessEntry($storage, $path);
+            });
 
-			if (!$storage->file_exists($relativePath)) {
-				throw new NotFoundException($dir);
-			}
+            if (!$storage->file_exists($relativePath)) {
+                throw new NotFoundException($dir);
+            }
 
-			if ($this->useTransaction) {
-				$this->db->beginTransaction();
-			}
-			try {
-				$propagator = $storage->getPropagator();
-				$propagator->beginBatch();
-				$scanner->scan($relativePath, $recursive, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
-				$cache = $storage->getCache();
-				if ($cache instanceof Cache) {
-					// only re-calculate for the root folder we scanned, anything below that is taken care of by the scanner
-					$cache->correctFolderSize($relativePath);
-				}
-				$propagator->commitBatch();
-			} catch (StorageNotAvailableException $e) {
-				$this->logger->error('Storage ' . $storage->getId() . ' not available');
-				$this->logger->logException($e);
-				$this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
-			}
-			if ($this->useTransaction) {
-				$this->db->commit();
-			}
-		}
-	}
+            if ($this->useTransaction) {
+                $this->db->beginTransaction();
+            }
+            try {
+                $propagator = $storage->getPropagator();
+                $propagator->beginBatch();
+                $scanner->scan($relativePath, $recursive, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
+                $cache = $storage->getCache();
+                if ($cache instanceof Cache) {
+                    // only re-calculate for the root folder we scanned, anything below that is taken care of by the scanner
+                    $cache->correctFolderSize($relativePath);
+                }
+                $propagator->commitBatch();
+            } catch (StorageNotAvailableException $e) {
+                $this->logger->error('Storage ' . $storage->getId() . ' not available');
+                $this->logger->logException($e);
+                $this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
+            }
+            if ($this->useTransaction) {
+                $this->db->commit();
+            }
+        }
+    }
 
-	private function triggerPropagator(IStorage $storage, $internalPath) {
-		$storage->getPropagator()->propagateChange($internalPath, time());
-	}
+    private function triggerPropagator(IStorage $storage, $internalPath) {
+        $storage->getPropagator()->propagateChange($internalPath, time());
+    }
 
-	private function postProcessEntry(IStorage $storage, $internalPath) {
-		$this->triggerPropagator($storage, $internalPath);
-		if ($this->useTransaction) {
-			$this->entriesToCommit++;
-			if ($this->entriesToCommit >= self::MAX_ENTRIES_TO_COMMIT) {
-				$propagator = $storage->getPropagator();
-				$this->entriesToCommit = 0;
-				$this->db->commit();
-				$propagator->commitBatch();
-				$this->db->beginTransaction();
-				$propagator->beginBatch();
-			}
-		}
-	}
+    private function postProcessEntry(IStorage $storage, $internalPath) {
+        $this->triggerPropagator($storage, $internalPath);
+        if ($this->useTransaction) {
+            $this->entriesToCommit++;
+            if ($this->entriesToCommit >= self::MAX_ENTRIES_TO_COMMIT) {
+                $propagator = $storage->getPropagator();
+                $this->entriesToCommit = 0;
+                $this->db->commit();
+                $propagator->commitBatch();
+                $this->db->beginTransaction();
+                $propagator->beginBatch();
+            }
+        }
+    }
 }