@@ -31,7 +31,7 @@ |
||
31 | 31 | * @package OC\AppFramework\Middleware\Security\Exceptions |
32 | 32 | */ |
33 | 33 | class NotConfirmedException extends SecurityException { |
34 | - public function __construct() { |
|
35 | - parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN); |
|
36 | - } |
|
34 | + public function __construct() { |
|
35 | + parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN); |
|
36 | + } |
|
37 | 37 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class CrossSiteRequestForgeryException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); |
|
39 | + } |
|
40 | 40 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class AppNotEnabledException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED); |
|
39 | + } |
|
40 | 40 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class NotLoggedInException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
39 | + } |
|
40 | 40 | } |
@@ -27,52 +27,52 @@ |
||
27 | 27 | |
28 | 28 | class V1Response extends BaseResponse { |
29 | 29 | |
30 | - /** |
|
31 | - * The V1 endpoint has very limited http status codes basically everything |
|
32 | - * is status 200 except 401 |
|
33 | - * |
|
34 | - * @return int |
|
35 | - */ |
|
36 | - public function getStatus() { |
|
37 | - $status = parent::getStatus(); |
|
38 | - if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) { |
|
39 | - return Http::STATUS_UNAUTHORIZED; |
|
40 | - } |
|
30 | + /** |
|
31 | + * The V1 endpoint has very limited http status codes basically everything |
|
32 | + * is status 200 except 401 |
|
33 | + * |
|
34 | + * @return int |
|
35 | + */ |
|
36 | + public function getStatus() { |
|
37 | + $status = parent::getStatus(); |
|
38 | + if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) { |
|
39 | + return Http::STATUS_UNAUTHORIZED; |
|
40 | + } |
|
41 | 41 | |
42 | - return Http::STATUS_OK; |
|
43 | - } |
|
42 | + return Http::STATUS_OK; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * In v1 all OK is 100 |
|
47 | - * |
|
48 | - * @return int |
|
49 | - */ |
|
50 | - public function getOCSStatus() { |
|
51 | - $status = parent::getOCSStatus(); |
|
45 | + /** |
|
46 | + * In v1 all OK is 100 |
|
47 | + * |
|
48 | + * @return int |
|
49 | + */ |
|
50 | + public function getOCSStatus() { |
|
51 | + $status = parent::getOCSStatus(); |
|
52 | 52 | |
53 | - if ($status === Http::STATUS_OK) { |
|
54 | - return 100; |
|
55 | - } |
|
53 | + if ($status === Http::STATUS_OK) { |
|
54 | + return 100; |
|
55 | + } |
|
56 | 56 | |
57 | - return $status; |
|
58 | - } |
|
57 | + return $status; |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Construct the meta part of the response |
|
62 | - * And then late the base class render |
|
63 | - * |
|
64 | - * @return string |
|
65 | - */ |
|
66 | - public function render() { |
|
67 | - $meta = [ |
|
68 | - 'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure', |
|
69 | - 'statuscode' => $this->getOCSStatus(), |
|
70 | - 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage, |
|
71 | - ]; |
|
60 | + /** |
|
61 | + * Construct the meta part of the response |
|
62 | + * And then late the base class render |
|
63 | + * |
|
64 | + * @return string |
|
65 | + */ |
|
66 | + public function render() { |
|
67 | + $meta = [ |
|
68 | + 'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure', |
|
69 | + 'statuscode' => $this->getOCSStatus(), |
|
70 | + 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage, |
|
71 | + ]; |
|
72 | 72 | |
73 | - $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : ''; |
|
74 | - $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: ''; |
|
73 | + $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : ''; |
|
74 | + $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: ''; |
|
75 | 75 | |
76 | - return $this->renderResult($meta); |
|
77 | - } |
|
76 | + return $this->renderResult($meta); |
|
77 | + } |
|
78 | 78 | } |
@@ -29,50 +29,50 @@ |
||
29 | 29 | |
30 | 30 | class FixMountStorages implements IRepairStep { |
31 | 31 | |
32 | - /** @var IDBConnection */ |
|
33 | - private $db; |
|
32 | + /** @var IDBConnection */ |
|
33 | + private $db; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param IDBConnection $db |
|
37 | - */ |
|
38 | - public function __construct(IDBConnection $db) { |
|
39 | - $this->db = $db; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @param IDBConnection $db |
|
37 | + */ |
|
38 | + public function __construct(IDBConnection $db) { |
|
39 | + $this->db = $db; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function getName() { |
|
46 | - return 'Fix potential broken mount points'; |
|
47 | - } |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function getName() { |
|
46 | + return 'Fix potential broken mount points'; |
|
47 | + } |
|
48 | 48 | |
49 | - public function run(IOutput $output) { |
|
50 | - $query = $this->db->getQueryBuilder(); |
|
51 | - $query->select('m.id', 'f.storage') |
|
52 | - ->from('mounts', 'm') |
|
53 | - ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) |
|
54 | - ->where($query->expr()->neq('m.storage_id', 'f.storage')); |
|
49 | + public function run(IOutput $output) { |
|
50 | + $query = $this->db->getQueryBuilder(); |
|
51 | + $query->select('m.id', 'f.storage') |
|
52 | + ->from('mounts', 'm') |
|
53 | + ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) |
|
54 | + ->where($query->expr()->neq('m.storage_id', 'f.storage')); |
|
55 | 55 | |
56 | - $update = $this->db->getQueryBuilder(); |
|
57 | - $update->update('mounts') |
|
58 | - ->set('storage_id', $update->createParameter('storage')) |
|
59 | - ->where($query->expr()->eq('id', $update->createParameter('mount'))); |
|
56 | + $update = $this->db->getQueryBuilder(); |
|
57 | + $update->update('mounts') |
|
58 | + ->set('storage_id', $update->createParameter('storage')) |
|
59 | + ->where($query->expr()->eq('id', $update->createParameter('mount'))); |
|
60 | 60 | |
61 | - $result = $query->execute(); |
|
62 | - $entriesUpdated = 0; |
|
63 | - while ($row = $result->fetch()) { |
|
64 | - $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) |
|
65 | - ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); |
|
66 | - $update->execute(); |
|
67 | - $entriesUpdated++; |
|
68 | - } |
|
69 | - $result->closeCursor(); |
|
61 | + $result = $query->execute(); |
|
62 | + $entriesUpdated = 0; |
|
63 | + while ($row = $result->fetch()) { |
|
64 | + $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) |
|
65 | + ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); |
|
66 | + $update->execute(); |
|
67 | + $entriesUpdated++; |
|
68 | + } |
|
69 | + $result->closeCursor(); |
|
70 | 70 | |
71 | - if ($entriesUpdated > 0) { |
|
72 | - $output->info($entriesUpdated . ' mounts updated'); |
|
73 | - return; |
|
74 | - } |
|
71 | + if ($entriesUpdated > 0) { |
|
72 | + $output->info($entriesUpdated . ' mounts updated'); |
|
73 | + return; |
|
74 | + } |
|
75 | 75 | |
76 | - $output->info('No mounts updated'); |
|
77 | - } |
|
76 | + $output->info('No mounts updated'); |
|
77 | + } |
|
78 | 78 | } |
@@ -36,66 +36,66 @@ |
||
36 | 36 | * altered in order to retrigger SQL schema generation through OCSqlitePlatform. |
37 | 37 | */ |
38 | 38 | class SqliteAutoincrement implements IRepairStep { |
39 | - /** |
|
40 | - * @var \OC\DB\Connection |
|
41 | - */ |
|
42 | - protected $connection; |
|
39 | + /** |
|
40 | + * @var \OC\DB\Connection |
|
41 | + */ |
|
42 | + protected $connection; |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param \OC\DB\Connection $connection |
|
46 | - */ |
|
47 | - public function __construct($connection) { |
|
48 | - $this->connection = $connection; |
|
49 | - } |
|
44 | + /** |
|
45 | + * @param \OC\DB\Connection $connection |
|
46 | + */ |
|
47 | + public function __construct($connection) { |
|
48 | + $this->connection = $connection; |
|
49 | + } |
|
50 | 50 | |
51 | - public function getName() { |
|
52 | - return 'Repair SQLite autoincrement'; |
|
53 | - } |
|
51 | + public function getName() { |
|
52 | + return 'Repair SQLite autoincrement'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Fix mime types |
|
57 | - */ |
|
58 | - public function run(IOutput $out) { |
|
59 | - if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) { |
|
60 | - return; |
|
61 | - } |
|
55 | + /** |
|
56 | + * Fix mime types |
|
57 | + */ |
|
58 | + public function run(IOutput $out) { |
|
59 | + if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) { |
|
60 | + return; |
|
61 | + } |
|
62 | 62 | |
63 | - $sourceSchema = $this->connection->getSchemaManager()->createSchema(); |
|
63 | + $sourceSchema = $this->connection->getSchemaManager()->createSchema(); |
|
64 | 64 | |
65 | - $schemaDiff = new SchemaDiff(); |
|
65 | + $schemaDiff = new SchemaDiff(); |
|
66 | 66 | |
67 | - foreach ($sourceSchema->getTables() as $tableSchema) { |
|
68 | - $primaryKey = $tableSchema->getPrimaryKey(); |
|
69 | - if (!$primaryKey) { |
|
70 | - continue; |
|
71 | - } |
|
67 | + foreach ($sourceSchema->getTables() as $tableSchema) { |
|
68 | + $primaryKey = $tableSchema->getPrimaryKey(); |
|
69 | + if (!$primaryKey) { |
|
70 | + continue; |
|
71 | + } |
|
72 | 72 | |
73 | - $columnNames = $primaryKey->getColumns(); |
|
73 | + $columnNames = $primaryKey->getColumns(); |
|
74 | 74 | |
75 | - // add a column diff for every primary key column, |
|
76 | - // but do not actually change anything, this will |
|
77 | - // force the generation of SQL statements to alter |
|
78 | - // those tables, which will then trigger the |
|
79 | - // specific SQL code from OCSqlitePlatform |
|
80 | - try { |
|
81 | - $tableDiff = new TableDiff($tableSchema->getName()); |
|
82 | - $tableDiff->fromTable = $tableSchema; |
|
83 | - foreach ($columnNames as $columnName) { |
|
84 | - $columnSchema = $tableSchema->getColumn($columnName); |
|
85 | - $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema); |
|
86 | - $tableDiff->changedColumns[] = $columnDiff; |
|
87 | - $schemaDiff->changedTables[] = $tableDiff; |
|
88 | - } |
|
89 | - } catch (SchemaException $e) { |
|
90 | - // ignore |
|
91 | - } |
|
92 | - } |
|
75 | + // add a column diff for every primary key column, |
|
76 | + // but do not actually change anything, this will |
|
77 | + // force the generation of SQL statements to alter |
|
78 | + // those tables, which will then trigger the |
|
79 | + // specific SQL code from OCSqlitePlatform |
|
80 | + try { |
|
81 | + $tableDiff = new TableDiff($tableSchema->getName()); |
|
82 | + $tableDiff->fromTable = $tableSchema; |
|
83 | + foreach ($columnNames as $columnName) { |
|
84 | + $columnSchema = $tableSchema->getColumn($columnName); |
|
85 | + $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema); |
|
86 | + $tableDiff->changedColumns[] = $columnDiff; |
|
87 | + $schemaDiff->changedTables[] = $tableDiff; |
|
88 | + } |
|
89 | + } catch (SchemaException $e) { |
|
90 | + // ignore |
|
91 | + } |
|
92 | + } |
|
93 | 93 | |
94 | - $this->connection->beginTransaction(); |
|
95 | - foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) { |
|
96 | - $this->connection->query($sql); |
|
97 | - } |
|
98 | - $this->connection->commit(); |
|
99 | - } |
|
94 | + $this->connection->beginTransaction(); |
|
95 | + foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) { |
|
96 | + $this->connection->query($sql); |
|
97 | + } |
|
98 | + $this->connection->commit(); |
|
99 | + } |
|
100 | 100 | } |
101 | 101 |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\IQueryFunction; |
26 | 26 | |
27 | 27 | class QueryFunction implements IQueryFunction { |
28 | - /** @var string */ |
|
29 | - protected $function; |
|
28 | + /** @var string */ |
|
29 | + protected $function; |
|
30 | 30 | |
31 | - public function __construct($function) { |
|
32 | - $this->function = $function; |
|
33 | - } |
|
31 | + public function __construct($function) { |
|
32 | + $this->function = $function; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->function; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->function; |
|
40 | + } |
|
41 | 41 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\IParameter; |
26 | 26 | |
27 | 27 | class Parameter implements IParameter { |
28 | - /** @var mixed */ |
|
29 | - protected $name; |
|
28 | + /** @var mixed */ |
|
29 | + protected $name; |
|
30 | 30 | |
31 | - public function __construct($name) { |
|
32 | - $this->name = $name; |
|
33 | - } |
|
31 | + public function __construct($name) { |
|
32 | + $this->name = $name; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->name; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->name; |
|
40 | + } |
|
41 | 41 | } |