@@ -39,22 +39,22 @@ |
||
39 | 39 | * @method string getToken() |
40 | 40 | */ |
41 | 41 | class OpenLocalEditor extends Entity { |
42 | - /** @var string */ |
|
43 | - protected $userId; |
|
42 | + /** @var string */ |
|
43 | + protected $userId; |
|
44 | 44 | |
45 | - /** @var string */ |
|
46 | - protected $pathHash; |
|
45 | + /** @var string */ |
|
46 | + protected $pathHash; |
|
47 | 47 | |
48 | - /** @var int */ |
|
49 | - protected $expirationTime; |
|
48 | + /** @var int */ |
|
49 | + protected $expirationTime; |
|
50 | 50 | |
51 | - /** @var string */ |
|
52 | - protected $token; |
|
51 | + /** @var string */ |
|
52 | + protected $token; |
|
53 | 53 | |
54 | - public function __construct() { |
|
55 | - $this->addType('userId', 'string'); |
|
56 | - $this->addType('pathHash', 'string'); |
|
57 | - $this->addType('expirationTime', 'integer'); |
|
58 | - $this->addType('token', 'string'); |
|
59 | - } |
|
54 | + public function __construct() { |
|
55 | + $this->addType('userId', 'string'); |
|
56 | + $this->addType('pathHash', 'string'); |
|
57 | + $this->addType('expirationTime', 'integer'); |
|
58 | + $this->addType('token', 'string'); |
|
59 | + } |
|
60 | 60 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $qb->expr()->isNotNull('custom_icon'), |
84 | 84 | $qb->expr()->isNotNull('custom_message'), |
85 | 85 | ), |
86 | - $qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%')) |
|
86 | + $qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_').'%')) |
|
87 | 87 | )); |
88 | 88 | |
89 | 89 | if ($limit !== null) { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $qb |
107 | 107 | ->select('*') |
108 | 108 | ->from($this->tableName) |
109 | - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR))); |
|
109 | + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_'.$userId : $userId, IQueryBuilder::PARAM_STR))); |
|
110 | 110 | |
111 | 111 | return $this->findEntity($qb); |
112 | 112 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $qb = $this->db->getQueryBuilder(); |
196 | 196 | $qb->update($this->tableName) |
197 | 197 | ->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)) |
198 | - ->set('user_id', $qb->createNamedParameter('_' . $userId)) |
|
198 | + ->set('user_id', $qb->createNamedParameter('_'.$userId)) |
|
199 | 199 | ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId))); |
200 | 200 | return $qb->executeStatement() > 0; |
201 | 201 | } |
@@ -20,178 +20,178 @@ |
||
20 | 20 | */ |
21 | 21 | class UserStatusMapper extends QBMapper { |
22 | 22 | |
23 | - /** |
|
24 | - * @param IDBConnection $db |
|
25 | - */ |
|
26 | - public function __construct(IDBConnection $db) { |
|
27 | - parent::__construct($db, 'user_status'); |
|
28 | - } |
|
29 | - |
|
30 | - /** |
|
31 | - * @param int|null $limit |
|
32 | - * @param int|null $offset |
|
33 | - * @return UserStatus[] |
|
34 | - */ |
|
35 | - public function findAll(?int $limit = null, ?int $offset = null):array { |
|
36 | - $qb = $this->db->getQueryBuilder(); |
|
37 | - $qb |
|
38 | - ->select('*') |
|
39 | - ->from($this->tableName); |
|
40 | - |
|
41 | - if ($limit !== null) { |
|
42 | - $qb->setMaxResults($limit); |
|
43 | - } |
|
44 | - if ($offset !== null) { |
|
45 | - $qb->setFirstResult($offset); |
|
46 | - } |
|
47 | - |
|
48 | - return $this->findEntities($qb); |
|
49 | - } |
|
50 | - |
|
51 | - /** |
|
52 | - * @param int|null $limit |
|
53 | - * @param int|null $offset |
|
54 | - * @return array |
|
55 | - */ |
|
56 | - public function findAllRecent(?int $limit = null, ?int $offset = null): array { |
|
57 | - $qb = $this->db->getQueryBuilder(); |
|
58 | - |
|
59 | - $qb |
|
60 | - ->select('*') |
|
61 | - ->from($this->tableName) |
|
62 | - ->orderBy('status_message_timestamp', 'DESC') |
|
63 | - ->where($qb->expr()->andX( |
|
64 | - $qb->expr()->neq('status_message_timestamp', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT), |
|
65 | - $qb->expr()->orX( |
|
66 | - $qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)), |
|
67 | - $qb->expr()->isNotNull('message_id'), |
|
68 | - $qb->expr()->isNotNull('custom_icon'), |
|
69 | - $qb->expr()->isNotNull('custom_message'), |
|
70 | - ), |
|
71 | - $qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%')) |
|
72 | - )); |
|
73 | - |
|
74 | - if ($limit !== null) { |
|
75 | - $qb->setMaxResults($limit); |
|
76 | - } |
|
77 | - if ($offset !== null) { |
|
78 | - $qb->setFirstResult($offset); |
|
79 | - } |
|
80 | - |
|
81 | - return $this->findEntities($qb); |
|
82 | - } |
|
83 | - |
|
84 | - /** |
|
85 | - * @param string $userId |
|
86 | - * @return UserStatus |
|
87 | - * @throws DoesNotExistException |
|
88 | - */ |
|
89 | - public function findByUserId(string $userId, bool $isBackup = false): UserStatus { |
|
90 | - $qb = $this->db->getQueryBuilder(); |
|
91 | - $qb |
|
92 | - ->select('*') |
|
93 | - ->from($this->tableName) |
|
94 | - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR))); |
|
95 | - |
|
96 | - return $this->findEntity($qb); |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * @param array $userIds |
|
101 | - * @return array |
|
102 | - */ |
|
103 | - public function findByUserIds(array $userIds): array { |
|
104 | - $qb = $this->db->getQueryBuilder(); |
|
105 | - $qb |
|
106 | - ->select('*') |
|
107 | - ->from($this->tableName) |
|
108 | - ->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY))); |
|
109 | - |
|
110 | - return $this->findEntities($qb); |
|
111 | - } |
|
112 | - |
|
113 | - /** |
|
114 | - * @param int $olderThan |
|
115 | - * @param int $now |
|
116 | - */ |
|
117 | - public function clearStatusesOlderThan(int $olderThan, int $now): void { |
|
118 | - $qb = $this->db->getQueryBuilder(); |
|
119 | - $qb->update($this->tableName) |
|
120 | - ->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE)) |
|
121 | - ->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)) |
|
122 | - ->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT)) |
|
123 | - ->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT))) |
|
124 | - ->andWhere($qb->expr()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE))) |
|
125 | - ->andWhere($qb->expr()->orX( |
|
126 | - $qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL), |
|
127 | - $qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE)) |
|
128 | - )); |
|
129 | - |
|
130 | - $qb->executeStatement(); |
|
131 | - } |
|
132 | - |
|
133 | - /** |
|
134 | - * Clear all statuses older than a given timestamp |
|
135 | - * |
|
136 | - * @param int $timestamp |
|
137 | - */ |
|
138 | - public function clearOlderThanClearAt(int $timestamp): void { |
|
139 | - $qb = $this->db->getQueryBuilder(); |
|
140 | - $qb->delete($this->tableName) |
|
141 | - ->where($qb->expr()->isNotNull('clear_at')) |
|
142 | - ->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT))); |
|
143 | - |
|
144 | - $qb->executeStatement(); |
|
145 | - } |
|
146 | - |
|
147 | - |
|
148 | - /** |
|
149 | - * Deletes a user status so we can restore the backup |
|
150 | - * |
|
151 | - * @param string $userId |
|
152 | - * @param string $messageId |
|
153 | - * @return bool True if an entry was deleted |
|
154 | - */ |
|
155 | - public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool { |
|
156 | - $qb = $this->db->getQueryBuilder(); |
|
157 | - $qb->delete($this->tableName) |
|
158 | - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId))) |
|
159 | - ->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId))) |
|
160 | - ->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))); |
|
161 | - return $qb->executeStatement() > 0; |
|
162 | - } |
|
163 | - |
|
164 | - public function deleteByIds(array $ids): void { |
|
165 | - $qb = $this->db->getQueryBuilder(); |
|
166 | - $qb->delete($this->tableName) |
|
167 | - ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))); |
|
168 | - $qb->executeStatement(); |
|
169 | - } |
|
170 | - |
|
171 | - /** |
|
172 | - * @param string $userId |
|
173 | - * @return bool |
|
174 | - * @throws \OCP\DB\Exception |
|
175 | - */ |
|
176 | - public function createBackupStatus(string $userId): bool { |
|
177 | - // Prefix user account with an underscore because user_id is marked as unique |
|
178 | - // in the table. Starting a username with an underscore is not allowed so this |
|
179 | - // shouldn't create any trouble. |
|
180 | - $qb = $this->db->getQueryBuilder(); |
|
181 | - $qb->update($this->tableName) |
|
182 | - ->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)) |
|
183 | - ->set('user_id', $qb->createNamedParameter('_' . $userId)) |
|
184 | - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId))); |
|
185 | - return $qb->executeStatement() > 0; |
|
186 | - } |
|
187 | - |
|
188 | - public function restoreBackupStatuses(array $ids): void { |
|
189 | - $qb = $this->db->getQueryBuilder(); |
|
190 | - $qb->update($this->tableName) |
|
191 | - ->set('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)) |
|
192 | - ->set('user_id', $qb->func()->substring('user_id', $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT))) |
|
193 | - ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))); |
|
194 | - |
|
195 | - $qb->executeStatement(); |
|
196 | - } |
|
23 | + /** |
|
24 | + * @param IDBConnection $db |
|
25 | + */ |
|
26 | + public function __construct(IDBConnection $db) { |
|
27 | + parent::__construct($db, 'user_status'); |
|
28 | + } |
|
29 | + |
|
30 | + /** |
|
31 | + * @param int|null $limit |
|
32 | + * @param int|null $offset |
|
33 | + * @return UserStatus[] |
|
34 | + */ |
|
35 | + public function findAll(?int $limit = null, ?int $offset = null):array { |
|
36 | + $qb = $this->db->getQueryBuilder(); |
|
37 | + $qb |
|
38 | + ->select('*') |
|
39 | + ->from($this->tableName); |
|
40 | + |
|
41 | + if ($limit !== null) { |
|
42 | + $qb->setMaxResults($limit); |
|
43 | + } |
|
44 | + if ($offset !== null) { |
|
45 | + $qb->setFirstResult($offset); |
|
46 | + } |
|
47 | + |
|
48 | + return $this->findEntities($qb); |
|
49 | + } |
|
50 | + |
|
51 | + /** |
|
52 | + * @param int|null $limit |
|
53 | + * @param int|null $offset |
|
54 | + * @return array |
|
55 | + */ |
|
56 | + public function findAllRecent(?int $limit = null, ?int $offset = null): array { |
|
57 | + $qb = $this->db->getQueryBuilder(); |
|
58 | + |
|
59 | + $qb |
|
60 | + ->select('*') |
|
61 | + ->from($this->tableName) |
|
62 | + ->orderBy('status_message_timestamp', 'DESC') |
|
63 | + ->where($qb->expr()->andX( |
|
64 | + $qb->expr()->neq('status_message_timestamp', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT), |
|
65 | + $qb->expr()->orX( |
|
66 | + $qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)), |
|
67 | + $qb->expr()->isNotNull('message_id'), |
|
68 | + $qb->expr()->isNotNull('custom_icon'), |
|
69 | + $qb->expr()->isNotNull('custom_message'), |
|
70 | + ), |
|
71 | + $qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%')) |
|
72 | + )); |
|
73 | + |
|
74 | + if ($limit !== null) { |
|
75 | + $qb->setMaxResults($limit); |
|
76 | + } |
|
77 | + if ($offset !== null) { |
|
78 | + $qb->setFirstResult($offset); |
|
79 | + } |
|
80 | + |
|
81 | + return $this->findEntities($qb); |
|
82 | + } |
|
83 | + |
|
84 | + /** |
|
85 | + * @param string $userId |
|
86 | + * @return UserStatus |
|
87 | + * @throws DoesNotExistException |
|
88 | + */ |
|
89 | + public function findByUserId(string $userId, bool $isBackup = false): UserStatus { |
|
90 | + $qb = $this->db->getQueryBuilder(); |
|
91 | + $qb |
|
92 | + ->select('*') |
|
93 | + ->from($this->tableName) |
|
94 | + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR))); |
|
95 | + |
|
96 | + return $this->findEntity($qb); |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * @param array $userIds |
|
101 | + * @return array |
|
102 | + */ |
|
103 | + public function findByUserIds(array $userIds): array { |
|
104 | + $qb = $this->db->getQueryBuilder(); |
|
105 | + $qb |
|
106 | + ->select('*') |
|
107 | + ->from($this->tableName) |
|
108 | + ->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY))); |
|
109 | + |
|
110 | + return $this->findEntities($qb); |
|
111 | + } |
|
112 | + |
|
113 | + /** |
|
114 | + * @param int $olderThan |
|
115 | + * @param int $now |
|
116 | + */ |
|
117 | + public function clearStatusesOlderThan(int $olderThan, int $now): void { |
|
118 | + $qb = $this->db->getQueryBuilder(); |
|
119 | + $qb->update($this->tableName) |
|
120 | + ->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE)) |
|
121 | + ->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)) |
|
122 | + ->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT)) |
|
123 | + ->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT))) |
|
124 | + ->andWhere($qb->expr()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE))) |
|
125 | + ->andWhere($qb->expr()->orX( |
|
126 | + $qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL), |
|
127 | + $qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE)) |
|
128 | + )); |
|
129 | + |
|
130 | + $qb->executeStatement(); |
|
131 | + } |
|
132 | + |
|
133 | + /** |
|
134 | + * Clear all statuses older than a given timestamp |
|
135 | + * |
|
136 | + * @param int $timestamp |
|
137 | + */ |
|
138 | + public function clearOlderThanClearAt(int $timestamp): void { |
|
139 | + $qb = $this->db->getQueryBuilder(); |
|
140 | + $qb->delete($this->tableName) |
|
141 | + ->where($qb->expr()->isNotNull('clear_at')) |
|
142 | + ->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT))); |
|
143 | + |
|
144 | + $qb->executeStatement(); |
|
145 | + } |
|
146 | + |
|
147 | + |
|
148 | + /** |
|
149 | + * Deletes a user status so we can restore the backup |
|
150 | + * |
|
151 | + * @param string $userId |
|
152 | + * @param string $messageId |
|
153 | + * @return bool True if an entry was deleted |
|
154 | + */ |
|
155 | + public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool { |
|
156 | + $qb = $this->db->getQueryBuilder(); |
|
157 | + $qb->delete($this->tableName) |
|
158 | + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId))) |
|
159 | + ->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId))) |
|
160 | + ->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))); |
|
161 | + return $qb->executeStatement() > 0; |
|
162 | + } |
|
163 | + |
|
164 | + public function deleteByIds(array $ids): void { |
|
165 | + $qb = $this->db->getQueryBuilder(); |
|
166 | + $qb->delete($this->tableName) |
|
167 | + ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))); |
|
168 | + $qb->executeStatement(); |
|
169 | + } |
|
170 | + |
|
171 | + /** |
|
172 | + * @param string $userId |
|
173 | + * @return bool |
|
174 | + * @throws \OCP\DB\Exception |
|
175 | + */ |
|
176 | + public function createBackupStatus(string $userId): bool { |
|
177 | + // Prefix user account with an underscore because user_id is marked as unique |
|
178 | + // in the table. Starting a username with an underscore is not allowed so this |
|
179 | + // shouldn't create any trouble. |
|
180 | + $qb = $this->db->getQueryBuilder(); |
|
181 | + $qb->update($this->tableName) |
|
182 | + ->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)) |
|
183 | + ->set('user_id', $qb->createNamedParameter('_' . $userId)) |
|
184 | + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId))); |
|
185 | + return $qb->executeStatement() > 0; |
|
186 | + } |
|
187 | + |
|
188 | + public function restoreBackupStatuses(array $ids): void { |
|
189 | + $qb = $this->db->getQueryBuilder(); |
|
190 | + $qb->update($this->tableName) |
|
191 | + ->set('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)) |
|
192 | + ->set('user_id', $qb->func()->substring('user_id', $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT))) |
|
193 | + ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))); |
|
194 | + |
|
195 | + $qb->executeStatement(); |
|
196 | + } |
|
197 | 197 | } |
@@ -32,69 +32,69 @@ |
||
32 | 32 | * @since 11.0.0 |
33 | 33 | */ |
34 | 34 | interface ISimpleFolder { |
35 | - /** |
|
36 | - * Get all the files in a folder |
|
37 | - * |
|
38 | - * @return ISimpleFile[] |
|
39 | - * @since 11.0.0 |
|
40 | - */ |
|
41 | - public function getDirectoryListing(): array; |
|
35 | + /** |
|
36 | + * Get all the files in a folder |
|
37 | + * |
|
38 | + * @return ISimpleFile[] |
|
39 | + * @since 11.0.0 |
|
40 | + */ |
|
41 | + public function getDirectoryListing(): array; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Check if a file with $name exists |
|
45 | - * |
|
46 | - * @param string $name |
|
47 | - * @return bool |
|
48 | - * @since 11.0.0 |
|
49 | - */ |
|
50 | - public function fileExists(string $name): bool; |
|
43 | + /** |
|
44 | + * Check if a file with $name exists |
|
45 | + * |
|
46 | + * @param string $name |
|
47 | + * @return bool |
|
48 | + * @since 11.0.0 |
|
49 | + */ |
|
50 | + public function fileExists(string $name): bool; |
|
51 | 51 | |
52 | - /** |
|
53 | - * Get the file named $name from the folder |
|
54 | - * |
|
55 | - * @throws NotFoundException |
|
56 | - * @since 11.0.0 |
|
57 | - */ |
|
58 | - public function getFile(string $name): ISimpleFile; |
|
52 | + /** |
|
53 | + * Get the file named $name from the folder |
|
54 | + * |
|
55 | + * @throws NotFoundException |
|
56 | + * @since 11.0.0 |
|
57 | + */ |
|
58 | + public function getFile(string $name): ISimpleFile; |
|
59 | 59 | |
60 | - /** |
|
61 | - * Creates a new file with $name in the folder |
|
62 | - * |
|
63 | - * @param string|resource|null $content @since 19.0.0 |
|
64 | - * @throws NotPermittedException |
|
65 | - * @since 11.0.0 |
|
66 | - */ |
|
67 | - public function newFile(string $name, $content = null): ISimpleFile; |
|
60 | + /** |
|
61 | + * Creates a new file with $name in the folder |
|
62 | + * |
|
63 | + * @param string|resource|null $content @since 19.0.0 |
|
64 | + * @throws NotPermittedException |
|
65 | + * @since 11.0.0 |
|
66 | + */ |
|
67 | + public function newFile(string $name, $content = null): ISimpleFile; |
|
68 | 68 | |
69 | - /** |
|
70 | - * Remove the folder and all the files in it |
|
71 | - * |
|
72 | - * @throws NotPermittedException |
|
73 | - * @since 11.0.0 |
|
74 | - */ |
|
75 | - public function delete(): void; |
|
69 | + /** |
|
70 | + * Remove the folder and all the files in it |
|
71 | + * |
|
72 | + * @throws NotPermittedException |
|
73 | + * @since 11.0.0 |
|
74 | + */ |
|
75 | + public function delete(): void; |
|
76 | 76 | |
77 | - /** |
|
78 | - * Get the folder name |
|
79 | - * |
|
80 | - * @since 11.0.0 |
|
81 | - */ |
|
82 | - public function getName(): string; |
|
77 | + /** |
|
78 | + * Get the folder name |
|
79 | + * |
|
80 | + * @since 11.0.0 |
|
81 | + */ |
|
82 | + public function getName(): string; |
|
83 | 83 | |
84 | - /** |
|
85 | - * Get the folder named $name from the current folder |
|
86 | - * |
|
87 | - * @throws NotFoundException |
|
88 | - * @since 25.0.0 |
|
89 | - */ |
|
90 | - public function getFolder(string $name): ISimpleFolder; |
|
84 | + /** |
|
85 | + * Get the folder named $name from the current folder |
|
86 | + * |
|
87 | + * @throws NotFoundException |
|
88 | + * @since 25.0.0 |
|
89 | + */ |
|
90 | + public function getFolder(string $name): ISimpleFolder; |
|
91 | 91 | |
92 | - /** |
|
93 | - * Creates a new folder with $name in the current folder |
|
94 | - * |
|
95 | - * @param string|resource|null $content @since 19.0.0 |
|
96 | - * @throws NotPermittedException |
|
97 | - * @since 25.0.0 |
|
98 | - */ |
|
99 | - public function newFolder(string $path): ISimpleFolder; |
|
92 | + /** |
|
93 | + * Creates a new folder with $name in the current folder |
|
94 | + * |
|
95 | + * @param string|resource|null $content @since 19.0.0 |
|
96 | + * @throws NotPermittedException |
|
97 | + * @since 25.0.0 |
|
98 | + */ |
|
99 | + public function newFolder(string $path): ISimpleFolder; |
|
100 | 100 | } |
@@ -89,10 +89,10 @@ |
||
89 | 89 | * @return void |
90 | 90 | */ |
91 | 91 | public function propFind(PropFind $propFind, INode $node) { |
92 | - $propFind->handle('{DAV:}supportedlock', function () { |
|
92 | + $propFind->handle('{DAV:}supportedlock', function() { |
|
93 | 93 | return new SupportedLock(); |
94 | 94 | }); |
95 | - $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) { |
|
95 | + $propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) { |
|
96 | 96 | return new LockDiscovery([]); |
97 | 97 | }); |
98 | 98 | } |
@@ -31,113 +31,113 @@ |
||
31 | 31 | * @package OCA\DAV\Connector\Sabre |
32 | 32 | */ |
33 | 33 | class FakeLockerPlugin extends ServerPlugin { |
34 | - /** @var Server */ |
|
35 | - private $server; |
|
34 | + /** @var Server */ |
|
35 | + private $server; |
|
36 | 36 | |
37 | - /** {@inheritDoc} */ |
|
38 | - public function initialize(Server $server) { |
|
39 | - $this->server = $server; |
|
40 | - $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1); |
|
41 | - $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1); |
|
42 | - $server->on('propFind', [$this, 'propFind']); |
|
43 | - $server->on('validateTokens', [$this, 'validateTokens']); |
|
44 | - } |
|
37 | + /** {@inheritDoc} */ |
|
38 | + public function initialize(Server $server) { |
|
39 | + $this->server = $server; |
|
40 | + $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1); |
|
41 | + $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1); |
|
42 | + $server->on('propFind', [$this, 'propFind']); |
|
43 | + $server->on('validateTokens', [$this, 'validateTokens']); |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Indicate that we support LOCK and UNLOCK |
|
48 | - * |
|
49 | - * @param string $path |
|
50 | - * @return string[] |
|
51 | - */ |
|
52 | - public function getHTTPMethods($path) { |
|
53 | - return [ |
|
54 | - 'LOCK', |
|
55 | - 'UNLOCK', |
|
56 | - ]; |
|
57 | - } |
|
46 | + /** |
|
47 | + * Indicate that we support LOCK and UNLOCK |
|
48 | + * |
|
49 | + * @param string $path |
|
50 | + * @return string[] |
|
51 | + */ |
|
52 | + public function getHTTPMethods($path) { |
|
53 | + return [ |
|
54 | + 'LOCK', |
|
55 | + 'UNLOCK', |
|
56 | + ]; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * Indicate that we support locking |
|
61 | - * |
|
62 | - * @return integer[] |
|
63 | - */ |
|
64 | - public function getFeatures() { |
|
65 | - return [2]; |
|
66 | - } |
|
59 | + /** |
|
60 | + * Indicate that we support locking |
|
61 | + * |
|
62 | + * @return integer[] |
|
63 | + */ |
|
64 | + public function getFeatures() { |
|
65 | + return [2]; |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Return some dummy response for PROPFIND requests with regard to locking |
|
70 | - * |
|
71 | - * @param PropFind $propFind |
|
72 | - * @param INode $node |
|
73 | - * @return void |
|
74 | - */ |
|
75 | - public function propFind(PropFind $propFind, INode $node) { |
|
76 | - $propFind->handle('{DAV:}supportedlock', function () { |
|
77 | - return new SupportedLock(); |
|
78 | - }); |
|
79 | - $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) { |
|
80 | - return new LockDiscovery([]); |
|
81 | - }); |
|
82 | - } |
|
68 | + /** |
|
69 | + * Return some dummy response for PROPFIND requests with regard to locking |
|
70 | + * |
|
71 | + * @param PropFind $propFind |
|
72 | + * @param INode $node |
|
73 | + * @return void |
|
74 | + */ |
|
75 | + public function propFind(PropFind $propFind, INode $node) { |
|
76 | + $propFind->handle('{DAV:}supportedlock', function () { |
|
77 | + return new SupportedLock(); |
|
78 | + }); |
|
79 | + $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) { |
|
80 | + return new LockDiscovery([]); |
|
81 | + }); |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * Mark a locking token always as valid |
|
86 | - * |
|
87 | - * @param RequestInterface $request |
|
88 | - * @param array $conditions |
|
89 | - */ |
|
90 | - public function validateTokens(RequestInterface $request, &$conditions) { |
|
91 | - foreach ($conditions as &$fileCondition) { |
|
92 | - if (isset($fileCondition['tokens'])) { |
|
93 | - foreach ($fileCondition['tokens'] as &$token) { |
|
94 | - if (isset($token['token'])) { |
|
95 | - if (str_starts_with($token['token'], 'opaquelocktoken:')) { |
|
96 | - $token['validToken'] = true; |
|
97 | - } |
|
98 | - } |
|
99 | - } |
|
100 | - } |
|
101 | - } |
|
102 | - } |
|
84 | + /** |
|
85 | + * Mark a locking token always as valid |
|
86 | + * |
|
87 | + * @param RequestInterface $request |
|
88 | + * @param array $conditions |
|
89 | + */ |
|
90 | + public function validateTokens(RequestInterface $request, &$conditions) { |
|
91 | + foreach ($conditions as &$fileCondition) { |
|
92 | + if (isset($fileCondition['tokens'])) { |
|
93 | + foreach ($fileCondition['tokens'] as &$token) { |
|
94 | + if (isset($token['token'])) { |
|
95 | + if (str_starts_with($token['token'], 'opaquelocktoken:')) { |
|
96 | + $token['validToken'] = true; |
|
97 | + } |
|
98 | + } |
|
99 | + } |
|
100 | + } |
|
101 | + } |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * Fakes a successful LOCK |
|
106 | - * |
|
107 | - * @param RequestInterface $request |
|
108 | - * @param ResponseInterface $response |
|
109 | - * @return bool |
|
110 | - */ |
|
111 | - public function fakeLockProvider(RequestInterface $request, |
|
112 | - ResponseInterface $response) { |
|
113 | - $lockInfo = new LockInfo(); |
|
114 | - $lockInfo->token = md5($request->getPath()); |
|
115 | - $lockInfo->uri = $request->getPath(); |
|
116 | - $lockInfo->depth = Server::DEPTH_INFINITY; |
|
117 | - $lockInfo->timeout = 1800; |
|
104 | + /** |
|
105 | + * Fakes a successful LOCK |
|
106 | + * |
|
107 | + * @param RequestInterface $request |
|
108 | + * @param ResponseInterface $response |
|
109 | + * @return bool |
|
110 | + */ |
|
111 | + public function fakeLockProvider(RequestInterface $request, |
|
112 | + ResponseInterface $response) { |
|
113 | + $lockInfo = new LockInfo(); |
|
114 | + $lockInfo->token = md5($request->getPath()); |
|
115 | + $lockInfo->uri = $request->getPath(); |
|
116 | + $lockInfo->depth = Server::DEPTH_INFINITY; |
|
117 | + $lockInfo->timeout = 1800; |
|
118 | 118 | |
119 | - $body = $this->server->xml->write('{DAV:}prop', [ |
|
120 | - '{DAV:}lockdiscovery' |
|
121 | - => new LockDiscovery([$lockInfo]) |
|
122 | - ]); |
|
119 | + $body = $this->server->xml->write('{DAV:}prop', [ |
|
120 | + '{DAV:}lockdiscovery' |
|
121 | + => new LockDiscovery([$lockInfo]) |
|
122 | + ]); |
|
123 | 123 | |
124 | - $response->setStatus(Http::STATUS_OK); |
|
125 | - $response->setBody($body); |
|
124 | + $response->setStatus(Http::STATUS_OK); |
|
125 | + $response->setBody($body); |
|
126 | 126 | |
127 | - return false; |
|
128 | - } |
|
127 | + return false; |
|
128 | + } |
|
129 | 129 | |
130 | - /** |
|
131 | - * Fakes a successful LOCK |
|
132 | - * |
|
133 | - * @param RequestInterface $request |
|
134 | - * @param ResponseInterface $response |
|
135 | - * @return bool |
|
136 | - */ |
|
137 | - public function fakeUnlockProvider(RequestInterface $request, |
|
138 | - ResponseInterface $response) { |
|
139 | - $response->setStatus(Http::STATUS_NO_CONTENT); |
|
140 | - $response->setHeader('Content-Length', '0'); |
|
141 | - return false; |
|
142 | - } |
|
130 | + /** |
|
131 | + * Fakes a successful LOCK |
|
132 | + * |
|
133 | + * @param RequestInterface $request |
|
134 | + * @param ResponseInterface $response |
|
135 | + * @return bool |
|
136 | + */ |
|
137 | + public function fakeUnlockProvider(RequestInterface $request, |
|
138 | + ResponseInterface $response) { |
|
139 | + $response->setStatus(Http::STATUS_NO_CONTENT); |
|
140 | + $response->setHeader('Content-Length', '0'); |
|
141 | + return false; |
|
142 | + } |
|
143 | 143 | } |
@@ -116,7 +116,7 @@ |
||
116 | 116 | $res['group'] = []; |
117 | 117 | $res['group']['enabled'] = $this->shareManager->allowGroupSharing(); |
118 | 118 | $res['group']['expire_date']['enabled'] = true; |
119 | - $res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL); |
|
119 | + $res['default_permissions'] = (int) $this->config->getAppValue('core', 'shareapi_default_permissions', (string) Constants::PERMISSION_ALL); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | //Federated sharing |
@@ -21,173 +21,173 @@ |
||
21 | 21 | * @package OCA\Files_Sharing |
22 | 22 | */ |
23 | 23 | class Capabilities implements ICapability { |
24 | - public function __construct( |
|
25 | - private IConfig $config, |
|
26 | - private readonly IAppConfig $appConfig, |
|
27 | - private IManager $shareManager, |
|
28 | - private IAppManager $appManager, |
|
29 | - ) { |
|
30 | - } |
|
31 | - |
|
32 | - /** |
|
33 | - * Return this classes capabilities |
|
34 | - * |
|
35 | - * @return array{ |
|
36 | - * files_sharing: array{ |
|
37 | - * api_enabled: bool, |
|
38 | - * public: array{ |
|
39 | - * enabled: bool, |
|
40 | - * password?: array{ |
|
41 | - * enforced: bool, |
|
42 | - * askForOptionalPassword: bool |
|
43 | - * }, |
|
44 | - * multiple_links?: bool, |
|
45 | - * expire_date?: array{ |
|
46 | - * enabled: bool, |
|
47 | - * days?: int, |
|
48 | - * enforced?: bool, |
|
49 | - * }, |
|
50 | - * expire_date_internal?: array{ |
|
51 | - * enabled: bool, |
|
52 | - * days?: int, |
|
53 | - * enforced?: bool, |
|
54 | - * }, |
|
55 | - * expire_date_remote?: array{ |
|
56 | - * enabled: bool, |
|
57 | - * days?: int, |
|
58 | - * enforced?: bool, |
|
59 | - * }, |
|
60 | - * send_mail?: bool, |
|
61 | - * upload?: bool, |
|
62 | - * upload_files_drop?: bool, |
|
63 | - * custom_tokens?: bool, |
|
64 | - * }, |
|
65 | - * user: array{ |
|
66 | - * send_mail: bool, |
|
67 | - * expire_date?: array{ |
|
68 | - * enabled: bool, |
|
69 | - * }, |
|
70 | - * }, |
|
71 | - * resharing: bool, |
|
72 | - * group_sharing?: bool, |
|
73 | - * group?: array{ |
|
74 | - * enabled: bool, |
|
75 | - * expire_date?: array{ |
|
76 | - * enabled: bool, |
|
77 | - * }, |
|
78 | - * }, |
|
79 | - * default_permissions?: int, |
|
80 | - * federation: array{ |
|
81 | - * outgoing: bool, |
|
82 | - * incoming: bool, |
|
83 | - * expire_date: array{ |
|
84 | - * enabled: bool, |
|
85 | - * }, |
|
86 | - * expire_date_supported: array{ |
|
87 | - * enabled: bool, |
|
88 | - * }, |
|
89 | - * }, |
|
90 | - * sharee: array{ |
|
91 | - * query_lookup_default: bool, |
|
92 | - * always_show_unique: bool, |
|
93 | - * }, |
|
94 | - * }, |
|
95 | - * } |
|
96 | - */ |
|
97 | - public function getCapabilities() { |
|
98 | - $res = []; |
|
99 | - |
|
100 | - if (!$this->shareManager->shareApiEnabled()) { |
|
101 | - $res['api_enabled'] = false; |
|
102 | - $res['public'] = ['enabled' => false]; |
|
103 | - $res['user'] = ['send_mail' => false]; |
|
104 | - $res['resharing'] = false; |
|
105 | - } else { |
|
106 | - $res['api_enabled'] = true; |
|
107 | - |
|
108 | - $public = []; |
|
109 | - $public['enabled'] = $this->shareManager->shareApiAllowLinks(); |
|
110 | - if ($public['enabled']) { |
|
111 | - $public['password'] = []; |
|
112 | - $public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword(); |
|
113 | - |
|
114 | - if ($public['password']['enforced']) { |
|
115 | - $public['password']['askForOptionalPassword'] = false; |
|
116 | - } else { |
|
117 | - $public['password']['askForOptionalPassword'] = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT); |
|
118 | - } |
|
119 | - |
|
120 | - $public['expire_date'] = []; |
|
121 | - $public['multiple_links'] = true; |
|
122 | - $public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate(); |
|
123 | - if ($public['expire_date']['enabled']) { |
|
124 | - $public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays(); |
|
125 | - $public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced(); |
|
126 | - } |
|
127 | - |
|
128 | - $public['expire_date_internal'] = []; |
|
129 | - $public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate(); |
|
130 | - if ($public['expire_date_internal']['enabled']) { |
|
131 | - $public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays(); |
|
132 | - $public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced(); |
|
133 | - } |
|
134 | - |
|
135 | - $public['expire_date_remote'] = []; |
|
136 | - $public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate(); |
|
137 | - if ($public['expire_date_remote']['enabled']) { |
|
138 | - $public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays(); |
|
139 | - $public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced(); |
|
140 | - } |
|
141 | - |
|
142 | - $public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes'; |
|
143 | - $public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload(); |
|
144 | - $public['upload_files_drop'] = $public['upload']; |
|
145 | - $public['custom_tokens'] = $this->shareManager->allowCustomTokens(); |
|
146 | - } |
|
147 | - $res['public'] = $public; |
|
148 | - |
|
149 | - $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes'; |
|
150 | - |
|
151 | - $res['user']['send_mail'] = false; |
|
152 | - $res['user']['expire_date']['enabled'] = true; |
|
153 | - |
|
154 | - // deprecated in favour of 'group', but we need to keep it for now |
|
155 | - // in order to stay compatible with older clients |
|
156 | - $res['group_sharing'] = $this->shareManager->allowGroupSharing(); |
|
157 | - |
|
158 | - $res['group'] = []; |
|
159 | - $res['group']['enabled'] = $this->shareManager->allowGroupSharing(); |
|
160 | - $res['group']['expire_date']['enabled'] = true; |
|
161 | - $res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL); |
|
162 | - } |
|
163 | - |
|
164 | - //Federated sharing |
|
165 | - if ($this->appManager->isEnabledForAnyone('federation')) { |
|
166 | - $res['federation'] = [ |
|
167 | - 'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(), |
|
168 | - 'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes', |
|
169 | - // old bogus one, expire_date was not working before, keeping for compatibility |
|
170 | - 'expire_date' => ['enabled' => true], |
|
171 | - // the real deal, signifies that expiration date can be set on federated shares |
|
172 | - 'expire_date_supported' => ['enabled' => true], |
|
173 | - ]; |
|
174 | - } else { |
|
175 | - $res['federation'] = [ |
|
176 | - 'outgoing' => false, |
|
177 | - 'incoming' => false, |
|
178 | - 'expire_date' => ['enabled' => false], |
|
179 | - 'expire_date_supported' => ['enabled' => false], |
|
180 | - ]; |
|
181 | - } |
|
182 | - |
|
183 | - // Sharee searches |
|
184 | - $res['sharee'] = [ |
|
185 | - 'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false), |
|
186 | - 'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes', |
|
187 | - ]; |
|
188 | - |
|
189 | - return [ |
|
190 | - 'files_sharing' => $res, |
|
191 | - ]; |
|
192 | - } |
|
24 | + public function __construct( |
|
25 | + private IConfig $config, |
|
26 | + private readonly IAppConfig $appConfig, |
|
27 | + private IManager $shareManager, |
|
28 | + private IAppManager $appManager, |
|
29 | + ) { |
|
30 | + } |
|
31 | + |
|
32 | + /** |
|
33 | + * Return this classes capabilities |
|
34 | + * |
|
35 | + * @return array{ |
|
36 | + * files_sharing: array{ |
|
37 | + * api_enabled: bool, |
|
38 | + * public: array{ |
|
39 | + * enabled: bool, |
|
40 | + * password?: array{ |
|
41 | + * enforced: bool, |
|
42 | + * askForOptionalPassword: bool |
|
43 | + * }, |
|
44 | + * multiple_links?: bool, |
|
45 | + * expire_date?: array{ |
|
46 | + * enabled: bool, |
|
47 | + * days?: int, |
|
48 | + * enforced?: bool, |
|
49 | + * }, |
|
50 | + * expire_date_internal?: array{ |
|
51 | + * enabled: bool, |
|
52 | + * days?: int, |
|
53 | + * enforced?: bool, |
|
54 | + * }, |
|
55 | + * expire_date_remote?: array{ |
|
56 | + * enabled: bool, |
|
57 | + * days?: int, |
|
58 | + * enforced?: bool, |
|
59 | + * }, |
|
60 | + * send_mail?: bool, |
|
61 | + * upload?: bool, |
|
62 | + * upload_files_drop?: bool, |
|
63 | + * custom_tokens?: bool, |
|
64 | + * }, |
|
65 | + * user: array{ |
|
66 | + * send_mail: bool, |
|
67 | + * expire_date?: array{ |
|
68 | + * enabled: bool, |
|
69 | + * }, |
|
70 | + * }, |
|
71 | + * resharing: bool, |
|
72 | + * group_sharing?: bool, |
|
73 | + * group?: array{ |
|
74 | + * enabled: bool, |
|
75 | + * expire_date?: array{ |
|
76 | + * enabled: bool, |
|
77 | + * }, |
|
78 | + * }, |
|
79 | + * default_permissions?: int, |
|
80 | + * federation: array{ |
|
81 | + * outgoing: bool, |
|
82 | + * incoming: bool, |
|
83 | + * expire_date: array{ |
|
84 | + * enabled: bool, |
|
85 | + * }, |
|
86 | + * expire_date_supported: array{ |
|
87 | + * enabled: bool, |
|
88 | + * }, |
|
89 | + * }, |
|
90 | + * sharee: array{ |
|
91 | + * query_lookup_default: bool, |
|
92 | + * always_show_unique: bool, |
|
93 | + * }, |
|
94 | + * }, |
|
95 | + * } |
|
96 | + */ |
|
97 | + public function getCapabilities() { |
|
98 | + $res = []; |
|
99 | + |
|
100 | + if (!$this->shareManager->shareApiEnabled()) { |
|
101 | + $res['api_enabled'] = false; |
|
102 | + $res['public'] = ['enabled' => false]; |
|
103 | + $res['user'] = ['send_mail' => false]; |
|
104 | + $res['resharing'] = false; |
|
105 | + } else { |
|
106 | + $res['api_enabled'] = true; |
|
107 | + |
|
108 | + $public = []; |
|
109 | + $public['enabled'] = $this->shareManager->shareApiAllowLinks(); |
|
110 | + if ($public['enabled']) { |
|
111 | + $public['password'] = []; |
|
112 | + $public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword(); |
|
113 | + |
|
114 | + if ($public['password']['enforced']) { |
|
115 | + $public['password']['askForOptionalPassword'] = false; |
|
116 | + } else { |
|
117 | + $public['password']['askForOptionalPassword'] = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT); |
|
118 | + } |
|
119 | + |
|
120 | + $public['expire_date'] = []; |
|
121 | + $public['multiple_links'] = true; |
|
122 | + $public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate(); |
|
123 | + if ($public['expire_date']['enabled']) { |
|
124 | + $public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays(); |
|
125 | + $public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced(); |
|
126 | + } |
|
127 | + |
|
128 | + $public['expire_date_internal'] = []; |
|
129 | + $public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate(); |
|
130 | + if ($public['expire_date_internal']['enabled']) { |
|
131 | + $public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays(); |
|
132 | + $public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced(); |
|
133 | + } |
|
134 | + |
|
135 | + $public['expire_date_remote'] = []; |
|
136 | + $public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate(); |
|
137 | + if ($public['expire_date_remote']['enabled']) { |
|
138 | + $public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays(); |
|
139 | + $public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced(); |
|
140 | + } |
|
141 | + |
|
142 | + $public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes'; |
|
143 | + $public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload(); |
|
144 | + $public['upload_files_drop'] = $public['upload']; |
|
145 | + $public['custom_tokens'] = $this->shareManager->allowCustomTokens(); |
|
146 | + } |
|
147 | + $res['public'] = $public; |
|
148 | + |
|
149 | + $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes'; |
|
150 | + |
|
151 | + $res['user']['send_mail'] = false; |
|
152 | + $res['user']['expire_date']['enabled'] = true; |
|
153 | + |
|
154 | + // deprecated in favour of 'group', but we need to keep it for now |
|
155 | + // in order to stay compatible with older clients |
|
156 | + $res['group_sharing'] = $this->shareManager->allowGroupSharing(); |
|
157 | + |
|
158 | + $res['group'] = []; |
|
159 | + $res['group']['enabled'] = $this->shareManager->allowGroupSharing(); |
|
160 | + $res['group']['expire_date']['enabled'] = true; |
|
161 | + $res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL); |
|
162 | + } |
|
163 | + |
|
164 | + //Federated sharing |
|
165 | + if ($this->appManager->isEnabledForAnyone('federation')) { |
|
166 | + $res['federation'] = [ |
|
167 | + 'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(), |
|
168 | + 'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes', |
|
169 | + // old bogus one, expire_date was not working before, keeping for compatibility |
|
170 | + 'expire_date' => ['enabled' => true], |
|
171 | + // the real deal, signifies that expiration date can be set on federated shares |
|
172 | + 'expire_date_supported' => ['enabled' => true], |
|
173 | + ]; |
|
174 | + } else { |
|
175 | + $res['federation'] = [ |
|
176 | + 'outgoing' => false, |
|
177 | + 'incoming' => false, |
|
178 | + 'expire_date' => ['enabled' => false], |
|
179 | + 'expire_date_supported' => ['enabled' => false], |
|
180 | + ]; |
|
181 | + } |
|
182 | + |
|
183 | + // Sharee searches |
|
184 | + $res['sharee'] = [ |
|
185 | + 'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false), |
|
186 | + 'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes', |
|
187 | + ]; |
|
188 | + |
|
189 | + return [ |
|
190 | + 'files_sharing' => $res, |
|
191 | + ]; |
|
192 | + } |
|
193 | 193 | } |
@@ -29,22 +29,22 @@ |
||
29 | 29 | */ |
30 | 30 | trait PriorityTrait { |
31 | 31 | |
32 | - /** @var int initial priority */ |
|
33 | - protected $priority = BackendService::PRIORITY_DEFAULT; |
|
32 | + /** @var int initial priority */ |
|
33 | + protected $priority = BackendService::PRIORITY_DEFAULT; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return int |
|
37 | - */ |
|
38 | - public function getPriority() { |
|
39 | - return $this->priority; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return int |
|
37 | + */ |
|
38 | + public function getPriority() { |
|
39 | + return $this->priority; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param int $priority |
|
44 | - * @return self |
|
45 | - */ |
|
46 | - public function setPriority($priority) { |
|
47 | - $this->priority = $priority; |
|
48 | - return $this; |
|
49 | - } |
|
42 | + /** |
|
43 | + * @param int $priority |
|
44 | + * @return self |
|
45 | + */ |
|
46 | + public function setPriority($priority) { |
|
47 | + $this->priority = $priority; |
|
48 | + return $this; |
|
49 | + } |
|
50 | 50 | } |
@@ -28,41 +28,41 @@ |
||
28 | 28 | */ |
29 | 29 | trait LegacyDependencyCheckPolyfill { |
30 | 30 | |
31 | - /** |
|
32 | - * @return class-string<IStorage> |
|
33 | - */ |
|
34 | - abstract public function getStorageClass(); |
|
31 | + /** |
|
32 | + * @return class-string<IStorage> |
|
33 | + */ |
|
34 | + abstract public function getStorageClass(); |
|
35 | 35 | |
36 | - /** |
|
37 | - * Check if object is valid for use |
|
38 | - * |
|
39 | - * @return MissingDependency[] Unsatisfied dependencies |
|
40 | - */ |
|
41 | - public function checkDependencies() { |
|
42 | - $ret = []; |
|
36 | + /** |
|
37 | + * Check if object is valid for use |
|
38 | + * |
|
39 | + * @return MissingDependency[] Unsatisfied dependencies |
|
40 | + */ |
|
41 | + public function checkDependencies() { |
|
42 | + $ret = []; |
|
43 | 43 | |
44 | - $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
45 | - if ($result !== true) { |
|
46 | - if (!is_array($result)) { |
|
47 | - $result = [$result]; |
|
48 | - } |
|
49 | - foreach ($result as $key => $value) { |
|
50 | - if (!($value instanceof MissingDependency)) { |
|
51 | - $module = null; |
|
52 | - $message = null; |
|
53 | - if (is_numeric($key)) { |
|
54 | - $module = $value; |
|
55 | - } else { |
|
56 | - $module = $key; |
|
57 | - $message = $value; |
|
58 | - } |
|
59 | - $value = new MissingDependency($module); |
|
60 | - $value->setMessage($message); |
|
61 | - } |
|
62 | - $ret[] = $value; |
|
63 | - } |
|
64 | - } |
|
44 | + $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
45 | + if ($result !== true) { |
|
46 | + if (!is_array($result)) { |
|
47 | + $result = [$result]; |
|
48 | + } |
|
49 | + foreach ($result as $key => $value) { |
|
50 | + if (!($value instanceof MissingDependency)) { |
|
51 | + $module = null; |
|
52 | + $message = null; |
|
53 | + if (is_numeric($key)) { |
|
54 | + $module = $value; |
|
55 | + } else { |
|
56 | + $module = $key; |
|
57 | + $message = $value; |
|
58 | + } |
|
59 | + $value = new MissingDependency($module); |
|
60 | + $value->setMessage($message); |
|
61 | + } |
|
62 | + $ret[] = $value; |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | - return $ret; |
|
67 | - } |
|
66 | + return $ret; |
|
67 | + } |
|
68 | 68 | } |
@@ -21,36 +21,36 @@ |
||
21 | 21 | |
22 | 22 | interface IFrontendDefinition { |
23 | 23 | |
24 | - public function getText(): string; |
|
24 | + public function getText(): string; |
|
25 | 25 | |
26 | - public function setText(string $text): self; |
|
26 | + public function setText(string $text): self; |
|
27 | 27 | |
28 | - /** |
|
29 | - * @return array<string, DefinitionParameter> |
|
30 | - */ |
|
31 | - public function getParameters(): array; |
|
28 | + /** |
|
29 | + * @return array<string, DefinitionParameter> |
|
30 | + */ |
|
31 | + public function getParameters(): array; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param list<DefinitionParameter> $parameters |
|
35 | - */ |
|
36 | - public function addParameters(array $parameters): self; |
|
33 | + /** |
|
34 | + * @param list<DefinitionParameter> $parameters |
|
35 | + */ |
|
36 | + public function addParameters(array $parameters): self; |
|
37 | 37 | |
38 | - public function addParameter(DefinitionParameter $parameter): self; |
|
38 | + public function addParameter(DefinitionParameter $parameter): self; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string[] |
|
42 | - */ |
|
43 | - public function getCustomJs(): array; |
|
40 | + /** |
|
41 | + * @return string[] |
|
42 | + */ |
|
43 | + public function getCustomJs(): array; |
|
44 | 44 | |
45 | - public function addCustomJs(string $custom): self; |
|
45 | + public function addCustomJs(string $custom): self; |
|
46 | 46 | |
47 | - /** |
|
48 | - * Serialize into JSON for client-side JS |
|
49 | - */ |
|
50 | - public function jsonSerializeDefinition(): array; |
|
47 | + /** |
|
48 | + * Serialize into JSON for client-side JS |
|
49 | + */ |
|
50 | + public function jsonSerializeDefinition(): array; |
|
51 | 51 | |
52 | - /** |
|
53 | - * Check if parameters are satisfied in a StorageConfig |
|
54 | - */ |
|
55 | - public function validateStorageDefinition(StorageConfig $storage): bool; |
|
52 | + /** |
|
53 | + * Check if parameters are satisfied in a StorageConfig |
|
54 | + */ |
|
55 | + public function validateStorageDefinition(StorageConfig $storage): bool; |
|
56 | 56 | } |
@@ -59,102 +59,102 @@ |
||
59 | 59 | * Object can affect storage mounting |
60 | 60 | */ |
61 | 61 | class Backend implements \JsonSerializable, IIdentifier, IFrontendDefinition { |
62 | - use VisibilityTrait; |
|
63 | - use FrontendDefinitionTrait; |
|
64 | - use PriorityTrait; |
|
65 | - use DependencyTrait; |
|
66 | - use StorageModifierTrait; |
|
67 | - use IdentifierTrait; |
|
68 | - |
|
69 | - /** @var string storage class */ |
|
70 | - private $storageClass; |
|
71 | - |
|
72 | - /** @var array 'scheme' => true, supported authentication schemes */ |
|
73 | - private $authSchemes = []; |
|
74 | - |
|
75 | - /** @var AuthMechanism|callable authentication mechanism fallback */ |
|
76 | - private $legacyAuthMechanism; |
|
77 | - |
|
78 | - /** |
|
79 | - * @return class-string<IStorage> |
|
80 | - */ |
|
81 | - public function getStorageClass() { |
|
82 | - return $this->storageClass; |
|
83 | - } |
|
84 | - |
|
85 | - /** |
|
86 | - * @param string $class |
|
87 | - * @return $this |
|
88 | - */ |
|
89 | - public function setStorageClass($class) { |
|
90 | - $this->storageClass = $class; |
|
91 | - return $this; |
|
92 | - } |
|
93 | - |
|
94 | - /** |
|
95 | - * @return array |
|
96 | - */ |
|
97 | - public function getAuthSchemes() { |
|
98 | - if (empty($this->authSchemes)) { |
|
99 | - return [AuthMechanism::SCHEME_NULL => true]; |
|
100 | - } |
|
101 | - return $this->authSchemes; |
|
102 | - } |
|
103 | - |
|
104 | - /** |
|
105 | - * @param string $scheme |
|
106 | - * @return self |
|
107 | - */ |
|
108 | - public function addAuthScheme($scheme) { |
|
109 | - $this->authSchemes[$scheme] = true; |
|
110 | - return $this; |
|
111 | - } |
|
112 | - |
|
113 | - /** |
|
114 | - * @param array $parameters storage parameters, for dynamic mechanism selection |
|
115 | - * @return AuthMechanism |
|
116 | - */ |
|
117 | - public function getLegacyAuthMechanism(array $parameters = []) { |
|
118 | - if (is_callable($this->legacyAuthMechanism)) { |
|
119 | - return call_user_func($this->legacyAuthMechanism, $parameters); |
|
120 | - } |
|
121 | - return $this->legacyAuthMechanism; |
|
122 | - } |
|
123 | - |
|
124 | - public function setLegacyAuthMechanism(AuthMechanism $authMechanism): self { |
|
125 | - $this->legacyAuthMechanism = $authMechanism; |
|
126 | - return $this; |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * @param callable $callback dynamic auth mechanism selection |
|
131 | - */ |
|
132 | - public function setLegacyAuthMechanismCallback(callable $callback): self { |
|
133 | - $this->legacyAuthMechanism = $callback; |
|
134 | - return $this; |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * Serialize into JSON for client-side JS |
|
139 | - */ |
|
140 | - public function jsonSerialize(): array { |
|
141 | - $data = $this->jsonSerializeDefinition(); |
|
142 | - $data += $this->jsonSerializeIdentifier(); |
|
143 | - |
|
144 | - $data['backend'] = $data['name']; // legacy compat |
|
145 | - $data['priority'] = $this->getPriority(); |
|
146 | - $data['authSchemes'] = $this->getAuthSchemes(); |
|
147 | - |
|
148 | - return $data; |
|
149 | - } |
|
150 | - |
|
151 | - /** |
|
152 | - * Check if parameters are satisfied in a StorageConfig |
|
153 | - * |
|
154 | - * @param StorageConfig $storage |
|
155 | - * @return bool |
|
156 | - */ |
|
157 | - public function validateStorage(StorageConfig $storage) { |
|
158 | - return $this->validateStorageDefinition($storage); |
|
159 | - } |
|
62 | + use VisibilityTrait; |
|
63 | + use FrontendDefinitionTrait; |
|
64 | + use PriorityTrait; |
|
65 | + use DependencyTrait; |
|
66 | + use StorageModifierTrait; |
|
67 | + use IdentifierTrait; |
|
68 | + |
|
69 | + /** @var string storage class */ |
|
70 | + private $storageClass; |
|
71 | + |
|
72 | + /** @var array 'scheme' => true, supported authentication schemes */ |
|
73 | + private $authSchemes = []; |
|
74 | + |
|
75 | + /** @var AuthMechanism|callable authentication mechanism fallback */ |
|
76 | + private $legacyAuthMechanism; |
|
77 | + |
|
78 | + /** |
|
79 | + * @return class-string<IStorage> |
|
80 | + */ |
|
81 | + public function getStorageClass() { |
|
82 | + return $this->storageClass; |
|
83 | + } |
|
84 | + |
|
85 | + /** |
|
86 | + * @param string $class |
|
87 | + * @return $this |
|
88 | + */ |
|
89 | + public function setStorageClass($class) { |
|
90 | + $this->storageClass = $class; |
|
91 | + return $this; |
|
92 | + } |
|
93 | + |
|
94 | + /** |
|
95 | + * @return array |
|
96 | + */ |
|
97 | + public function getAuthSchemes() { |
|
98 | + if (empty($this->authSchemes)) { |
|
99 | + return [AuthMechanism::SCHEME_NULL => true]; |
|
100 | + } |
|
101 | + return $this->authSchemes; |
|
102 | + } |
|
103 | + |
|
104 | + /** |
|
105 | + * @param string $scheme |
|
106 | + * @return self |
|
107 | + */ |
|
108 | + public function addAuthScheme($scheme) { |
|
109 | + $this->authSchemes[$scheme] = true; |
|
110 | + return $this; |
|
111 | + } |
|
112 | + |
|
113 | + /** |
|
114 | + * @param array $parameters storage parameters, for dynamic mechanism selection |
|
115 | + * @return AuthMechanism |
|
116 | + */ |
|
117 | + public function getLegacyAuthMechanism(array $parameters = []) { |
|
118 | + if (is_callable($this->legacyAuthMechanism)) { |
|
119 | + return call_user_func($this->legacyAuthMechanism, $parameters); |
|
120 | + } |
|
121 | + return $this->legacyAuthMechanism; |
|
122 | + } |
|
123 | + |
|
124 | + public function setLegacyAuthMechanism(AuthMechanism $authMechanism): self { |
|
125 | + $this->legacyAuthMechanism = $authMechanism; |
|
126 | + return $this; |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * @param callable $callback dynamic auth mechanism selection |
|
131 | + */ |
|
132 | + public function setLegacyAuthMechanismCallback(callable $callback): self { |
|
133 | + $this->legacyAuthMechanism = $callback; |
|
134 | + return $this; |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * Serialize into JSON for client-side JS |
|
139 | + */ |
|
140 | + public function jsonSerialize(): array { |
|
141 | + $data = $this->jsonSerializeDefinition(); |
|
142 | + $data += $this->jsonSerializeIdentifier(); |
|
143 | + |
|
144 | + $data['backend'] = $data['name']; // legacy compat |
|
145 | + $data['priority'] = $this->getPriority(); |
|
146 | + $data['authSchemes'] = $this->getAuthSchemes(); |
|
147 | + |
|
148 | + return $data; |
|
149 | + } |
|
150 | + |
|
151 | + /** |
|
152 | + * Check if parameters are satisfied in a StorageConfig |
|
153 | + * |
|
154 | + * @param StorageConfig $storage |
|
155 | + * @return bool |
|
156 | + */ |
|
157 | + public function validateStorage(StorageConfig $storage) { |
|
158 | + return $this->validateStorageDefinition($storage); |
|
159 | + } |
|
160 | 160 | } |