@@ -26,27 +26,27 @@ |
||
26 | 26 | use OCP\Files\Notify\IRenameChange; |
27 | 27 | |
28 | 28 | class RenameChange extends Change implements IRenameChange { |
29 | - /** @var string */ |
|
30 | - private $targetPath; |
|
29 | + /** @var string */ |
|
30 | + private $targetPath; |
|
31 | 31 | |
32 | - /** |
|
33 | - * Change constructor. |
|
34 | - * |
|
35 | - * @param int $type |
|
36 | - * @param string $path |
|
37 | - * @param string $targetPath |
|
38 | - */ |
|
39 | - public function __construct($type, $path, $targetPath) { |
|
40 | - parent::__construct($type, $path); |
|
41 | - $this->targetPath = $targetPath; |
|
42 | - } |
|
32 | + /** |
|
33 | + * Change constructor. |
|
34 | + * |
|
35 | + * @param int $type |
|
36 | + * @param string $path |
|
37 | + * @param string $targetPath |
|
38 | + */ |
|
39 | + public function __construct($type, $path, $targetPath) { |
|
40 | + parent::__construct($type, $path); |
|
41 | + $this->targetPath = $targetPath; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * Get the new path of the renamed file relative to the storage root |
|
46 | - * |
|
47 | - * @return string |
|
48 | - */ |
|
49 | - public function getTargetPath() { |
|
50 | - return $this->targetPath; |
|
51 | - } |
|
44 | + /** |
|
45 | + * Get the new path of the renamed file relative to the storage root |
|
46 | + * |
|
47 | + * @return string |
|
48 | + */ |
|
49 | + public function getTargetPath() { |
|
50 | + return $this->targetPath; |
|
51 | + } |
|
52 | 52 | } |
@@ -26,40 +26,40 @@ |
||
26 | 26 | use OCP\Files\Notify\IChange; |
27 | 27 | |
28 | 28 | class Change implements IChange { |
29 | - /** @var int */ |
|
30 | - private $type; |
|
29 | + /** @var int */ |
|
30 | + private $type; |
|
31 | 31 | |
32 | - /** @var string */ |
|
33 | - private $path; |
|
32 | + /** @var string */ |
|
33 | + private $path; |
|
34 | 34 | |
35 | - /** |
|
36 | - * Change constructor. |
|
37 | - * |
|
38 | - * @param int $type |
|
39 | - * @param string $path |
|
40 | - */ |
|
41 | - public function __construct($type, $path) { |
|
42 | - $this->type = $type; |
|
43 | - $this->path = $path; |
|
44 | - } |
|
35 | + /** |
|
36 | + * Change constructor. |
|
37 | + * |
|
38 | + * @param int $type |
|
39 | + * @param string $path |
|
40 | + */ |
|
41 | + public function __construct($type, $path) { |
|
42 | + $this->type = $type; |
|
43 | + $this->path = $path; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Get the type of the change |
|
48 | - * |
|
49 | - * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED |
|
50 | - */ |
|
51 | - public function getType() { |
|
52 | - return $this->type; |
|
53 | - } |
|
46 | + /** |
|
47 | + * Get the type of the change |
|
48 | + * |
|
49 | + * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED |
|
50 | + */ |
|
51 | + public function getType() { |
|
52 | + return $this->type; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Get the path of the file that was changed relative to the root of the storage |
|
57 | - * |
|
58 | - * Note, for rename changes this path is the old path for the file |
|
59 | - * |
|
60 | - * @return mixed |
|
61 | - */ |
|
62 | - public function getPath() { |
|
63 | - return $this->path; |
|
64 | - } |
|
55 | + /** |
|
56 | + * Get the path of the file that was changed relative to the root of the storage |
|
57 | + * |
|
58 | + * Note, for rename changes this path is the old path for the file |
|
59 | + * |
|
60 | + * @return mixed |
|
61 | + */ |
|
62 | + public function getPath() { |
|
63 | + return $this->path; |
|
64 | + } |
|
65 | 65 | } |
@@ -67,7 +67,7 @@ |
||
67 | 67 | if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { |
68 | 68 | $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); |
69 | 69 | foreach ($folderContent as $subEntry) { |
70 | - $subTargetPath = $targetPath . '/' . $subEntry->getName(); |
|
70 | + $subTargetPath = $targetPath.'/'.$subEntry->getName(); |
|
71 | 71 | $this->copyFromCache($sourceCache, $subEntry, $subTargetPath); |
72 | 72 | } |
73 | 73 | } |
@@ -29,63 +29,63 @@ |
||
29 | 29 | * Fallback implementation for moveFromCache |
30 | 30 | */ |
31 | 31 | trait MoveFromCacheTrait { |
32 | - /** |
|
33 | - * store meta data for a file or folder |
|
34 | - * |
|
35 | - * @param string $file |
|
36 | - * @param array $data |
|
37 | - * |
|
38 | - * @return int file id |
|
39 | - * @throws \RuntimeException |
|
40 | - */ |
|
41 | - abstract public function put($file, array $data); |
|
32 | + /** |
|
33 | + * store meta data for a file or folder |
|
34 | + * |
|
35 | + * @param string $file |
|
36 | + * @param array $data |
|
37 | + * |
|
38 | + * @return int file id |
|
39 | + * @throws \RuntimeException |
|
40 | + */ |
|
41 | + abstract public function put($file, array $data); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Move a file or folder in the cache |
|
45 | - * |
|
46 | - * @param \OCP\Files\Cache\ICache $sourceCache |
|
47 | - * @param string $sourcePath |
|
48 | - * @param string $targetPath |
|
49 | - */ |
|
50 | - public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { |
|
51 | - $sourceEntry = $sourceCache->get($sourcePath); |
|
43 | + /** |
|
44 | + * Move a file or folder in the cache |
|
45 | + * |
|
46 | + * @param \OCP\Files\Cache\ICache $sourceCache |
|
47 | + * @param string $sourcePath |
|
48 | + * @param string $targetPath |
|
49 | + */ |
|
50 | + public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { |
|
51 | + $sourceEntry = $sourceCache->get($sourcePath); |
|
52 | 52 | |
53 | - $this->copyFromCache($sourceCache, $sourceEntry, $targetPath); |
|
53 | + $this->copyFromCache($sourceCache, $sourceEntry, $targetPath); |
|
54 | 54 | |
55 | - $sourceCache->remove($sourcePath); |
|
56 | - } |
|
55 | + $sourceCache->remove($sourcePath); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * Copy a file or folder in the cache |
|
60 | - * |
|
61 | - * @param \OCP\Files\Cache\ICache $sourceCache |
|
62 | - * @param ICacheEntry $sourceEntry |
|
63 | - * @param string $targetPath |
|
64 | - */ |
|
65 | - public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) { |
|
66 | - $this->put($targetPath, $this->cacheEntryToArray($sourceEntry)); |
|
67 | - if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { |
|
68 | - $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); |
|
69 | - foreach ($folderContent as $subEntry) { |
|
70 | - $subTargetPath = $targetPath . '/' . $subEntry->getName(); |
|
71 | - $this->copyFromCache($sourceCache, $subEntry, $subTargetPath); |
|
72 | - } |
|
73 | - } |
|
74 | - } |
|
58 | + /** |
|
59 | + * Copy a file or folder in the cache |
|
60 | + * |
|
61 | + * @param \OCP\Files\Cache\ICache $sourceCache |
|
62 | + * @param ICacheEntry $sourceEntry |
|
63 | + * @param string $targetPath |
|
64 | + */ |
|
65 | + public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) { |
|
66 | + $this->put($targetPath, $this->cacheEntryToArray($sourceEntry)); |
|
67 | + if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { |
|
68 | + $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); |
|
69 | + foreach ($folderContent as $subEntry) { |
|
70 | + $subTargetPath = $targetPath . '/' . $subEntry->getName(); |
|
71 | + $this->copyFromCache($sourceCache, $subEntry, $subTargetPath); |
|
72 | + } |
|
73 | + } |
|
74 | + } |
|
75 | 75 | |
76 | - private function cacheEntryToArray(ICacheEntry $entry) { |
|
77 | - return [ |
|
78 | - 'size' => $entry->getSize(), |
|
79 | - 'mtime' => $entry->getMTime(), |
|
80 | - 'storage_mtime' => $entry->getStorageMTime(), |
|
81 | - 'mimetype' => $entry->getMimeType(), |
|
82 | - 'mimepart' => $entry->getMimePart(), |
|
83 | - 'etag' => $entry->getEtag(), |
|
84 | - 'permissions' => $entry->getPermissions(), |
|
85 | - 'encrypted' => $entry->isEncrypted(), |
|
86 | - 'creation_time' => $entry->getCreationTime(), |
|
87 | - 'upload_time' => $entry->getUploadTime(), |
|
88 | - 'metadata_etag' => $entry->getMetadataEtag(), |
|
89 | - ]; |
|
90 | - } |
|
76 | + private function cacheEntryToArray(ICacheEntry $entry) { |
|
77 | + return [ |
|
78 | + 'size' => $entry->getSize(), |
|
79 | + 'mtime' => $entry->getMTime(), |
|
80 | + 'storage_mtime' => $entry->getStorageMTime(), |
|
81 | + 'mimetype' => $entry->getMimeType(), |
|
82 | + 'mimepart' => $entry->getMimePart(), |
|
83 | + 'etag' => $entry->getEtag(), |
|
84 | + 'permissions' => $entry->getPermissions(), |
|
85 | + 'encrypted' => $entry->isEncrypted(), |
|
86 | + 'creation_time' => $entry->getCreationTime(), |
|
87 | + 'upload_time' => $entry->getUploadTime(), |
|
88 | + 'metadata_etag' => $entry->getMetadataEtag(), |
|
89 | + ]; |
|
90 | + } |
|
91 | 91 | } |
@@ -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 | } |
@@ -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 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $result->closeCursor(); |
70 | 70 | |
71 | 71 | if ($entriesUpdated > 0) { |
72 | - $output->info($entriesUpdated . ' mounts updated'); |
|
72 | + $output->info($entriesUpdated.' mounts updated'); |
|
73 | 73 | return; |
74 | 74 | } |
75 | 75 |
@@ -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 |