nextcloud / server

lib/private/Cache/CappedMemoryCache.php

Indentation +62 added lines, -62 removed lines

@@ -31,66 +31,66 @@
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
 
-	private $capacity;
-	private $cache = [];
-
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
-
-	public function hasKey($key) {
-		return isset($this->cache[$key]);
-	}
-
-	public function get($key) {
-		return isset($this->cache[$key]) ? $this->cache[$key] : null;
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-	}
-
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
-
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
-
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
-
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
-
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
-
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
-
-	public function getData() {
-		return $this->cache;
-	}
-
-
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
+    private $capacity;
+    private $cache = [];
+
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
+
+    public function hasKey($key) {
+        return isset($this->cache[$key]);
+    }
+
+    public function get($key) {
+        return isset($this->cache[$key]) ? $this->cache[$key] : null;
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+    }
+
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
+
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
+
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
+
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
+
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
+
+    public function getData() {
+        return $this->cache;
+    }
+
+
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
 }

lib/private/Repair/CleanTags.php

Spacing +3 added lines, -3 removed lines

@@ -171,14 +171,14 @@
 	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
 		$qb = $this->connection->getQueryBuilder();
 
-		$qb->select('d.' . $deleteId)
+		$qb->select('d.'.$deleteId)
 			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
+			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.'.$deleteId, 's.'.$sourceId))
 			->where(
 				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
 			)
 			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
+				$qb->expr()->isNull('s.'.$sourceNullColumn)
 			);
 		$result = $qb->execute();
 

Indentation +168 added lines, -168 removed lines

@@ -37,172 +37,172 @@
  */
 class CleanTags implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	protected $deletedTags = 0;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IDBConnection $connection, IUserManager $userManager) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Clean tags and favorites';
-	}
-
-	/**
-	 * Updates the configuration after running an update
-	 */
-	public function run(IOutput $output) {
-		$this->deleteOrphanTags($output);
-		$this->deleteOrphanFileEntries($output);
-		$this->deleteOrphanTagEntries($output);
-		$this->deleteOrphanCategoryEntries($output);
-	}
-
-	/**
-	 * Delete tags for deleted users
-	 */
-	protected function deleteOrphanTags(IOutput $output) {
-		$offset = 0;
-		while ($this->checkTags($offset)) {
-			$offset += 50;
-		}
-
-		$output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
-	}
-
-	protected function checkTags($offset) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('uid')
-			->from('vcategory')
-			->groupBy('uid')
-			->orderBy('uid')
-			->setMaxResults(50)
-			->setFirstResult($offset);
-		$result = $query->execute();
-
-		$users = [];
-		$hadResults = false;
-		while ($row = $result->fetch()) {
-			$hadResults = true;
-			if (!$this->userManager->userExists($row['uid'])) {
-				$users[] = $row['uid'];
-			}
-		}
-		$result->closeCursor();
-
-		if (!$hadResults) {
-			// No more tags, stop looping
-			return false;
-		}
-
-		if (!empty($users)) {
-			$query = $this->connection->getQueryBuilder();
-			$query->delete('vcategory')
-				->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
-			$this->deletedTags += $query->execute();
-		}
-		return true;
-	}
-
-	/**
-	 * Delete tag entries for deleted files
-	 */
-	protected function deleteOrphanFileEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags for delete files have been removed.',
-			'vcategory_to_object', 'objid',
-			'filecache', 'fileid', 'path_hash'
-		);
-	}
-
-	/**
-	 * Delete tag entries for deleted tags
-	 */
-	protected function deleteOrphanTagEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tag entries for deleted tags have been removed.',
-			'vcategory_to_object', 'categoryid',
-			'vcategory', 'id', 'uid'
-		);
-	}
-
-	/**
-	 * Delete tags that have no entries
-	 */
-	protected function deleteOrphanCategoryEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags with no entries have been removed.',
-			'vcategory', 'id',
-			'vcategory_to_object', 'categoryid', 'type'
-		);
-	}
-
-	/**
-	 * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
-	 *
-	 * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
-	 * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
-	 * is being deleted.
-	 *
-	 * @param string $repairInfo
-	 * @param string $deleteTable
-	 * @param string $deleteId
-	 * @param string $sourceTable
-	 * @param string $sourceId
-	 * @param string $sourceNullColumn	If this column is null in the source table,
-	 * 								the entry is deleted in the $deleteTable
-	 * @suppress SqlInjectionChecker
-	 */
-	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('d.' . $deleteId)
-			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
-			->where(
-				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
-			)
-			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
-			);
-		$result = $qb->execute();
-
-		$orphanItems = array();
-		while ($row = $result->fetch()) {
-			$orphanItems[] = (int) $row[$deleteId];
-		}
-
-		if (!empty($orphanItems)) {
-			$orphanItemsBatch = array_chunk($orphanItems, 200);
-			foreach ($orphanItemsBatch as $items) {
-				$qb->delete($deleteTable)
-					->where(
-						$qb->expr()->eq('type', $qb->expr()->literal('files'))
-					)
-					->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
-				$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->execute();
-			}
-		}
-
-		if ($repairInfo) {
-			$output->info(sprintf($repairInfo, count($orphanItems)));
-		}
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    protected $deletedTags = 0;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     */
+    public function __construct(IDBConnection $connection, IUserManager $userManager) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Clean tags and favorites';
+    }
+
+    /**
+     * Updates the configuration after running an update
+     */
+    public function run(IOutput $output) {
+        $this->deleteOrphanTags($output);
+        $this->deleteOrphanFileEntries($output);
+        $this->deleteOrphanTagEntries($output);
+        $this->deleteOrphanCategoryEntries($output);
+    }
+
+    /**
+     * Delete tags for deleted users
+     */
+    protected function deleteOrphanTags(IOutput $output) {
+        $offset = 0;
+        while ($this->checkTags($offset)) {
+            $offset += 50;
+        }
+
+        $output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
+    }
+
+    protected function checkTags($offset) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('uid')
+            ->from('vcategory')
+            ->groupBy('uid')
+            ->orderBy('uid')
+            ->setMaxResults(50)
+            ->setFirstResult($offset);
+        $result = $query->execute();
+
+        $users = [];
+        $hadResults = false;
+        while ($row = $result->fetch()) {
+            $hadResults = true;
+            if (!$this->userManager->userExists($row['uid'])) {
+                $users[] = $row['uid'];
+            }
+        }
+        $result->closeCursor();
+
+        if (!$hadResults) {
+            // No more tags, stop looping
+            return false;
+        }
+
+        if (!empty($users)) {
+            $query = $this->connection->getQueryBuilder();
+            $query->delete('vcategory')
+                ->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
+            $this->deletedTags += $query->execute();
+        }
+        return true;
+    }
+
+    /**
+     * Delete tag entries for deleted files
+     */
+    protected function deleteOrphanFileEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags for delete files have been removed.',
+            'vcategory_to_object', 'objid',
+            'filecache', 'fileid', 'path_hash'
+        );
+    }
+
+    /**
+     * Delete tag entries for deleted tags
+     */
+    protected function deleteOrphanTagEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tag entries for deleted tags have been removed.',
+            'vcategory_to_object', 'categoryid',
+            'vcategory', 'id', 'uid'
+        );
+    }
+
+    /**
+     * Delete tags that have no entries
+     */
+    protected function deleteOrphanCategoryEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags with no entries have been removed.',
+            'vcategory', 'id',
+            'vcategory_to_object', 'categoryid', 'type'
+        );
+    }
+
+    /**
+     * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
+     *
+     * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
+     * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
+     * is being deleted.
+     *
+     * @param string $repairInfo
+     * @param string $deleteTable
+     * @param string $deleteId
+     * @param string $sourceTable
+     * @param string $sourceId
+     * @param string $sourceNullColumn	If this column is null in the source table,
+     * 								the entry is deleted in the $deleteTable
+     * @suppress SqlInjectionChecker
+     */
+    protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('d.' . $deleteId)
+            ->from($deleteTable, 'd')
+            ->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
+            ->where(
+                $qb->expr()->eq('d.type', $qb->expr()->literal('files'))
+            )
+            ->andWhere(
+                $qb->expr()->isNull('s.' . $sourceNullColumn)
+            );
+        $result = $qb->execute();
+
+        $orphanItems = array();
+        while ($row = $result->fetch()) {
+            $orphanItems[] = (int) $row[$deleteId];
+        }
+
+        if (!empty($orphanItems)) {
+            $orphanItemsBatch = array_chunk($orphanItems, 200);
+            foreach ($orphanItemsBatch as $items) {
+                $qb->delete($deleteTable)
+                    ->where(
+                        $qb->expr()->eq('type', $qb->expr()->literal('files'))
+                    )
+                    ->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
+                $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->execute();
+            }
+        }
+
+        if ($repairInfo) {
+            $output->info(sprintf($repairInfo, count($orphanItems)));
+        }
+    }
 }

lib/private/Contacts/ContactsMenu/ActionProviderStore.php

Indentation +75 added lines, -75 removed lines

@@ -35,80 +35,80 @@
 
 class ActionProviderStore {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var AppManager */
-	private $appManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IServerContainer $serverContainer
-	 * @param AppManager $appManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
-		$this->serverContainer = $serverContainer;
-		$this->appManager = $appManager;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return IProvider[]
-	 * @throws Exception
-	 */
-	public function getProviders(IUser $user) {
-		$appClasses = $this->getAppProviderClasses($user);
-		$providerClasses = $this->getServerProviderClasses();
-		$allClasses = array_merge($providerClasses, $appClasses);
-		$providers = [];
-
-		foreach ($allClasses as $class) {
-			try {
-				$providers[] = $this->serverContainer->query($class);
-			} catch (QueryException $ex) {
-				$this->logger->logException($ex, [
-					'message' => "Could not load contacts menu action provider $class",
-					'app' => 'core',
-				]);
-				throw new Exception("Could not load contacts menu action provider");
-			}
-		}
-
-		return $providers;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	private function getServerProviderClasses() {
-		return [
-			EMailProvider::class,
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	private function getAppProviderClasses(IUser $user) {
-		return array_reduce($this->appManager->getEnabledAppsForUser($user), function($all, $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-
-			if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
-				// Nothing to add
-				return $all;
-			}
-
-			$providers = array_reduce($info['contactsmenu'], function($all, $provider) {
-				return array_merge($all, [$provider]);
-			}, []);
-
-			return array_merge($all, $providers);
-		}, []);
-	}
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /** @var AppManager */
+    private $appManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IServerContainer $serverContainer
+     * @param AppManager $appManager
+     * @param ILogger $logger
+     */
+    public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
+        $this->serverContainer = $serverContainer;
+        $this->appManager = $appManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param IUser $user
+     * @return IProvider[]
+     * @throws Exception
+     */
+    public function getProviders(IUser $user) {
+        $appClasses = $this->getAppProviderClasses($user);
+        $providerClasses = $this->getServerProviderClasses();
+        $allClasses = array_merge($providerClasses, $appClasses);
+        $providers = [];
+
+        foreach ($allClasses as $class) {
+            try {
+                $providers[] = $this->serverContainer->query($class);
+            } catch (QueryException $ex) {
+                $this->logger->logException($ex, [
+                    'message' => "Could not load contacts menu action provider $class",
+                    'app' => 'core',
+                ]);
+                throw new Exception("Could not load contacts menu action provider");
+            }
+        }
+
+        return $providers;
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getServerProviderClasses() {
+        return [
+            EMailProvider::class,
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    private function getAppProviderClasses(IUser $user) {
+        return array_reduce($this->appManager->getEnabledAppsForUser($user), function($all, $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+
+            if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
+                // Nothing to add
+                return $all;
+            }
+
+            $providers = array_reduce($info['contactsmenu'], function($all, $provider) {
+                return array_merge($all, [$provider]);
+            }, []);
+
+            return array_merge($all, $providers);
+        }, []);
+    }
 
 }

lib/private/Lockdown/LockdownManager.php

Indentation +43 added lines, -43 removed lines

@@ -24,56 +24,56 @@
 use OCP\Lockdown\ILockdownManager;
 
 class LockdownManager implements ILockdownManager {
-	/** @var ISession */
-	private $sessionCallback;
+    /** @var ISession */
+    private $sessionCallback;
 
-	private $enabled = false;
+    private $enabled = false;
 
-	/** @var array|null */
-	private $scope;
+    /** @var array|null */
+    private $scope;
 
-	/**
-	 * LockdownManager constructor.
-	 *
-	 * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops
-	 */
-	public function __construct(callable $sessionCallback) {
-		$this->sessionCallback = $sessionCallback;
-	}
+    /**
+     * LockdownManager constructor.
+     *
+     * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops
+     */
+    public function __construct(callable $sessionCallback) {
+        $this->sessionCallback = $sessionCallback;
+    }
 
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
-	/**
-	 * @return ISession
-	 */
-	private function getSession() {
-		$callback = $this->sessionCallback;
-		return $callback();
-	}
+    /**
+     * @return ISession
+     */
+    private function getSession() {
+        $callback = $this->sessionCallback;
+        return $callback();
+    }
 
-	private function getScopeAsArray() {
-		if (!$this->scope) {
-			$session = $this->getSession();
-			$sessionScope = $session->get('token_scope');
-			if ($sessionScope) {
-				$this->scope = $sessionScope;
-			}
-		}
-		return $this->scope;
-	}
+    private function getScopeAsArray() {
+        if (!$this->scope) {
+            $session = $this->getSession();
+            $sessionScope = $session->get('token_scope');
+            if ($sessionScope) {
+                $this->scope = $sessionScope;
+            }
+        }
+        return $this->scope;
+    }
 
-	public function setToken(IToken $token) {
-		$this->scope = $token->getScopeAsArray();
-		$session = $this->getSession();
-		$session->set('token_scope', $this->scope);
-		$this->enable();
-	}
+    public function setToken(IToken $token) {
+        $this->scope = $token->getScopeAsArray();
+        $session = $this->getSession();
+        $session->set('token_scope', $this->scope);
+        $this->enable();
+    }
 
-	public function canAccessFilesystem() {
-		$scope = $this->getScopeAsArray();
-		return !$scope || $scope['filesystem'];
-	}
+    public function canAccessFilesystem() {
+        $scope = $this->getScopeAsArray();
+        return !$scope || $scope['filesystem'];
+    }
 }

apps/user_ldap/lib/Controller/RenewPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return TemplateResponse|RedirectResponse
 	 */
 	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$parameters = [];
@@ -129,7 +129,7 @@ 
 	 * @return RedirectResponse
 	 */
 	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$args = !is_null($user) ? ['user' => $user] : [];

Indentation +129 added lines, -129 removed lines

@@ -37,144 +37,144 @@
 use OCP\IUserManager;
 
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager, 
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    function __construct($appName, IRequest $request, IUserManager $userManager, 
+        IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return RedirectResponse
-	 */
-	public function cancel() {
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function cancel() {
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$parameters = [];
-		$renewPasswordMessages = $this->session->get('renewPasswordMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($renewPasswordMessages)) {
-			list($errors, $messages) = $renewPasswordMessages;
-		}
-		$this->session->remove('renewPasswordMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showRenewPasswordForm($user) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $parameters = [];
+        $renewPasswordMessages = $this->session->get('renewPasswordMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($renewPasswordMessages)) {
+            list($errors, $messages) = $renewPasswordMessages;
+        }
+        $this->session->remove('renewPasswordMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		$parameters['user'] = $user;
+        $parameters['messages'] = $messages;
+        $parameters['user'] = $user;
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			$userObj = $this->userManager->get($user);
-			if ($userObj instanceof IUser) {
-				$parameters['canResetPassword'] = $userObj->canChangePassword();
-			}
-		}
-		$parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            $userObj = $this->userManager->get($user);
+            if ($userObj instanceof IUser) {
+                $parameters['canResetPassword'] = $userObj->canChangePassword();
+            }
+        }
+        $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
 
-		return new TemplateResponse(
-			$this->appName, 'renewpassword', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'renewpassword', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$loginResult = $this->userManager->checkPassword($user, $oldPassword);
-		if ($loginResult === false) {
-			$this->session->set('renewPasswordMessages', [
-				['invalidpassword'], []
-			]);
-			return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-		}
+    /**
+     * @PublicPage
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $oldPassword
+     * @param string $newPassword
+     *
+     * @return RedirectResponse
+     */
+    public function tryRenewPassword($user, $oldPassword, $newPassword) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $loginResult = $this->userManager->checkPassword($user, $oldPassword);
+        if ($loginResult === false) {
+            $this->session->set('renewPasswordMessages', [
+                ['invalidpassword'], []
+            ]);
+            return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+        }
 		
-		try {
-			if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
-				$this->session->set('loginMessages', [
-					[], [$this->l10n->t("Please login with the new password")]
-				]);
-				$this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-			} else {
-				$this->session->set('renewPasswordMessages', [
-					['internalexception'], []
-				]);
-			}
-		} catch (HintException $e) {
-			$this->session->set('renewPasswordMessages', [
-				[], [$e->getHint()]
-			]);
-		}
+        try {
+            if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
+                $this->session->set('loginMessages', [
+                    [], [$this->l10n->t("Please login with the new password")]
+                ]);
+                $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+            } else {
+                $this->session->set('renewPasswordMessages', [
+                    ['internalexception'], []
+                ]);
+            }
+        } catch (HintException $e) {
+            $this->session->set('renewPasswordMessages', [
+                [], [$e->getHint()]
+            ]);
+        }
 
-		return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function showLoginFormInvalidPassword($user) {
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$this->session->set('loginMessages', [
-			['invalidpassword'], []
-		]);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function showLoginFormInvalidPassword($user) {
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $this->session->set('loginMessages', [
+            ['invalidpassword'], []
+        ]);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+    }
 
 }

lib/public/Contacts/ContactsMenu/IProvider.php

Indentation +6 added lines, -6 removed lines

@@ -29,10 +29,10 @@
  */
 interface IProvider {
 
-	/**
-	 * @since 12.0
-	 * @param IEntry $entry
-	 * @return void
-	 */
-	public function process(IEntry $entry);
+    /**
+     * @since 12.0
+     * @param IEntry $entry
+     * @return void
+     */
+    public function process(IEntry $entry);
 }

lib/public/Share/IShareHelper.php

Indentation +6 added lines, -6 removed lines

@@ -32,10 +32,10 @@
  */
 interface IShareHelper {
 
-	/**
-	 * @param Node $node
-	 * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
-	 * @since 12
-	 */
-	public function getPathsForAccessList(Node $node);
+    /**
+     * @param Node $node
+     * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
+     * @since 12
+     */
+    public function getPathsForAccessList(Node $node);
 }

apps/sharebymail/lib/Capabilities.php

Indentation +20 added lines, -20 removed lines

@@ -27,24 +27,24 @@
 
 class Capabilities implements ICapability {
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		return [
-			'files_sharing' =>
-				[
-					'sharebymail' =>
-						[
-							'enabled' => true,
-							'upload_files_drop' => ['enabled' => true],
-							'password' => ['enabled' => true],
-							'expire_date' => ['enabled' => true]
-						]
-				]
-		];
-	}
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     * @since 8.2.0
+     */
+    public function getCapabilities() {
+        return [
+            'files_sharing' =>
+                [
+                    'sharebymail' =>
+                        [
+                            'enabled' => true,
+                            'upload_files_drop' => ['enabled' => true],
+                            'password' => ['enabled' => true],
+                            'expire_date' => ['enabled' => true]
+                        ]
+                ]
+        ];
+    }
 }

lib/private/Share20/ShareHelper.php

Indentation +183 added lines, -183 removed lines

@@ -31,187 +31,187 @@
 
 class ShareHelper implements IShareHelper {
 
-	/** @var IManager */
-	private $shareManager;
-
-	public function __construct(IManager $shareManager) {
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @param Node $node
-	 * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
-	 */
-	public function getPathsForAccessList(Node $node) {
-		$result = [
-			'users' => [],
-			'remotes' => [],
-		];
-
-		$accessList = $this->shareManager->getAccessList($node, true, true);
-		if (!empty($accessList['users'])) {
-			$result['users'] = $this->getPathsForUsers($node, $accessList['users']);
-		}
-		if (!empty($accessList['remote'])) {
-			$result['remotes'] = $this->getPathsForRemotes($node, $accessList['remote']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Sample:
-	 * $users = [
-	 *   'test1' => ['node_id' => 16, 'node_path' => '/foo'],
-	 *   'test2' => ['node_id' => 23, 'node_path' => '/bar'],
-	 *   'test3' => ['node_id' => 42, 'node_path' => '/cat'],
-	 *   'test4' => ['node_id' => 48, 'node_path' => '/dog'],
-	 * ];
-	 *
-	 * Node tree:
-	 * - SixTeen is the parent of TwentyThree
-	 * - TwentyThree is the parent of FortyTwo
-	 * - FortyEight does not exist
-	 *
-	 * $return = [
-	 *   'test1' => '/foo/TwentyThree/FortyTwo',
-	 *   'test2' => '/bar/FortyTwo',
-	 *   'test3' => '/cat',
-	 * ],
-	 *
-	 * @param Node $node
-	 * @param array[] $users
-	 * @return array
-	 */
-	protected function getPathsForUsers(Node $node, array $users) {
-		/** @var array[] $byId */
-		$byId = [];
-		/** @var array[] $results */
-		$results = [];
-
-		foreach ($users as $uid => $info) {
-			if (!isset($byId[$info['node_id']])) {
-				$byId[$info['node_id']] = [];
-			}
-			$byId[$info['node_id']][$uid] = $info['node_path'];
-		}
-
-		try {
-			if (isset($byId[$node->getId()])) {
-				foreach ($byId[$node->getId()] as $uid => $path) {
-					$results[$uid] = $path;
-				}
-				unset($byId[$node->getId()]);
-			}
-		} catch (NotFoundException $e) {
-			return $results;
-		} catch (InvalidPathException $e) {
-			return $results;
-		}
-
-		if (empty($byId)) {
-			return $results;
-		}
-
-		$item = $node;
-		$appendix = '/' . $node->getName();
-		while (!empty($byId)) {
-			try {
-				/** @var Node $item */
-				$item = $item->getParent();
-
-				if (!empty($byId[$item->getId()])) {
-					foreach ($byId[$item->getId()] as $uid => $path) {
-						$results[$uid] = $path . $appendix;
-					}
-					unset($byId[$item->getId()]);
-				}
-
-				$appendix = '/' . $item->getName() . $appendix;
-			} catch (NotFoundException $e) {
-				return $results;
-			} catch (InvalidPathException $e) {
-				return $results;
-			} catch (NotPermittedException $e) {
-				return $results;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Sample:
-	 * $remotes = [
-	 *   'test1' => ['node_id' => 16, 'token' => 't1'],
-	 *   'test2' => ['node_id' => 23, 'token' => 't2'],
-	 *   'test3' => ['node_id' => 42, 'token' => 't3'],
-	 *   'test4' => ['node_id' => 48, 'token' => 't4'],
-	 * ];
-	 *
-	 * Node tree:
-	 * - SixTeen is the parent of TwentyThree
-	 * - TwentyThree is the parent of FortyTwo
-	 * - FortyEight does not exist
-	 *
-	 * $return = [
-	 *   'test1' => ['token' => 't1', 'node_path' => '/SixTeen'],
-	 *   'test2' => ['token' => 't2', 'node_path' => '/SixTeen/TwentyThree'],
-	 *   'test3' => ['token' => 't3', 'node_path' => '/SixTeen/TwentyThree/FortyTwo'],
-	 * ],
-	 *
-	 * @param Node $node
-	 * @param array[] $remotes
-	 * @return array
-	 */
-	protected function getPathsForRemotes(Node $node, array $remotes) {
-		/** @var array[] $byId */
-		$byId = [];
-		/** @var array[] $results */
-		$results = [];
-
-		foreach ($remotes as $cloudId => $info) {
-			if (!isset($byId[$info['node_id']])) {
-				$byId[$info['node_id']] = [];
-			}
-			$byId[$info['node_id']][$cloudId] = $info['token'];
-		}
-
-		$item = $node;
-		while (!empty($byId)) {
-			try {
-				if (!empty($byId[$item->getId()])) {
-					$path = $this->getMountedPath($item);
-					foreach ($byId[$item->getId()] as $uid => $token) {
-						$results[$uid] = [
-							'node_path' => $path,
-							'token' => $token,
-						];
-					}
-					unset($byId[$item->getId()]);
-				}
-
-				/** @var Node $item */
-				$item = $item->getParent();
-			} catch (NotFoundException $e) {
-				return $results;
-			} catch (InvalidPathException $e) {
-				return $results;
-			} catch (NotPermittedException $e) {
-				return $results;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * @param Node $node
-	 * @return string
-	 */
-	protected function getMountedPath(Node $node) {
-		$path = $node->getPath();
-		$sections = explode('/', $path, 4);
-		return '/' . $sections[3];
-	}
+    /** @var IManager */
+    private $shareManager;
+
+    public function __construct(IManager $shareManager) {
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @param Node $node
+     * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
+     */
+    public function getPathsForAccessList(Node $node) {
+        $result = [
+            'users' => [],
+            'remotes' => [],
+        ];
+
+        $accessList = $this->shareManager->getAccessList($node, true, true);
+        if (!empty($accessList['users'])) {
+            $result['users'] = $this->getPathsForUsers($node, $accessList['users']);
+        }
+        if (!empty($accessList['remote'])) {
+            $result['remotes'] = $this->getPathsForRemotes($node, $accessList['remote']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sample:
+     * $users = [
+     *   'test1' => ['node_id' => 16, 'node_path' => '/foo'],
+     *   'test2' => ['node_id' => 23, 'node_path' => '/bar'],
+     *   'test3' => ['node_id' => 42, 'node_path' => '/cat'],
+     *   'test4' => ['node_id' => 48, 'node_path' => '/dog'],
+     * ];
+     *
+     * Node tree:
+     * - SixTeen is the parent of TwentyThree
+     * - TwentyThree is the parent of FortyTwo
+     * - FortyEight does not exist
+     *
+     * $return = [
+     *   'test1' => '/foo/TwentyThree/FortyTwo',
+     *   'test2' => '/bar/FortyTwo',
+     *   'test3' => '/cat',
+     * ],
+     *
+     * @param Node $node
+     * @param array[] $users
+     * @return array
+     */
+    protected function getPathsForUsers(Node $node, array $users) {
+        /** @var array[] $byId */
+        $byId = [];
+        /** @var array[] $results */
+        $results = [];
+
+        foreach ($users as $uid => $info) {
+            if (!isset($byId[$info['node_id']])) {
+                $byId[$info['node_id']] = [];
+            }
+            $byId[$info['node_id']][$uid] = $info['node_path'];
+        }
+
+        try {
+            if (isset($byId[$node->getId()])) {
+                foreach ($byId[$node->getId()] as $uid => $path) {
+                    $results[$uid] = $path;
+                }
+                unset($byId[$node->getId()]);
+            }
+        } catch (NotFoundException $e) {
+            return $results;
+        } catch (InvalidPathException $e) {
+            return $results;
+        }
+
+        if (empty($byId)) {
+            return $results;
+        }
+
+        $item = $node;
+        $appendix = '/' . $node->getName();
+        while (!empty($byId)) {
+            try {
+                /** @var Node $item */
+                $item = $item->getParent();
+
+                if (!empty($byId[$item->getId()])) {
+                    foreach ($byId[$item->getId()] as $uid => $path) {
+                        $results[$uid] = $path . $appendix;
+                    }
+                    unset($byId[$item->getId()]);
+                }
+
+                $appendix = '/' . $item->getName() . $appendix;
+            } catch (NotFoundException $e) {
+                return $results;
+            } catch (InvalidPathException $e) {
+                return $results;
+            } catch (NotPermittedException $e) {
+                return $results;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Sample:
+     * $remotes = [
+     *   'test1' => ['node_id' => 16, 'token' => 't1'],
+     *   'test2' => ['node_id' => 23, 'token' => 't2'],
+     *   'test3' => ['node_id' => 42, 'token' => 't3'],
+     *   'test4' => ['node_id' => 48, 'token' => 't4'],
+     * ];
+     *
+     * Node tree:
+     * - SixTeen is the parent of TwentyThree
+     * - TwentyThree is the parent of FortyTwo
+     * - FortyEight does not exist
+     *
+     * $return = [
+     *   'test1' => ['token' => 't1', 'node_path' => '/SixTeen'],
+     *   'test2' => ['token' => 't2', 'node_path' => '/SixTeen/TwentyThree'],
+     *   'test3' => ['token' => 't3', 'node_path' => '/SixTeen/TwentyThree/FortyTwo'],
+     * ],
+     *
+     * @param Node $node
+     * @param array[] $remotes
+     * @return array
+     */
+    protected function getPathsForRemotes(Node $node, array $remotes) {
+        /** @var array[] $byId */
+        $byId = [];
+        /** @var array[] $results */
+        $results = [];
+
+        foreach ($remotes as $cloudId => $info) {
+            if (!isset($byId[$info['node_id']])) {
+                $byId[$info['node_id']] = [];
+            }
+            $byId[$info['node_id']][$cloudId] = $info['token'];
+        }
+
+        $item = $node;
+        while (!empty($byId)) {
+            try {
+                if (!empty($byId[$item->getId()])) {
+                    $path = $this->getMountedPath($item);
+                    foreach ($byId[$item->getId()] as $uid => $token) {
+                        $results[$uid] = [
+                            'node_path' => $path,
+                            'token' => $token,
+                        ];
+                    }
+                    unset($byId[$item->getId()]);
+                }
+
+                /** @var Node $item */
+                $item = $item->getParent();
+            } catch (NotFoundException $e) {
+                return $results;
+            } catch (InvalidPathException $e) {
+                return $results;
+            } catch (NotPermittedException $e) {
+                return $results;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param Node $node
+     * @return string
+     */
+    protected function getMountedPath(Node $node) {
+        $path = $node->getPath();
+        $sections = explode('/', $path, 4);
+        return '/' . $sections[3];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -114,7 +114,7 @@ 
 		}
 
 		$item = $node;
-		$appendix = '/' . $node->getName();
+		$appendix = '/'.$node->getName();
 		while (!empty($byId)) {
 			try {
 				/** @var Node $item */
@@ -122,12 +122,12 @@ 
 
 				if (!empty($byId[$item->getId()])) {
 					foreach ($byId[$item->getId()] as $uid => $path) {
-						$results[$uid] = $path . $appendix;
+						$results[$uid] = $path.$appendix;
 					}
 					unset($byId[$item->getId()]);
 				}
 
-				$appendix = '/' . $item->getName() . $appendix;
+				$appendix = '/'.$item->getName().$appendix;
 			} catch (NotFoundException $e) {
 				return $results;
 			} catch (InvalidPathException $e) {
@@ -212,6 +212,6 @@ 
 	protected function getMountedPath(Node $node) {
 		$path = $node->getPath();
 		$sections = explode('/', $path, 4);
-		return '/' . $sections[3];
+		return '/'.$sections[3];
 	}
 }