@@ -31,75 +31,75 @@ |
||
31 | 31 | |
32 | 32 | class Version1002Date20170607113030 extends SimpleMigrationStep { |
33 | 33 | |
34 | - /** @var IDBConnection */ |
|
35 | - protected $connection; |
|
34 | + /** @var IDBConnection */ |
|
35 | + protected $connection; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @param IDBConnection $connection |
|
39 | - */ |
|
40 | - public function __construct(IDBConnection $connection) { |
|
41 | - $this->connection = $connection; |
|
42 | - } |
|
37 | + /** |
|
38 | + * @param IDBConnection $connection |
|
39 | + */ |
|
40 | + public function __construct(IDBConnection $connection) { |
|
41 | + $this->connection = $connection; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param IOutput $output |
|
46 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
47 | - * @param array $options |
|
48 | - * @since 13.0.0 |
|
49 | - */ |
|
50 | - public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
51 | - /** @var ISchemaWrapper $schema */ |
|
52 | - $schema = $schemaClosure(); |
|
44 | + /** |
|
45 | + * @param IOutput $output |
|
46 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
47 | + * @param array $options |
|
48 | + * @since 13.0.0 |
|
49 | + */ |
|
50 | + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
51 | + /** @var ISchemaWrapper $schema */ |
|
52 | + $schema = $schemaClosure(); |
|
53 | 53 | |
54 | - if (!$schema->hasTable('twofactor_backup_codes')) { |
|
55 | - // Legacy table does not exist |
|
56 | - return; |
|
57 | - } |
|
54 | + if (!$schema->hasTable('twofactor_backup_codes')) { |
|
55 | + // Legacy table does not exist |
|
56 | + return; |
|
57 | + } |
|
58 | 58 | |
59 | - $insert = $this->connection->getQueryBuilder(); |
|
60 | - $insert->insert('twofactor_backupcodes') |
|
61 | - ->values([ |
|
62 | - // Inserting with id might fail: 'id' => $insert->createParameter('id'), |
|
63 | - 'user_id' => $insert->createParameter('user_id'), |
|
64 | - 'code' => $insert->createParameter('code'), |
|
65 | - 'used' => $insert->createParameter('used'), |
|
66 | - ]); |
|
59 | + $insert = $this->connection->getQueryBuilder(); |
|
60 | + $insert->insert('twofactor_backupcodes') |
|
61 | + ->values([ |
|
62 | + // Inserting with id might fail: 'id' => $insert->createParameter('id'), |
|
63 | + 'user_id' => $insert->createParameter('user_id'), |
|
64 | + 'code' => $insert->createParameter('code'), |
|
65 | + 'used' => $insert->createParameter('used'), |
|
66 | + ]); |
|
67 | 67 | |
68 | - $query = $this->connection->getQueryBuilder(); |
|
69 | - $query->select('*') |
|
70 | - ->from('twofactor_backup_codes') |
|
71 | - ->orderBy('id', 'ASC'); |
|
72 | - $result = $query->execute(); |
|
68 | + $query = $this->connection->getQueryBuilder(); |
|
69 | + $query->select('*') |
|
70 | + ->from('twofactor_backup_codes') |
|
71 | + ->orderBy('id', 'ASC'); |
|
72 | + $result = $query->execute(); |
|
73 | 73 | |
74 | - $output->startProgress(); |
|
75 | - while ($row = $result->fetch()) { |
|
76 | - $output->advance(); |
|
74 | + $output->startProgress(); |
|
75 | + while ($row = $result->fetch()) { |
|
76 | + $output->advance(); |
|
77 | 77 | |
78 | - $insert |
|
79 | - // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) |
|
80 | - ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) |
|
81 | - ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) |
|
82 | - ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) |
|
83 | - ->execute(); |
|
84 | - } |
|
85 | - $output->finishProgress(); |
|
86 | - } |
|
78 | + $insert |
|
79 | + // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) |
|
80 | + ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) |
|
81 | + ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) |
|
82 | + ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) |
|
83 | + ->execute(); |
|
84 | + } |
|
85 | + $output->finishProgress(); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * @param IOutput $output |
|
90 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
91 | - * @param array $options |
|
92 | - * @return null|ISchemaWrapper |
|
93 | - * @since 13.0.0 |
|
94 | - */ |
|
95 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
96 | - /** @var ISchemaWrapper $schema */ |
|
97 | - $schema = $schemaClosure(); |
|
88 | + /** |
|
89 | + * @param IOutput $output |
|
90 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
91 | + * @param array $options |
|
92 | + * @return null|ISchemaWrapper |
|
93 | + * @since 13.0.0 |
|
94 | + */ |
|
95 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
96 | + /** @var ISchemaWrapper $schema */ |
|
97 | + $schema = $schemaClosure(); |
|
98 | 98 | |
99 | - if ($schema->hasTable('twofactor_backup_codes')) { |
|
100 | - $schema->dropTable('twofactor_backup_codes'); |
|
101 | - return $schema; |
|
102 | - } |
|
103 | - return null; |
|
104 | - } |
|
99 | + if ($schema->hasTable('twofactor_backup_codes')) { |
|
100 | + $schema->dropTable('twofactor_backup_codes'); |
|
101 | + return $schema; |
|
102 | + } |
|
103 | + return null; |
|
104 | + } |
|
105 | 105 | } |
@@ -33,80 +33,80 @@ |
||
33 | 33 | * Specialized version of Local storage for home directory usage |
34 | 34 | */ |
35 | 35 | class Home extends Local implements \OCP\Files\IHomeStorage { |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
39 | - protected $id; |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | + protected $id; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @var \OC\User\User $user |
|
43 | - */ |
|
44 | - protected $user; |
|
41 | + /** |
|
42 | + * @var \OC\User\User $user |
|
43 | + */ |
|
44 | + protected $user; |
|
45 | 45 | |
46 | - /** |
|
47 | - * Construct a Home storage instance |
|
48 | - * |
|
49 | - * @param array $arguments array with "user" containing the |
|
50 | - * storage owner |
|
51 | - */ |
|
52 | - public function __construct($arguments) { |
|
53 | - $this->user = $arguments['user']; |
|
54 | - $datadir = $this->user->getHome(); |
|
55 | - $this->id = 'home::' . $this->user->getUID(); |
|
46 | + /** |
|
47 | + * Construct a Home storage instance |
|
48 | + * |
|
49 | + * @param array $arguments array with "user" containing the |
|
50 | + * storage owner |
|
51 | + */ |
|
52 | + public function __construct($arguments) { |
|
53 | + $this->user = $arguments['user']; |
|
54 | + $datadir = $this->user->getHome(); |
|
55 | + $this->id = 'home::' . $this->user->getUID(); |
|
56 | 56 | |
57 | - parent::__construct(['datadir' => $datadir]); |
|
58 | - } |
|
57 | + parent::__construct(['datadir' => $datadir]); |
|
58 | + } |
|
59 | 59 | |
60 | - public function getId() { |
|
61 | - return $this->id; |
|
62 | - } |
|
60 | + public function getId() { |
|
61 | + return $this->id; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * @return \OC\Files\Cache\HomeCache |
|
66 | - */ |
|
67 | - public function getCache($path = '', $storage = null) { |
|
68 | - if (!$storage) { |
|
69 | - $storage = $this; |
|
70 | - } |
|
71 | - if (!isset($this->cache)) { |
|
72 | - $this->cache = new \OC\Files\Cache\HomeCache($storage); |
|
73 | - } |
|
74 | - return $this->cache; |
|
75 | - } |
|
64 | + /** |
|
65 | + * @return \OC\Files\Cache\HomeCache |
|
66 | + */ |
|
67 | + public function getCache($path = '', $storage = null) { |
|
68 | + if (!$storage) { |
|
69 | + $storage = $this; |
|
70 | + } |
|
71 | + if (!isset($this->cache)) { |
|
72 | + $this->cache = new \OC\Files\Cache\HomeCache($storage); |
|
73 | + } |
|
74 | + return $this->cache; |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * get a propagator instance for the cache |
|
79 | - * |
|
80 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
81 | - * @return \OC\Files\Cache\Propagator |
|
82 | - */ |
|
83 | - public function getPropagator($storage = null) { |
|
84 | - if (!$storage) { |
|
85 | - $storage = $this; |
|
86 | - } |
|
87 | - if (!isset($this->propagator)) { |
|
88 | - $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection()); |
|
89 | - } |
|
90 | - return $this->propagator; |
|
91 | - } |
|
77 | + /** |
|
78 | + * get a propagator instance for the cache |
|
79 | + * |
|
80 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
81 | + * @return \OC\Files\Cache\Propagator |
|
82 | + */ |
|
83 | + public function getPropagator($storage = null) { |
|
84 | + if (!$storage) { |
|
85 | + $storage = $this; |
|
86 | + } |
|
87 | + if (!isset($this->propagator)) { |
|
88 | + $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection()); |
|
89 | + } |
|
90 | + return $this->propagator; |
|
91 | + } |
|
92 | 92 | |
93 | 93 | |
94 | - /** |
|
95 | - * Returns the owner of this home storage |
|
96 | - * |
|
97 | - * @return \OC\User\User owner of this home storage |
|
98 | - */ |
|
99 | - public function getUser() { |
|
100 | - return $this->user; |
|
101 | - } |
|
94 | + /** |
|
95 | + * Returns the owner of this home storage |
|
96 | + * |
|
97 | + * @return \OC\User\User owner of this home storage |
|
98 | + */ |
|
99 | + public function getUser() { |
|
100 | + return $this->user; |
|
101 | + } |
|
102 | 102 | |
103 | - /** |
|
104 | - * get the owner of a path |
|
105 | - * |
|
106 | - * @param string $path The path to get the owner |
|
107 | - * @return string uid or false |
|
108 | - */ |
|
109 | - public function getOwner($path) { |
|
110 | - return $this->user->getUID(); |
|
111 | - } |
|
103 | + /** |
|
104 | + * get the owner of a path |
|
105 | + * |
|
106 | + * @param string $path The path to get the owner |
|
107 | + * @return string uid or false |
|
108 | + */ |
|
109 | + public function getOwner($path) { |
|
110 | + return $this->user->getUID(); |
|
111 | + } |
|
112 | 112 | } |
@@ -31,41 +31,41 @@ |
||
31 | 31 | * @since 7.0.0 |
32 | 32 | */ |
33 | 33 | interface IAppConfig { |
34 | - /** |
|
35 | - * check if a key is set in the appconfig |
|
36 | - * @param string $app |
|
37 | - * @param string $key |
|
38 | - * @return bool |
|
39 | - * @since 7.0.0 |
|
40 | - */ |
|
41 | - public function hasKey($app, $key); |
|
34 | + /** |
|
35 | + * check if a key is set in the appconfig |
|
36 | + * @param string $app |
|
37 | + * @param string $key |
|
38 | + * @return bool |
|
39 | + * @since 7.0.0 |
|
40 | + */ |
|
41 | + public function hasKey($app, $key); |
|
42 | 42 | |
43 | - /** |
|
44 | - * get multiply values, either the app or key can be used as wildcard by setting it to false |
|
45 | - * |
|
46 | - * @param string|false $key |
|
47 | - * @param string|false $app |
|
48 | - * @return array|false |
|
49 | - * @since 7.0.0 |
|
50 | - */ |
|
51 | - public function getValues($app, $key); |
|
43 | + /** |
|
44 | + * get multiply values, either the app or key can be used as wildcard by setting it to false |
|
45 | + * |
|
46 | + * @param string|false $key |
|
47 | + * @param string|false $app |
|
48 | + * @return array|false |
|
49 | + * @since 7.0.0 |
|
50 | + */ |
|
51 | + public function getValues($app, $key); |
|
52 | 52 | |
53 | - /** |
|
54 | - * get all values of the app or and filters out sensitive data |
|
55 | - * |
|
56 | - * @param string $app |
|
57 | - * @return array |
|
58 | - * @since 12.0.0 |
|
59 | - */ |
|
60 | - public function getFilteredValues($app); |
|
53 | + /** |
|
54 | + * get all values of the app or and filters out sensitive data |
|
55 | + * |
|
56 | + * @param string $app |
|
57 | + * @return array |
|
58 | + * @since 12.0.0 |
|
59 | + */ |
|
60 | + public function getFilteredValues($app); |
|
61 | 61 | |
62 | - /** |
|
63 | - * Get all apps using the config |
|
64 | - * @return array an array of app ids |
|
65 | - * |
|
66 | - * This function returns a list of all apps that have at least one |
|
67 | - * entry in the appconfig table. |
|
68 | - * @since 7.0.0 |
|
69 | - */ |
|
70 | - public function getApps(); |
|
62 | + /** |
|
63 | + * Get all apps using the config |
|
64 | + * @return array an array of app ids |
|
65 | + * |
|
66 | + * This function returns a list of all apps that have at least one |
|
67 | + * entry in the appconfig table. |
|
68 | + * @since 7.0.0 |
|
69 | + */ |
|
70 | + public function getApps(); |
|
71 | 71 | } |
@@ -26,27 +26,27 @@ |
||
26 | 26 | |
27 | 27 | class RequestTime extends Controller { |
28 | 28 | |
29 | - /** |
|
30 | - * @NoAdminRequired |
|
31 | - * |
|
32 | - * @param string $search |
|
33 | - * @return JSONResponse |
|
34 | - */ |
|
35 | - public function getTimezones($search = '') { |
|
36 | - $timezones = \DateTimeZone::listIdentifiers(); |
|
29 | + /** |
|
30 | + * @NoAdminRequired |
|
31 | + * |
|
32 | + * @param string $search |
|
33 | + * @return JSONResponse |
|
34 | + */ |
|
35 | + public function getTimezones($search = '') { |
|
36 | + $timezones = \DateTimeZone::listIdentifiers(); |
|
37 | 37 | |
38 | - if ($search !== '') { |
|
39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
40 | - return stripos($timezone, $search) !== false; |
|
41 | - }); |
|
42 | - } |
|
38 | + if ($search !== '') { |
|
39 | + $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
40 | + return stripos($timezone, $search) !== false; |
|
41 | + }); |
|
42 | + } |
|
43 | 43 | |
44 | - $timezones = array_slice($timezones, 0, 10); |
|
44 | + $timezones = array_slice($timezones, 0, 10); |
|
45 | 45 | |
46 | - $response = []; |
|
47 | - foreach ($timezones as $timezone) { |
|
48 | - $response[$timezone] = $timezone; |
|
49 | - } |
|
50 | - return new JSONResponse($response); |
|
51 | - } |
|
46 | + $response = []; |
|
47 | + foreach ($timezones as $timezone) { |
|
48 | + $response[$timezone] = $timezone; |
|
49 | + } |
|
50 | + return new JSONResponse($response); |
|
51 | + } |
|
52 | 52 | } |
@@ -30,21 +30,21 @@ |
||
30 | 30 | * @package OC\IntegrityCheck\Helpers |
31 | 31 | */ |
32 | 32 | class EnvironmentHelper { |
33 | - /** |
|
34 | - * Provides \OC::$SERVERROOT |
|
35 | - * |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function getServerRoot(): string { |
|
39 | - return rtrim(\OC::$SERVERROOT, '/'); |
|
40 | - } |
|
33 | + /** |
|
34 | + * Provides \OC::$SERVERROOT |
|
35 | + * |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function getServerRoot(): string { |
|
39 | + return rtrim(\OC::$SERVERROOT, '/'); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Provides \OC_Util::getChannel() |
|
44 | - * |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function getChannel(): string { |
|
48 | - return \OC_Util::getChannel(); |
|
49 | - } |
|
42 | + /** |
|
43 | + * Provides \OC_Util::getChannel() |
|
44 | + * |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function getChannel(): string { |
|
48 | + return \OC_Util::getChannel(); |
|
49 | + } |
|
50 | 50 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | * @package OC\AppFramework\Middleware\Security\Exceptions |
37 | 37 | */ |
38 | 38 | class NotAdminException extends SecurityException { |
39 | - public function __construct(string $message) { |
|
40 | - parent::__construct($message, Http::STATUS_FORBIDDEN); |
|
41 | - } |
|
39 | + public function __construct(string $message) { |
|
40 | + parent::__construct($message, Http::STATUS_FORBIDDEN); |
|
41 | + } |
|
42 | 42 | } |
@@ -32,23 +32,23 @@ |
||
32 | 32 | * @package OC\Security\CSRF |
33 | 33 | */ |
34 | 34 | class CsrfTokenGenerator { |
35 | - /** @var ISecureRandom */ |
|
36 | - private $random; |
|
35 | + /** @var ISecureRandom */ |
|
36 | + private $random; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param ISecureRandom $random |
|
40 | - */ |
|
41 | - public function __construct(ISecureRandom $random) { |
|
42 | - $this->random = $random; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @param ISecureRandom $random |
|
40 | + */ |
|
41 | + public function __construct(ISecureRandom $random) { |
|
42 | + $this->random = $random; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Generate a new CSRF token. |
|
47 | - * |
|
48 | - * @param int $length Length of the token in characters. |
|
49 | - * @return string |
|
50 | - */ |
|
51 | - public function generateToken(int $length = 32): string { |
|
52 | - return $this->random->generate($length); |
|
53 | - } |
|
45 | + /** |
|
46 | + * Generate a new CSRF token. |
|
47 | + * |
|
48 | + * @param int $length Length of the token in characters. |
|
49 | + * @return string |
|
50 | + */ |
|
51 | + public function generateToken(int $length = 32): string { |
|
52 | + return $this->random->generate($length); |
|
53 | + } |
|
54 | 54 | } |
@@ -25,25 +25,25 @@ |
||
25 | 25 | namespace OC\Security\IdentityProof; |
26 | 26 | |
27 | 27 | class Key { |
28 | - /** @var string */ |
|
29 | - private $publicKey; |
|
30 | - /** @var string */ |
|
31 | - private $privateKey; |
|
28 | + /** @var string */ |
|
29 | + private $publicKey; |
|
30 | + /** @var string */ |
|
31 | + private $privateKey; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param string $publicKey |
|
35 | - * @param string $privateKey |
|
36 | - */ |
|
37 | - public function __construct(string $publicKey, string $privateKey) { |
|
38 | - $this->publicKey = $publicKey; |
|
39 | - $this->privateKey = $privateKey; |
|
40 | - } |
|
33 | + /** |
|
34 | + * @param string $publicKey |
|
35 | + * @param string $privateKey |
|
36 | + */ |
|
37 | + public function __construct(string $publicKey, string $privateKey) { |
|
38 | + $this->publicKey = $publicKey; |
|
39 | + $this->privateKey = $privateKey; |
|
40 | + } |
|
41 | 41 | |
42 | - public function getPrivate(): string { |
|
43 | - return $this->privateKey; |
|
44 | - } |
|
42 | + public function getPrivate(): string { |
|
43 | + return $this->privateKey; |
|
44 | + } |
|
45 | 45 | |
46 | - public function getPublic(): string { |
|
47 | - return $this->publicKey; |
|
48 | - } |
|
46 | + public function getPublic(): string { |
|
47 | + return $this->publicKey; |
|
48 | + } |
|
49 | 49 | } |
@@ -30,30 +30,30 @@ |
||
30 | 30 | * Delete the admin|personal sections and settings tables |
31 | 31 | */ |
32 | 32 | class Version14000Date20180129121024 extends SimpleMigrationStep { |
33 | - public function name(): string { |
|
34 | - return 'Drop obsolete settings tables'; |
|
35 | - } |
|
33 | + public function name(): string { |
|
34 | + return 'Drop obsolete settings tables'; |
|
35 | + } |
|
36 | 36 | |
37 | - public function description(): string { |
|
38 | - return 'Drops the following obsolete tables: "admin_sections", "admin_settings", "personal_sections" and "personal_settings"'; |
|
39 | - } |
|
37 | + public function description(): string { |
|
38 | + return 'Drops the following obsolete tables: "admin_sections", "admin_settings", "personal_sections" and "personal_settings"'; |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IOutput $output |
|
43 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
44 | - * @param array $options |
|
45 | - * @return null|ISchemaWrapper |
|
46 | - * @since 13.0.0 |
|
47 | - */ |
|
48 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
49 | - /** @var ISchemaWrapper $schema */ |
|
50 | - $schema = $schemaClosure(); |
|
41 | + /** |
|
42 | + * @param IOutput $output |
|
43 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
44 | + * @param array $options |
|
45 | + * @return null|ISchemaWrapper |
|
46 | + * @since 13.0.0 |
|
47 | + */ |
|
48 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
49 | + /** @var ISchemaWrapper $schema */ |
|
50 | + $schema = $schemaClosure(); |
|
51 | 51 | |
52 | - $schema->dropTable('admin_sections'); |
|
53 | - $schema->dropTable('admin_settings'); |
|
54 | - $schema->dropTable('personal_sections'); |
|
55 | - $schema->dropTable('personal_settings'); |
|
52 | + $schema->dropTable('admin_sections'); |
|
53 | + $schema->dropTable('admin_settings'); |
|
54 | + $schema->dropTable('personal_sections'); |
|
55 | + $schema->dropTable('personal_settings'); |
|
56 | 56 | |
57 | - return $schema; |
|
58 | - } |
|
57 | + return $schema; |
|
58 | + } |
|
59 | 59 | } |