nextcloud / server

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

Indentation +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class NotConfirmedException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN);
+    }
 }

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class CrossSiteRequestForgeryException extends SecurityException {
-	public function __construct() {
-		parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class AppNotEnabledException extends SecurityException {
-	public function __construct() {
-		parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class NotLoggedInException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
-	}
+    public function __construct() {
+        parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
+    }
 }

lib/private/AppFramework/OCS/V1Response.php

Indentation +41 added lines, -41 removed lines

@@ -27,52 +27,52 @@
 
 class V1Response extends BaseResponse {
 
-	/**
-	 * The V1 endpoint has very limited http status codes basically everything
-	 * is status 200 except 401
-	 *
-	 * @return int
-	 */
-	public function getStatus() {
-		$status  = parent::getStatus();
-		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
-			return Http::STATUS_UNAUTHORIZED;
-		}
+    /**
+     * The V1 endpoint has very limited http status codes basically everything
+     * is status 200 except 401
+     *
+     * @return int
+     */
+    public function getStatus() {
+        $status  = parent::getStatus();
+        if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
+            return Http::STATUS_UNAUTHORIZED;
+        }
 
-		return Http::STATUS_OK;
-	}
+        return Http::STATUS_OK;
+    }
 
-	/**
-	 * In v1 all OK is 100
-	 *
-	 * @return int
-	 */
-	public function getOCSStatus() {
-		$status = parent::getOCSStatus();
+    /**
+     * In v1 all OK is 100
+     *
+     * @return int
+     */
+    public function getOCSStatus() {
+        $status = parent::getOCSStatus();
 
-		if ($status === Http::STATUS_OK) {
-			return 100;
-		}
+        if ($status === Http::STATUS_OK) {
+            return 100;
+        }
 
-		return $status;
-	}
+        return $status;
+    }
 
-	/**
-	 * Construct the meta part of the response
-	 * And then late the base class render
-	 *
-	 * @return string
-	 */
-	public function render() {
-		$meta = [
-			'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
-			'statuscode' => $this->getOCSStatus(),
-			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
-		];
+    /**
+     * Construct the meta part of the response
+     * And then late the base class render
+     *
+     * @return string
+     */
+    public function render() {
+        $meta = [
+            'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
+            'statuscode' => $this->getOCSStatus(),
+            'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
+        ];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+        $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
+        $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
 
-		return $this->renderResult($meta);
-	}
+        return $this->renderResult($meta);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return int
 	 */
 	public function getStatus() {
-		$status  = parent::getStatus();
+		$status = parent::getStatus();
 		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
 			return Http::STATUS_UNAUTHORIZED;
 		}
@@ -70,8 +70,8 @@ 
 			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
 		];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+		$meta['totalitems'] = $this->itemsCount !== null ? (string) $this->itemsCount : '';
+		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string) $this->itemsPerPage : '';
 
 		return $this->renderResult($meta);
 	}

lib/private/Repair/NC11/FixMountStorages.php

Indentation +39 added lines, -39 removed lines

@@ -29,50 +29,50 @@
 
 class FixMountStorages implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Fix potential broken mount points';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Fix potential broken mount points';
+    }
 
-	public function run(IOutput $output) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('m.id', 'f.storage')
-			->from('mounts', 'm')
-			->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
-			->where($query->expr()->neq('m.storage_id', 'f.storage'));
+    public function run(IOutput $output) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('m.id', 'f.storage')
+            ->from('mounts', 'm')
+            ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($query->expr()->neq('m.storage_id', 'f.storage'));
 
-		$update = $this->db->getQueryBuilder();
-		$update->update('mounts')
-			->set('storage_id', $update->createParameter('storage'))
-			->where($query->expr()->eq('id', $update->createParameter('mount')));
+        $update = $this->db->getQueryBuilder();
+        $update->update('mounts')
+            ->set('storage_id', $update->createParameter('storage'))
+            ->where($query->expr()->eq('id', $update->createParameter('mount')));
 
-		$result = $query->execute();
-		$entriesUpdated = 0;
-		while ($row = $result->fetch()) {
-			$update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
-				->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
-			$update->execute();
-			$entriesUpdated++;
-		}
-		$result->closeCursor();
+        $result = $query->execute();
+        $entriesUpdated = 0;
+        while ($row = $result->fetch()) {
+            $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
+                ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
+            $update->execute();
+            $entriesUpdated++;
+        }
+        $result->closeCursor();
 
-		if ($entriesUpdated > 0) {
-			$output->info($entriesUpdated . ' mounts updated');
-			return;
-		}
+        if ($entriesUpdated > 0) {
+            $output->info($entriesUpdated . ' mounts updated');
+            return;
+        }
 
-		$output->info('No mounts updated');
-	}
+        $output->info('No mounts updated');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 		$result->closeCursor();
 
 		if ($entriesUpdated > 0) {
-			$output->info($entriesUpdated . ' mounts updated');
+			$output->info($entriesUpdated.' mounts updated');
 			return;
 		}
 

lib/private/Repair/SqliteAutoincrement.php

Indentation +52 added lines, -52 removed lines

@@ -36,66 +36,66 @@
  * altered in order to retrigger SQL schema generation through OCSqlitePlatform.
  */
 class SqliteAutoincrement implements IRepairStep {
-	/**
-	 * @var \OC\DB\Connection
-	 */
-	protected $connection;
+    /**
+     * @var \OC\DB\Connection
+     */
+    protected $connection;
 
-	/**
-	 * @param \OC\DB\Connection $connection
-	 */
-	public function __construct($connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param \OC\DB\Connection $connection
+     */
+    public function __construct($connection) {
+        $this->connection = $connection;
+    }
 
-	public function getName() {
-		return 'Repair SQLite autoincrement';
-	}
+    public function getName() {
+        return 'Repair SQLite autoincrement';
+    }
 
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-		if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return;
-		}
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return;
+        }
 
-		$sourceSchema = $this->connection->getSchemaManager()->createSchema();
+        $sourceSchema = $this->connection->getSchemaManager()->createSchema();
 
-		$schemaDiff = new SchemaDiff();
+        $schemaDiff = new SchemaDiff();
 
-		foreach ($sourceSchema->getTables() as $tableSchema) {
-			$primaryKey = $tableSchema->getPrimaryKey();
-			if (!$primaryKey) {
-				continue;
-			}
+        foreach ($sourceSchema->getTables() as $tableSchema) {
+            $primaryKey = $tableSchema->getPrimaryKey();
+            if (!$primaryKey) {
+                continue;
+            }
 
-			$columnNames = $primaryKey->getColumns();
+            $columnNames = $primaryKey->getColumns();
 
-			// add a column diff for every primary key column,
-			// but do not actually change anything, this will
-			// force the generation of SQL statements to alter
-			// those tables, which will then trigger the
-			// specific SQL code from OCSqlitePlatform
-			try {
-				$tableDiff = new TableDiff($tableSchema->getName());
-				$tableDiff->fromTable = $tableSchema;
-				foreach ($columnNames as $columnName) {
-					$columnSchema = $tableSchema->getColumn($columnName);
-					$columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
-					$tableDiff->changedColumns[] = $columnDiff;
-					$schemaDiff->changedTables[] = $tableDiff;
-				}
-			} catch (SchemaException $e) {
-				// ignore
-			}
-		}
+            // add a column diff for every primary key column,
+            // but do not actually change anything, this will
+            // force the generation of SQL statements to alter
+            // those tables, which will then trigger the
+            // specific SQL code from OCSqlitePlatform
+            try {
+                $tableDiff = new TableDiff($tableSchema->getName());
+                $tableDiff->fromTable = $tableSchema;
+                foreach ($columnNames as $columnName) {
+                    $columnSchema = $tableSchema->getColumn($columnName);
+                    $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
+                    $tableDiff->changedColumns[] = $columnDiff;
+                    $schemaDiff->changedTables[] = $tableDiff;
+                }
+            } catch (SchemaException $e) {
+                // ignore
+            }
+        }
 
-		$this->connection->beginTransaction();
-		foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
-			$this->connection->query($sql);
-		}
-		$this->connection->commit();
-	}
+        $this->connection->beginTransaction();
+        foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
+            $this->connection->query($sql);
+        }
+        $this->connection->commit();
+    }
 }
 

lib/private/Repair/OldGroupMembershipShares.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		$result->closeCursor();
 
 		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+			$output->info('Removed '.$deletedEntries.' shares where user is not a member of the group anymore');
 		}
 	}
 

Indentation +85 added lines, -85 removed lines

@@ -32,89 +32,89 @@
 
 class OldGroupMembershipShares implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @var array [gid => [uid => (bool)]]
-	 */
-	protected $memberships;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of old group memberships';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 * @suppress SqlInjectionChecker
-	 */
-	public function run(IOutput $output) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
-				->andWhere($query->expr()->isNotNull('s2.id'))
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP)))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			if (!$this->isMember($row['group'], $row['user'])) {
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
-					->execute();
-			}
-		}
-		$result->closeCursor();
-
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
-		}
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $uid
-	 * @return bool
-	 */
-	protected function isMember($gid, $uid) {
-		if (isset($this->memberships[$gid][$uid])) {
-			return $this->memberships[$gid][$uid];
-		}
-
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
-		if (!isset($this->memberships[$gid])) {
-			$this->memberships[$gid] = [];
-		}
-		$this->memberships[$gid][$uid] = $isMember;
-
-		return $isMember;
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @var array [gid => [uid => (bool)]]
+     */
+    protected $memberships;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of old group memberships';
+    }
+
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     * @suppress SqlInjectionChecker
+     */
+    public function run(IOutput $output) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
+                ->andWhere($query->expr()->isNotNull('s2.id'))
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP)))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            if (!$this->isMember($row['group'], $row['user'])) {
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
+                    ->execute();
+            }
+        }
+        $result->closeCursor();
+
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+        }
+    }
+
+    /**
+     * @param string $gid
+     * @param string $uid
+     * @return bool
+     */
+    protected function isMember($gid, $uid) {
+        if (isset($this->memberships[$gid][$uid])) {
+            return $this->memberships[$gid][$uid];
+        }
+
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
+        if (!isset($this->memberships[$gid])) {
+            $this->memberships[$gid] = [];
+        }
+        $this->memberships[$gid][$uid] = $isMember;
+
+        return $isMember;
+    }
 }

lib/private/DB/AdapterOCI8.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		}
 		if ($table !== null) {
 			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
+			$table = '"'.$table.$suffix.'"';
 		}
 		return $this->conn->realLastInsertId($table);
 	}

Indentation +18 added lines, -18 removed lines

@@ -26,24 +26,24 @@
 namespace OC\DB;
 
 class AdapterOCI8 extends Adapter {
-	public function lastInsertId($table) {
-		if (is_null($table)) {
-			throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
-		}
-		if ($table !== null) {
-			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
-		}
-		return $this->conn->realLastInsertId($table);
-	}
+    public function lastInsertId($table) {
+        if (is_null($table)) {
+            throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
+        }
+        if ($table !== null) {
+            $suffix = '_SEQ';
+            $table = '"' . $table . $suffix . '"';
+        }
+        return $this->conn->realLastInsertId($table);
+    }
 
-	public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+    public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
 
-	public function fixupStatement($statement) {
-		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
-		return $statement;
-	}
+    public function fixupStatement($statement) {
+        $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
+        return $statement;
+    }
 }