nextcloud / server

lib/public/Collaboration/Collaborators/ISearchResult.php

Indentation +35 added lines, -35 removed lines

@@ -30,44 +30,44 @@
  * @since 13.0.0
  */
 interface ISearchResult {
-	/**
-	 * @param SearchResultType $type
-	 * @param array $matches
-	 * @param array|null $exactMatches
-	 * @since 13.0.0
-	 */
-	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null);
+    /**
+     * @param SearchResultType $type
+     * @param array $matches
+     * @param array|null $exactMatches
+     * @since 13.0.0
+     */
+    public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null);
 
-	/**
-	 * @param SearchResultType $type
-	 * @param string $collaboratorId
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasResult(SearchResultType $type, $collaboratorId);
+    /**
+     * @param SearchResultType $type
+     * @param string $collaboratorId
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasResult(SearchResultType $type, $collaboratorId);
 
-	/**
-	 * @param SearchResultType $type
-	 * @since 13.0.0
-	 */
-	public function unsetResult(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @since 13.0.0
+     */
+    public function unsetResult(SearchResultType $type);
 
-	/**
-	 * @param SearchResultType $type
-	 * @since 13.0.0
-	 */
-	public function markExactIdMatch(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @since 13.0.0
+     */
+    public function markExactIdMatch(SearchResultType $type);
 
-	/**
-	 * @param SearchResultType $type
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasExactIdMatch(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasExactIdMatch(SearchResultType $type);
 
-	/**
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function asArray();
+    /**
+     * @return array
+     * @since 13.0.0
+     */
+    public function asArray();
 }

lib/private/Repair/Owncloud/SaveAccountsTableData.php

Indentation +132 added lines, -132 removed lines

@@ -38,137 +38,137 @@
  */
 class SaveAccountsTableData implements IRepairStep {
 
-	const BATCH_SIZE = 75;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db, IConfig $config) {
-		$this->db = $db;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Copy data from accounts table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
-
-		$offset = 0;
-		$numUsers = $this->runStep($offset);
-
-		while ($numUsers === self::BATCH_SIZE) {
-			$offset += $numUsers;
-			$numUsers = $this->runStep($offset);
-		}
-
-		// Remove the table
-		$this->db->dropTable('accounts');
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function shouldRun() {
-		$schema = $this->db->createSchema();
-
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
-		if (!$schema->hasTable($tableName)) {
-			return false;
-		}
-
-		$table = $schema->getTable($tableName);
-		return $table->hasColumn('user_id');
-	}
-
-	/**
-	 * @param int $offset
-	 * @return int Number of copied users
-	 */
-	protected function runStep($offset) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('accounts')
-			->orderBy('id')
-			->setMaxResults(self::BATCH_SIZE);
-
-		if ($offset > 0) {
-			$query->setFirstResult($offset);
-		}
-
-		$result = $query->execute();
-
-		$update = $this->db->getQueryBuilder();
-		$update->update('users')
-			->set('displayname', $update->createParameter('displayname'))
-			->where($update->expr()->eq('uid', $update->createParameter('userid')));
-
-		$updatedUsers = 0;
-		while ($row = $result->fetch()) {
-			try {
-				$this->migrateUserInfo($update, $row);
-			} catch (PreConditionNotMetException $e) {
-				// Ignore and continue
-			} catch (\UnexpectedValueException $e) {
-				// Ignore and continue
-			}
-			$updatedUsers++;
-		}
-		$result->closeCursor();
-
-		return $updatedUsers;
-	}
-
-	/**
-	 * @param IQueryBuilder $update
-	 * @param array $userdata
-	 * @throws PreConditionNotMetException
-	 * @throws \UnexpectedValueException
-	 */
-	protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
-		$state = (int) $userdata['state'];
-		if ($state === 3) {
-			// Deleted user, ignore
-			return;
-		}
-
-		if ($userdata['email'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
-		}
-		if ($userdata['quota'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
-		}
-		if ($userdata['last_login'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
-		}
-		if ($state === 1) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
-		} else if ($state === 2) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
-		}
-
-		if ($userdata['display_name'] !== null) {
-			$update->setParameter('displayname', $userdata['display_name'])
-				->setParameter('userid', $userdata['user_id']);
-			$update->execute();
-		}
-
-	}
+    const BATCH_SIZE = 75;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db, IConfig $config) {
+        $this->db = $db;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Copy data from accounts table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
+
+        $offset = 0;
+        $numUsers = $this->runStep($offset);
+
+        while ($numUsers === self::BATCH_SIZE) {
+            $offset += $numUsers;
+            $numUsers = $this->runStep($offset);
+        }
+
+        // Remove the table
+        $this->db->dropTable('accounts');
+    }
+
+    /**
+     * @return bool
+     */
+    protected function shouldRun() {
+        $schema = $this->db->createSchema();
+
+        $tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
+        if (!$schema->hasTable($tableName)) {
+            return false;
+        }
+
+        $table = $schema->getTable($tableName);
+        return $table->hasColumn('user_id');
+    }
+
+    /**
+     * @param int $offset
+     * @return int Number of copied users
+     */
+    protected function runStep($offset) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('accounts')
+            ->orderBy('id')
+            ->setMaxResults(self::BATCH_SIZE);
+
+        if ($offset > 0) {
+            $query->setFirstResult($offset);
+        }
+
+        $result = $query->execute();
+
+        $update = $this->db->getQueryBuilder();
+        $update->update('users')
+            ->set('displayname', $update->createParameter('displayname'))
+            ->where($update->expr()->eq('uid', $update->createParameter('userid')));
+
+        $updatedUsers = 0;
+        while ($row = $result->fetch()) {
+            try {
+                $this->migrateUserInfo($update, $row);
+            } catch (PreConditionNotMetException $e) {
+                // Ignore and continue
+            } catch (\UnexpectedValueException $e) {
+                // Ignore and continue
+            }
+            $updatedUsers++;
+        }
+        $result->closeCursor();
+
+        return $updatedUsers;
+    }
+
+    /**
+     * @param IQueryBuilder $update
+     * @param array $userdata
+     * @throws PreConditionNotMetException
+     * @throws \UnexpectedValueException
+     */
+    protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
+        $state = (int) $userdata['state'];
+        if ($state === 3) {
+            // Deleted user, ignore
+            return;
+        }
+
+        if ($userdata['email'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
+        }
+        if ($userdata['quota'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
+        }
+        if ($userdata['last_login'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
+        }
+        if ($state === 1) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
+        } else if ($state === 2) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
+        }
+
+        if ($userdata['display_name'] !== null) {
+            $update->setParameter('displayname', $userdata['display_name'])
+                ->setParameter('userid', $userdata['user_id']);
+            $update->execute();
+        }
+
+    }
 }
 

apps/files_trashbin/lib/Events/MoveToTrashEvent.php

Indentation +30 added lines, -30 removed lines

@@ -35,39 +35,39 @@
  */
 class MoveToTrashEvent extends Event {
 
-	/** @var bool */
-	private $moveToTrashBin;
+    /** @var bool */
+    private $moveToTrashBin;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	public function __construct(Node $node) {
-		$this->moveToTrashBin = true;
-		$this->node = $node;
-	}
+    public function __construct(Node $node) {
+        $this->moveToTrashBin = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node which will be deleted
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node which will be deleted
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable trash bin for this operation
-	 */
-	public function disableTrashBin() {
-		$this->moveToTrashBin = false;
-	}
+    /**
+     * disable trash bin for this operation
+     */
+    public function disableTrashBin() {
+        $this->moveToTrashBin = false;
+    }
 
-	/**
-	 * should the file be moved to the trash bin?
-	 *
-	 * @return bool
-	 */
-	public function shouldMoveToTrashBin() {
-		return $this->moveToTrashBin;
-	}
+    /**
+     * should the file be moved to the trash bin?
+     *
+     * @return bool
+     */
+    public function shouldMoveToTrashBin() {
+        return $this->moveToTrashBin;
+    }
 }

apps/files_versions/lib/Events/CreateVersionEvent.php

Indentation +35 added lines, -35 removed lines

@@ -37,45 +37,45 @@
 class CreateVersionEvent extends Event {
 
 
-	/** @var bool */
-	private $createVersion;
+    /** @var bool */
+    private $createVersion;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	/**
-	 * CreateVersionEvent constructor.
-	 *
-	 * @param Node $node
-	 */
-	public function __construct(Node $node) {
-		$this->createVersion = true;
-		$this->node = $node;
-	}
+    /**
+     * CreateVersionEvent constructor.
+     *
+     * @param Node $node
+     */
+    public function __construct(Node $node) {
+        $this->createVersion = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node of the file which should be versioned
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node of the file which should be versioned
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable versions for this file
-	 */
-	public function disableVersions() {
-		$this->createVersion = false;
-	}
+    /**
+     * disable versions for this file
+     */
+    public function disableVersions() {
+        $this->createVersion = false;
+    }
 
-	/**
-	 * should a version be created for this file?
-	 *
-	 * @return bool
-	 */
-	public function shouldCreateVersion() {
-		return $this->createVersion;
-	}
+    /**
+     * should a version be created for this file?
+     *
+     * @return bool
+     */
+    public function shouldCreateVersion() {
+        return $this->createVersion;
+    }
 
 }

apps/files_trashbin/appinfo/app.php

Indentation +9 added lines, -9 removed lines

@@ -29,13 +29,13 @@
 \OCA\Files_Trashbin\Trashbin::registerHooks();
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('files_trashbin');
-	return [
-		'id' => 'trashbin',
-		'appname' => 'files_trashbin',
-		'script' => 'list.php',
-		'order' => 50,
-		'name' => $l->t('Deleted files'),
-		'classes' => 'pinned',
-	];
+    $l = \OC::$server->getL10N('files_trashbin');
+    return [
+        'id' => 'trashbin',
+        'appname' => 'files_trashbin',
+        'script' => 'list.php',
+        'order' => 50,
+        'name' => $l->t('Deleted files'),
+        'classes' => 'pinned',
+    ];
 });

lib/private/Template/ResourceLocator.php

Indentation +169 added lines, -169 removed lines

@@ -27,173 +27,173 @@
 namespace OC\Template;
 
 abstract class ResourceLocator {
-	protected $theme;
-
-	protected $mapping;
-	protected $serverroot;
-	protected $thirdpartyroot;
-	protected $webroot;
-
-	protected $resources = array();
-
-	/** @var \OCP\ILogger */
-	protected $logger;
-
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param string $theme
-	 * @param array $core_map
-	 * @param array $party_map
-	 */
-	public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map) {
-		$this->logger = $logger;
-		$this->theme = $theme;
-		$this->mapping = $core_map + $party_map;
-		$this->serverroot = key($core_map);
-		$this->thirdpartyroot = key($party_map);
-		$this->webroot = $this->mapping[$this->serverroot];
-	}
-
-	/**
-	 * @param string $resource
-	 */
-	abstract public function doFind($resource);
-
-	/**
-	 * @param string $resource
-	 */
-	abstract public function doFindTheme($resource);
-
-	/**
-	 * Finds the resources and adds them to the list
-	 *
-	 * @param array $resources
-	 */
-	public function find($resources) {
-		foreach ($resources as $resource) {
-			try {
-				$this->doFind($resource);
-			} catch (ResourceNotFoundException $e) {
-				$resourceApp = substr($resource, 0, strpos($resource, '/'));
-				$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
-			}
-		}
-		if (!empty($this->theme)) {
-			foreach ($resources as $resource) {
-				try {
-					$this->doFindTheme($resource);
-				} catch (ResourceNotFoundException $e) {
-					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * append the $file resource if exist at $root
-	 *
-	 * @param string $root path to check
-	 * @param string $file the filename
-	 * @param string|null $webRoot base for path, default map $root to $webRoot
-	 * @return bool True if the resource was found, false otherwise
-	 */
-	protected function appendIfExist($root, $file, $webRoot = null) {
-		if (is_file($root.'/'.$file)) {
-			$this->append($root, $file, $webRoot, false);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Attempt to find the webRoot
-	 *
-	 * traverse the potential web roots upwards in the path
-	 *
-	 * example:
-	 *   - root: /srv/www/apps/myapp
-	 *   - available mappings: ['/srv/www']
-	 *
-	 * First we check if a mapping for /srv/www/apps/myapp is available,
-	 * then /srv/www/apps, /srv/www/apps, /srv/www, ... until we find a
-	 * valid web root
-	 *
-	 * @param string $root
-	 * @return string|null The web root or null on failure
-	 */
-	protected function findWebRoot($root) {
-		$webRoot = null;
-		$tmpRoot = $root;
-
-		while ($webRoot === null) {
-			if (isset($this->mapping[$tmpRoot])) {
-				$webRoot = $this->mapping[$tmpRoot];
-				break;
-			}
-
-			if ($tmpRoot === '/') {
-				break;
-			}
-
-			$tmpRoot = dirname($tmpRoot);
-		}
-
-		if ($webRoot === null) {
-			$realpath = realpath($root);
-
-			if ($realpath && ($realpath !== $root)) {
-				return $this->findWebRoot($realpath);
-			}
-		}
-
-		return $webRoot;
-	}
-
-	/**
-	 * append the $file resource at $root
-	 *
-	 * @param string $root path to check
-	 * @param string $file the filename
-	 * @param string|null $webRoot base for path, default map $root to $webRoot
-	 * @param bool $throw Throw an exception, when the route does not exist
-	 * @throws ResourceNotFoundException Only thrown when $throw is true and the resource is missing
-	 */
-	protected function append($root, $file, $webRoot = null, $throw = true) {
-
-		if (!is_string($root)) {
-			if ($throw) {
-				throw new ResourceNotFoundException($file, $webRoot);
-			}
-			return;
-		}
-
-		if (!$webRoot) {
-			$webRoot = $this->findWebRoot($root);
-
-			if ($webRoot === null) {
-				$webRoot = '';
-				$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
-					'app' => 'lib',
-					'root' => $root,
-					'file' => $file,
-					'webRoot' => $webRoot,
-					'throw' => $throw ? 'true' : 'false'
-				]);
-			}
-		}
-		$this->resources[] = array($root, $webRoot, $file);
-
-		if ($throw && !is_file($root . '/' . $file)) {
-			throw new ResourceNotFoundException($file, $webRoot);
-		}
-	}
-
-	/**
-	 * Returns the list of all resources that should be loaded
-	 * @return array
-	 */
-	public function getResources() {
-		return $this->resources;
-	}
+    protected $theme;
+
+    protected $mapping;
+    protected $serverroot;
+    protected $thirdpartyroot;
+    protected $webroot;
+
+    protected $resources = array();
+
+    /** @var \OCP\ILogger */
+    protected $logger;
+
+    /**
+     * @param \OCP\ILogger $logger
+     * @param string $theme
+     * @param array $core_map
+     * @param array $party_map
+     */
+    public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map) {
+        $this->logger = $logger;
+        $this->theme = $theme;
+        $this->mapping = $core_map + $party_map;
+        $this->serverroot = key($core_map);
+        $this->thirdpartyroot = key($party_map);
+        $this->webroot = $this->mapping[$this->serverroot];
+    }
+
+    /**
+     * @param string $resource
+     */
+    abstract public function doFind($resource);
+
+    /**
+     * @param string $resource
+     */
+    abstract public function doFindTheme($resource);
+
+    /**
+     * Finds the resources and adds them to the list
+     *
+     * @param array $resources
+     */
+    public function find($resources) {
+        foreach ($resources as $resource) {
+            try {
+                $this->doFind($resource);
+            } catch (ResourceNotFoundException $e) {
+                $resourceApp = substr($resource, 0, strpos($resource, '/'));
+                $this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+            }
+        }
+        if (!empty($this->theme)) {
+            foreach ($resources as $resource) {
+                try {
+                    $this->doFindTheme($resource);
+                } catch (ResourceNotFoundException $e) {
+                    $resourceApp = substr($resource, 0, strpos($resource, '/'));
+                    $this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+                }
+            }
+        }
+    }
+
+    /**
+     * append the $file resource if exist at $root
+     *
+     * @param string $root path to check
+     * @param string $file the filename
+     * @param string|null $webRoot base for path, default map $root to $webRoot
+     * @return bool True if the resource was found, false otherwise
+     */
+    protected function appendIfExist($root, $file, $webRoot = null) {
+        if (is_file($root.'/'.$file)) {
+            $this->append($root, $file, $webRoot, false);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Attempt to find the webRoot
+     *
+     * traverse the potential web roots upwards in the path
+     *
+     * example:
+     *   - root: /srv/www/apps/myapp
+     *   - available mappings: ['/srv/www']
+     *
+     * First we check if a mapping for /srv/www/apps/myapp is available,
+     * then /srv/www/apps, /srv/www/apps, /srv/www, ... until we find a
+     * valid web root
+     *
+     * @param string $root
+     * @return string|null The web root or null on failure
+     */
+    protected function findWebRoot($root) {
+        $webRoot = null;
+        $tmpRoot = $root;
+
+        while ($webRoot === null) {
+            if (isset($this->mapping[$tmpRoot])) {
+                $webRoot = $this->mapping[$tmpRoot];
+                break;
+            }
+
+            if ($tmpRoot === '/') {
+                break;
+            }
+
+            $tmpRoot = dirname($tmpRoot);
+        }
+
+        if ($webRoot === null) {
+            $realpath = realpath($root);
+
+            if ($realpath && ($realpath !== $root)) {
+                return $this->findWebRoot($realpath);
+            }
+        }
+
+        return $webRoot;
+    }
+
+    /**
+     * append the $file resource at $root
+     *
+     * @param string $root path to check
+     * @param string $file the filename
+     * @param string|null $webRoot base for path, default map $root to $webRoot
+     * @param bool $throw Throw an exception, when the route does not exist
+     * @throws ResourceNotFoundException Only thrown when $throw is true and the resource is missing
+     */
+    protected function append($root, $file, $webRoot = null, $throw = true) {
+
+        if (!is_string($root)) {
+            if ($throw) {
+                throw new ResourceNotFoundException($file, $webRoot);
+            }
+            return;
+        }
+
+        if (!$webRoot) {
+            $webRoot = $this->findWebRoot($root);
+
+            if ($webRoot === null) {
+                $webRoot = '';
+                $this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
+                    'app' => 'lib',
+                    'root' => $root,
+                    'file' => $file,
+                    'webRoot' => $webRoot,
+                    'throw' => $throw ? 'true' : 'false'
+                ]);
+            }
+        }
+        $this->resources[] = array($root, $webRoot, $file);
+
+        if ($throw && !is_file($root . '/' . $file)) {
+            throw new ResourceNotFoundException($file, $webRoot);
+        }
+    }
+
+    /**
+     * Returns the list of all resources that should be loaded
+     * @return array
+     */
+    public function getResources() {
+        return $this->resources;
+    }
 }

lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php

Indentation +72 added lines, -72 removed lines

@@ -31,76 +31,76 @@
 
 class SameSiteCookieMiddleware extends Middleware {
 
-	/** @var Request */
-	private $request;
-
-	/** @var ControllerMethodReflector */
-	private $reflector;
-
-	public function __construct(Request $request,
-								ControllerMethodReflector $reflector) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-	}
-
-	public function beforeController($controller, $methodName) {
-		$requestUri = $this->request->getScriptName();
-		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript)-1];
-
-		if ($processingScript !== 'index.php') {
-			return;
-		}
-
-		$noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
-		if ($noSSC) {
-			return;
-		}
-
-		if (!$this->request->passesLaxCookieCheck()) {
-			throw new LaxSameSiteCookieFailedException();
-		}
-	}
-
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof LaxSameSiteCookieFailedException) {
-			$respone = new Response();
-			$respone->setStatus(Http::STATUS_FOUND);
-			$respone->addHeader('Location', $this->request->getRequestUri());
-
-			$this->setSameSiteCookie();
-
-			return $respone;
-		}
-
-		throw $exception;
-	}
-
-	protected function setSameSiteCookie() {
-		$cookieParams = $this->request->getCookieParams();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
+    /** @var Request */
+    private $request;
+
+    /** @var ControllerMethodReflector */
+    private $reflector;
+
+    public function __construct(Request $request,
+                                ControllerMethodReflector $reflector) {
+        $this->request = $request;
+        $this->reflector = $reflector;
+    }
+
+    public function beforeController($controller, $methodName) {
+        $requestUri = $this->request->getScriptName();
+        $processingScript = explode('/', $requestUri);
+        $processingScript = $processingScript[count($processingScript)-1];
+
+        if ($processingScript !== 'index.php') {
+            return;
+        }
+
+        $noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
+        if ($noSSC) {
+            return;
+        }
+
+        if (!$this->request->passesLaxCookieCheck()) {
+            throw new LaxSameSiteCookieFailedException();
+        }
+    }
+
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof LaxSameSiteCookieFailedException) {
+            $respone = new Response();
+            $respone->setStatus(Http::STATUS_FOUND);
+            $respone->addHeader('Location', $this->request->getRequestUri());
+
+            $this->setSameSiteCookie();
+
+            return $respone;
+        }
+
+        throw $exception;
+    }
+
+    protected function setSameSiteCookie() {
+        $cookieParams = $this->request->getCookieParams();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
 }

lib/private/AppFramework/Middleware/Security/Exceptions/LaxSameSiteCookieFailedException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class LaxSameSiteCookieFailedException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

apps/dav/lib/CardDAV/ContactsManager.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OCP\IURLGenerator;
 
 class ContactsManager {
-	/** @var CardDavBackend  */
-	private $backend;
+    /** @var CardDavBackend  */
+    private $backend;
 
-	/** @var IL10N  */
-	private $l10n;
+    /** @var IL10N  */
+    private $l10n;
 
-	/**
-	 * ContactsManager constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IL10N $l10n
-	 */
-	public function __construct(CardDavBackend $backend, IL10N $l10n) {
-		$this->backend = $backend;
-		$this->l10n = $l10n;
-	}
+    /**
+     * ContactsManager constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IL10N $l10n
+     */
+    public function __construct(CardDavBackend $backend, IL10N $l10n) {
+        $this->backend = $backend;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param string $userId
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
-		$this->register($cm, $addressBooks, $urlGenerator);
-		$this->setupSystemContactsProvider($cm, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param string $userId
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
+        $this->register($cm, $addressBooks, $urlGenerator);
+        $this->setupSystemContactsProvider($cm, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
-		$this->register($cm, $addressBooks, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
+        $this->register($cm, $addressBooks, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param $addressBooks
-	 * @param IURLGenerator $urlGenerator
-	 */
-	private function register(IManager $cm, $addressBooks, $urlGenerator) {
-		foreach ($addressBooks as $addressBookInfo) {
-			$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
-			$cm->registerAddressBook(
-				new AddressBookImpl(
-					$addressBook,
-					$addressBookInfo,
-					$this->backend,
-					$urlGenerator
-				)
-			);
-		}
-	}
+    /**
+     * @param IManager $cm
+     * @param $addressBooks
+     * @param IURLGenerator $urlGenerator
+     */
+    private function register(IManager $cm, $addressBooks, $urlGenerator) {
+        foreach ($addressBooks as $addressBookInfo) {
+            $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
+            $cm->registerAddressBook(
+                new AddressBookImpl(
+                    $addressBook,
+                    $addressBookInfo,
+                    $this->backend,
+                    $urlGenerator
+                )
+            );
+        }
+    }
 
 }