@@ -7,23 +7,23 @@ |
||
7 | 7 | |
8 | 8 | class RootCollection extends AbstractPrincipalCollection { |
9 | 9 | |
10 | - /** |
|
11 | - * This method returns a node for a principal. |
|
12 | - * |
|
13 | - * The passed array contains principal information, and is guaranteed to |
|
14 | - * at least contain a uri item. Other properties may or may not be |
|
15 | - * supplied by the authentication backend. |
|
16 | - * |
|
17 | - * @param array $principalInfo |
|
18 | - * @return AvatarHome |
|
19 | - */ |
|
20 | - public function getChildForPrincipal(array $principalInfo) { |
|
21 | - $avatarManager = \OC::$server->getAvatarManager(); |
|
22 | - return new AvatarHome($principalInfo, $avatarManager); |
|
23 | - } |
|
10 | + /** |
|
11 | + * This method returns a node for a principal. |
|
12 | + * |
|
13 | + * The passed array contains principal information, and is guaranteed to |
|
14 | + * at least contain a uri item. Other properties may or may not be |
|
15 | + * supplied by the authentication backend. |
|
16 | + * |
|
17 | + * @param array $principalInfo |
|
18 | + * @return AvatarHome |
|
19 | + */ |
|
20 | + public function getChildForPrincipal(array $principalInfo) { |
|
21 | + $avatarManager = \OC::$server->getAvatarManager(); |
|
22 | + return new AvatarHome($principalInfo, $avatarManager); |
|
23 | + } |
|
24 | 24 | |
25 | - public function getName() { |
|
26 | - return 'avatars'; |
|
27 | - } |
|
25 | + public function getName() { |
|
26 | + return 'avatars'; |
|
27 | + } |
|
28 | 28 | |
29 | 29 | } |
@@ -33,87 +33,87 @@ |
||
33 | 33 | |
34 | 34 | class CalDAVRemoveEmptyValue implements IRepairStep { |
35 | 35 | |
36 | - /** @var IDBConnection */ |
|
37 | - private $db; |
|
38 | - |
|
39 | - /** @var CalDavBackend */ |
|
40 | - private $calDavBackend; |
|
41 | - |
|
42 | - /** @var ILogger */ |
|
43 | - private $logger; |
|
44 | - |
|
45 | - /** |
|
46 | - * @param IDBConnection $db |
|
47 | - * @param CalDavBackend $calDavBackend |
|
48 | - * @param ILogger $logger |
|
49 | - */ |
|
50 | - public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) { |
|
51 | - $this->db = $db; |
|
52 | - $this->calDavBackend = $calDavBackend; |
|
53 | - $this->logger = $logger; |
|
54 | - } |
|
55 | - |
|
56 | - public function getName() { |
|
57 | - return 'Fix broken values of calendar objects'; |
|
58 | - } |
|
59 | - |
|
60 | - public function run(IOutput $output) { |
|
61 | - $pattern = ';VALUE=:'; |
|
62 | - $count = $warnings = 0; |
|
63 | - |
|
64 | - $objects = $this->getInvalidObjects($pattern); |
|
65 | - |
|
66 | - $output->startProgress(count($objects)); |
|
67 | - foreach ($objects as $row) { |
|
68 | - $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']); |
|
69 | - $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']); |
|
70 | - |
|
71 | - if ($data !== $calObject['calendardata']) { |
|
72 | - $output->advance(); |
|
73 | - |
|
74 | - try { |
|
75 | - $this->calDavBackend->getDenormalizedData($data); |
|
76 | - } catch (InvalidDataException $e) { |
|
77 | - $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [ |
|
78 | - 'app' => 'dav', |
|
79 | - 'cal' => (int)$row['calendarid'], |
|
80 | - 'uri' => $row['uri'], |
|
81 | - ]); |
|
82 | - $warnings++; |
|
83 | - continue; |
|
84 | - } |
|
85 | - |
|
86 | - $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data); |
|
87 | - $count++; |
|
88 | - } |
|
89 | - } |
|
90 | - $output->finishProgress(); |
|
91 | - |
|
92 | - if ($warnings > 0) { |
|
93 | - $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings)); |
|
94 | - } |
|
95 | - if ($count > 0) { |
|
96 | - $output->info(sprintf('Updated %d events', $count)); |
|
97 | - } |
|
98 | - } |
|
99 | - |
|
100 | - protected function getInvalidObjects($pattern) { |
|
101 | - $query = $this->db->getQueryBuilder(); |
|
102 | - $query->select(['calendarid', 'uri']) |
|
103 | - ->from('calendarobjects') |
|
104 | - ->where($query->expr()->like( |
|
105 | - 'calendardata', |
|
106 | - $query->createNamedParameter( |
|
107 | - '%' . $this->db->escapeLikeParameter($pattern) . '%', |
|
108 | - IQueryBuilder::PARAM_STR |
|
109 | - ), |
|
110 | - IQueryBuilder::PARAM_STR |
|
111 | - )); |
|
112 | - |
|
113 | - $result = $query->execute(); |
|
114 | - $rows = $result->fetchAll(); |
|
115 | - $result->closeCursor(); |
|
116 | - |
|
117 | - return $rows; |
|
118 | - } |
|
36 | + /** @var IDBConnection */ |
|
37 | + private $db; |
|
38 | + |
|
39 | + /** @var CalDavBackend */ |
|
40 | + private $calDavBackend; |
|
41 | + |
|
42 | + /** @var ILogger */ |
|
43 | + private $logger; |
|
44 | + |
|
45 | + /** |
|
46 | + * @param IDBConnection $db |
|
47 | + * @param CalDavBackend $calDavBackend |
|
48 | + * @param ILogger $logger |
|
49 | + */ |
|
50 | + public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) { |
|
51 | + $this->db = $db; |
|
52 | + $this->calDavBackend = $calDavBackend; |
|
53 | + $this->logger = $logger; |
|
54 | + } |
|
55 | + |
|
56 | + public function getName() { |
|
57 | + return 'Fix broken values of calendar objects'; |
|
58 | + } |
|
59 | + |
|
60 | + public function run(IOutput $output) { |
|
61 | + $pattern = ';VALUE=:'; |
|
62 | + $count = $warnings = 0; |
|
63 | + |
|
64 | + $objects = $this->getInvalidObjects($pattern); |
|
65 | + |
|
66 | + $output->startProgress(count($objects)); |
|
67 | + foreach ($objects as $row) { |
|
68 | + $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']); |
|
69 | + $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']); |
|
70 | + |
|
71 | + if ($data !== $calObject['calendardata']) { |
|
72 | + $output->advance(); |
|
73 | + |
|
74 | + try { |
|
75 | + $this->calDavBackend->getDenormalizedData($data); |
|
76 | + } catch (InvalidDataException $e) { |
|
77 | + $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [ |
|
78 | + 'app' => 'dav', |
|
79 | + 'cal' => (int)$row['calendarid'], |
|
80 | + 'uri' => $row['uri'], |
|
81 | + ]); |
|
82 | + $warnings++; |
|
83 | + continue; |
|
84 | + } |
|
85 | + |
|
86 | + $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data); |
|
87 | + $count++; |
|
88 | + } |
|
89 | + } |
|
90 | + $output->finishProgress(); |
|
91 | + |
|
92 | + if ($warnings > 0) { |
|
93 | + $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings)); |
|
94 | + } |
|
95 | + if ($count > 0) { |
|
96 | + $output->info(sprintf('Updated %d events', $count)); |
|
97 | + } |
|
98 | + } |
|
99 | + |
|
100 | + protected function getInvalidObjects($pattern) { |
|
101 | + $query = $this->db->getQueryBuilder(); |
|
102 | + $query->select(['calendarid', 'uri']) |
|
103 | + ->from('calendarobjects') |
|
104 | + ->where($query->expr()->like( |
|
105 | + 'calendardata', |
|
106 | + $query->createNamedParameter( |
|
107 | + '%' . $this->db->escapeLikeParameter($pattern) . '%', |
|
108 | + IQueryBuilder::PARAM_STR |
|
109 | + ), |
|
110 | + IQueryBuilder::PARAM_STR |
|
111 | + )); |
|
112 | + |
|
113 | + $result = $query->execute(); |
|
114 | + $rows = $result->fetchAll(); |
|
115 | + $result->closeCursor(); |
|
116 | + |
|
117 | + return $rows; |
|
118 | + } |
|
119 | 119 | } |
@@ -27,21 +27,21 @@ |
||
27 | 27 | |
28 | 28 | class CompFilter implements XmlDeserializable { |
29 | 29 | |
30 | - /** |
|
31 | - * @param Reader $reader |
|
32 | - * @throws BadRequest |
|
33 | - * @return string |
|
34 | - */ |
|
35 | - static function xmlDeserialize(Reader $reader) { |
|
36 | - $att = $reader->parseAttributes(); |
|
37 | - $componentName = $att['name']; |
|
30 | + /** |
|
31 | + * @param Reader $reader |
|
32 | + * @throws BadRequest |
|
33 | + * @return string |
|
34 | + */ |
|
35 | + static function xmlDeserialize(Reader $reader) { |
|
36 | + $att = $reader->parseAttributes(); |
|
37 | + $componentName = $att['name']; |
|
38 | 38 | |
39 | - $reader->parseInnerTree(); |
|
39 | + $reader->parseInnerTree(); |
|
40 | 40 | |
41 | - if (!is_string($componentName)) { |
|
42 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}comp-filter requires a valid name attribute'); |
|
43 | - } |
|
41 | + if (!is_string($componentName)) { |
|
42 | + throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}comp-filter requires a valid name attribute'); |
|
43 | + } |
|
44 | 44 | |
45 | - return $componentName; |
|
46 | - } |
|
45 | + return $componentName; |
|
46 | + } |
|
47 | 47 | } |
@@ -27,17 +27,17 @@ |
||
27 | 27 | |
28 | 28 | class SearchTermFilter implements XmlDeserializable { |
29 | 29 | |
30 | - /** |
|
31 | - * @param Reader $reader |
|
32 | - * @throws BadRequest |
|
33 | - * @return string |
|
34 | - */ |
|
35 | - static function xmlDeserialize(Reader $reader) { |
|
36 | - $value = $reader->parseInnerTree(); |
|
37 | - if (!is_string($value)) { |
|
38 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value'); |
|
39 | - } |
|
30 | + /** |
|
31 | + * @param Reader $reader |
|
32 | + * @throws BadRequest |
|
33 | + * @return string |
|
34 | + */ |
|
35 | + static function xmlDeserialize(Reader $reader) { |
|
36 | + $value = $reader->parseInnerTree(); |
|
37 | + if (!is_string($value)) { |
|
38 | + throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value'); |
|
39 | + } |
|
40 | 40 | |
41 | - return $value; |
|
42 | - } |
|
41 | + return $value; |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -27,21 +27,21 @@ |
||
27 | 27 | |
28 | 28 | class PropFilter implements XmlDeserializable { |
29 | 29 | |
30 | - /** |
|
31 | - * @param Reader $reader |
|
32 | - * @throws BadRequest |
|
33 | - * @return string |
|
34 | - */ |
|
35 | - static function xmlDeserialize(Reader $reader) { |
|
36 | - $att = $reader->parseAttributes(); |
|
37 | - $componentName = $att['name']; |
|
30 | + /** |
|
31 | + * @param Reader $reader |
|
32 | + * @throws BadRequest |
|
33 | + * @return string |
|
34 | + */ |
|
35 | + static function xmlDeserialize(Reader $reader) { |
|
36 | + $att = $reader->parseAttributes(); |
|
37 | + $componentName = $att['name']; |
|
38 | 38 | |
39 | - $reader->parseInnerTree(); |
|
39 | + $reader->parseInnerTree(); |
|
40 | 40 | |
41 | - if (!is_string($componentName)) { |
|
42 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute'); |
|
43 | - } |
|
41 | + if (!is_string($componentName)) { |
|
42 | + throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute'); |
|
43 | + } |
|
44 | 44 | |
45 | - return $componentName; |
|
46 | - } |
|
45 | + return $componentName; |
|
46 | + } |
|
47 | 47 | } |
@@ -27,29 +27,29 @@ |
||
27 | 27 | |
28 | 28 | class ParamFilter implements XmlDeserializable { |
29 | 29 | |
30 | - /** |
|
31 | - * @param Reader $reader |
|
32 | - * @throws BadRequest |
|
33 | - * @return string |
|
34 | - */ |
|
35 | - static function xmlDeserialize(Reader $reader) { |
|
36 | - $att = $reader->parseAttributes(); |
|
37 | - $property = $att['property']; |
|
38 | - $parameter = $att['name']; |
|
30 | + /** |
|
31 | + * @param Reader $reader |
|
32 | + * @throws BadRequest |
|
33 | + * @return string |
|
34 | + */ |
|
35 | + static function xmlDeserialize(Reader $reader) { |
|
36 | + $att = $reader->parseAttributes(); |
|
37 | + $property = $att['property']; |
|
38 | + $parameter = $att['name']; |
|
39 | 39 | |
40 | - $reader->parseInnerTree(); |
|
40 | + $reader->parseInnerTree(); |
|
41 | 41 | |
42 | - if (!is_string($property)) { |
|
43 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute'); |
|
42 | + if (!is_string($property)) { |
|
43 | + throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute'); |
|
44 | 44 | |
45 | - } |
|
46 | - if (!is_string($parameter)) { |
|
47 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute'); |
|
48 | - } |
|
45 | + } |
|
46 | + if (!is_string($parameter)) { |
|
47 | + throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute'); |
|
48 | + } |
|
49 | 49 | |
50 | - return [ |
|
51 | - 'property' => $property, |
|
52 | - 'parameter' => $parameter, |
|
53 | - ]; |
|
54 | - } |
|
50 | + return [ |
|
51 | + 'property' => $property, |
|
52 | + 'parameter' => $parameter, |
|
53 | + ]; |
|
54 | + } |
|
55 | 55 | } |
@@ -34,258 +34,258 @@ |
||
34 | 34 | |
35 | 35 | class CustomPropertiesBackend implements BackendInterface { |
36 | 36 | |
37 | - /** |
|
38 | - * Ignored properties |
|
39 | - * |
|
40 | - * @var array |
|
41 | - */ |
|
42 | - private $ignoredProperties = array( |
|
43 | - '{DAV:}getcontentlength', |
|
44 | - '{DAV:}getcontenttype', |
|
45 | - '{DAV:}getetag', |
|
46 | - '{DAV:}quota-used-bytes', |
|
47 | - '{DAV:}quota-available-bytes', |
|
48 | - '{http://owncloud.org/ns}permissions', |
|
49 | - '{http://owncloud.org/ns}downloadURL', |
|
50 | - '{http://owncloud.org/ns}dDC', |
|
51 | - '{http://owncloud.org/ns}size', |
|
52 | - ); |
|
53 | - |
|
54 | - /** |
|
55 | - * @var Tree |
|
56 | - */ |
|
57 | - private $tree; |
|
58 | - |
|
59 | - /** |
|
60 | - * @var IDBConnection |
|
61 | - */ |
|
62 | - private $connection; |
|
63 | - |
|
64 | - /** |
|
65 | - * @var string |
|
66 | - */ |
|
67 | - private $user; |
|
68 | - |
|
69 | - /** |
|
70 | - * Properties cache |
|
71 | - * |
|
72 | - * @var array |
|
73 | - */ |
|
74 | - private $cache = []; |
|
75 | - |
|
76 | - /** |
|
77 | - * @param Tree $tree node tree |
|
78 | - * @param IDBConnection $connection database connection |
|
79 | - * @param IUser $user owner of the tree and properties |
|
80 | - */ |
|
81 | - public function __construct( |
|
82 | - Tree $tree, |
|
83 | - IDBConnection $connection, |
|
84 | - IUser $user) { |
|
85 | - $this->tree = $tree; |
|
86 | - $this->connection = $connection; |
|
87 | - $this->user = $user->getUID(); |
|
88 | - } |
|
89 | - |
|
90 | - /** |
|
91 | - * Fetches properties for a path. |
|
92 | - * |
|
93 | - * @param string $path |
|
94 | - * @param PropFind $propFind |
|
95 | - * @return void |
|
96 | - */ |
|
97 | - public function propFind($path, PropFind $propFind) { |
|
98 | - |
|
99 | - $requestedProps = $propFind->get404Properties(); |
|
100 | - |
|
101 | - // these might appear |
|
102 | - $requestedProps = array_diff( |
|
103 | - $requestedProps, |
|
104 | - $this->ignoredProperties |
|
105 | - ); |
|
106 | - |
|
107 | - // substr of calendars/ => path is inside the CalDAV component |
|
108 | - // two '/' => this a calendar (no calendar-home nor calendar object) |
|
109 | - if (substr($path, 0, 10) === 'calendars/' && substr_count($path, '/') === 2) { |
|
110 | - $allRequestedProps = $propFind->getRequestedProperties(); |
|
111 | - $customPropertiesForShares = [ |
|
112 | - '{DAV:}displayname', |
|
113 | - '{urn:ietf:params:xml:ns:caldav}calendar-description', |
|
114 | - '{urn:ietf:params:xml:ns:caldav}calendar-timezone', |
|
115 | - '{http://apple.com/ns/ical/}calendar-order', |
|
116 | - '{http://apple.com/ns/ical/}calendar-color', |
|
117 | - '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp', |
|
118 | - ]; |
|
119 | - |
|
120 | - foreach ($customPropertiesForShares as $customPropertyForShares) { |
|
121 | - if (in_array($customPropertyForShares, $allRequestedProps)) { |
|
122 | - $requestedProps[] = $customPropertyForShares; |
|
123 | - } |
|
124 | - } |
|
125 | - } |
|
126 | - |
|
127 | - if (empty($requestedProps)) { |
|
128 | - return; |
|
129 | - } |
|
130 | - |
|
131 | - $props = $this->getProperties($path, $requestedProps); |
|
132 | - foreach ($props as $propName => $propValue) { |
|
133 | - $propFind->set($propName, $propValue); |
|
134 | - } |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * Updates properties for a path |
|
139 | - * |
|
140 | - * @param string $path |
|
141 | - * @param PropPatch $propPatch |
|
142 | - * |
|
143 | - * @return void |
|
144 | - */ |
|
145 | - public function propPatch($path, PropPatch $propPatch) { |
|
146 | - $propPatch->handleRemaining(function($changedProps) use ($path) { |
|
147 | - return $this->updateProperties($path, $changedProps); |
|
148 | - }); |
|
149 | - } |
|
150 | - |
|
151 | - /** |
|
152 | - * This method is called after a node is deleted. |
|
153 | - * |
|
154 | - * @param string $path path of node for which to delete properties |
|
155 | - */ |
|
156 | - public function delete($path) { |
|
157 | - $statement = $this->connection->prepare( |
|
158 | - 'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?' |
|
159 | - ); |
|
160 | - $statement->execute(array($this->user, $path)); |
|
161 | - $statement->closeCursor(); |
|
162 | - |
|
163 | - unset($this->cache[$path]); |
|
164 | - } |
|
165 | - |
|
166 | - /** |
|
167 | - * This method is called after a successful MOVE |
|
168 | - * |
|
169 | - * @param string $source |
|
170 | - * @param string $destination |
|
171 | - * |
|
172 | - * @return void |
|
173 | - */ |
|
174 | - public function move($source, $destination) { |
|
175 | - $statement = $this->connection->prepare( |
|
176 | - 'UPDATE `*PREFIX*properties` SET `propertypath` = ?' . |
|
177 | - ' WHERE `userid` = ? AND `propertypath` = ?' |
|
178 | - ); |
|
179 | - $statement->execute(array($destination, $this->user, $source)); |
|
180 | - $statement->closeCursor(); |
|
181 | - } |
|
182 | - |
|
183 | - /** |
|
184 | - * Returns a list of properties for this nodes.; |
|
185 | - * @param string $path |
|
186 | - * @param array $requestedProperties requested properties or empty array for "all" |
|
187 | - * @return array |
|
188 | - * @note The properties list is a list of propertynames the client |
|
189 | - * requested, encoded as xmlnamespace#tagName, for example: |
|
190 | - * http://www.example.org/namespace#author If the array is empty, all |
|
191 | - * properties should be returned |
|
192 | - */ |
|
193 | - private function getProperties($path, array $requestedProperties) { |
|
194 | - if (isset($this->cache[$path])) { |
|
195 | - return $this->cache[$path]; |
|
196 | - } |
|
197 | - |
|
198 | - // TODO: chunking if more than 1000 properties |
|
199 | - $sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'; |
|
200 | - |
|
201 | - $whereValues = array($this->user, $path); |
|
202 | - $whereTypes = array(null, null); |
|
203 | - |
|
204 | - if (!empty($requestedProperties)) { |
|
205 | - // request only a subset |
|
206 | - $sql .= ' AND `propertyname` in (?)'; |
|
207 | - $whereValues[] = $requestedProperties; |
|
208 | - $whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY; |
|
209 | - } |
|
210 | - |
|
211 | - $result = $this->connection->executeQuery( |
|
212 | - $sql, |
|
213 | - $whereValues, |
|
214 | - $whereTypes |
|
215 | - ); |
|
216 | - |
|
217 | - $props = []; |
|
218 | - while ($row = $result->fetch()) { |
|
219 | - $props[$row['propertyname']] = $row['propertyvalue']; |
|
220 | - } |
|
221 | - |
|
222 | - $result->closeCursor(); |
|
223 | - |
|
224 | - $this->cache[$path] = $props; |
|
225 | - return $props; |
|
226 | - } |
|
227 | - |
|
228 | - /** |
|
229 | - * Update properties |
|
230 | - * |
|
231 | - * @param string $path node for which to update properties |
|
232 | - * @param array $properties array of properties to update |
|
233 | - * |
|
234 | - * @return bool |
|
235 | - */ |
|
236 | - private function updateProperties($path, $properties) { |
|
237 | - |
|
238 | - $deleteStatement = 'DELETE FROM `*PREFIX*properties`' . |
|
239 | - ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'; |
|
240 | - |
|
241 | - $insertStatement = 'INSERT INTO `*PREFIX*properties`' . |
|
242 | - ' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)'; |
|
243 | - |
|
244 | - $updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' . |
|
245 | - ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'; |
|
246 | - |
|
247 | - // TODO: use "insert or update" strategy ? |
|
248 | - $existing = $this->getProperties($path, array()); |
|
249 | - $this->connection->beginTransaction(); |
|
250 | - foreach ($properties as $propertyName => $propertyValue) { |
|
251 | - // If it was null, we need to delete the property |
|
252 | - if (is_null($propertyValue)) { |
|
253 | - if (array_key_exists($propertyName, $existing)) { |
|
254 | - $this->connection->executeUpdate($deleteStatement, |
|
255 | - array( |
|
256 | - $this->user, |
|
257 | - $path, |
|
258 | - $propertyName |
|
259 | - ) |
|
260 | - ); |
|
261 | - } |
|
262 | - } else { |
|
263 | - if (!array_key_exists($propertyName, $existing)) { |
|
264 | - $this->connection->executeUpdate($insertStatement, |
|
265 | - array( |
|
266 | - $this->user, |
|
267 | - $path, |
|
268 | - $propertyName, |
|
269 | - $propertyValue |
|
270 | - ) |
|
271 | - ); |
|
272 | - } else { |
|
273 | - $this->connection->executeUpdate($updateStatement, |
|
274 | - array( |
|
275 | - $propertyValue, |
|
276 | - $this->user, |
|
277 | - $path, |
|
278 | - $propertyName |
|
279 | - ) |
|
280 | - ); |
|
281 | - } |
|
282 | - } |
|
283 | - } |
|
284 | - |
|
285 | - $this->connection->commit(); |
|
286 | - unset($this->cache[$path]); |
|
287 | - |
|
288 | - return true; |
|
289 | - } |
|
37 | + /** |
|
38 | + * Ignored properties |
|
39 | + * |
|
40 | + * @var array |
|
41 | + */ |
|
42 | + private $ignoredProperties = array( |
|
43 | + '{DAV:}getcontentlength', |
|
44 | + '{DAV:}getcontenttype', |
|
45 | + '{DAV:}getetag', |
|
46 | + '{DAV:}quota-used-bytes', |
|
47 | + '{DAV:}quota-available-bytes', |
|
48 | + '{http://owncloud.org/ns}permissions', |
|
49 | + '{http://owncloud.org/ns}downloadURL', |
|
50 | + '{http://owncloud.org/ns}dDC', |
|
51 | + '{http://owncloud.org/ns}size', |
|
52 | + ); |
|
53 | + |
|
54 | + /** |
|
55 | + * @var Tree |
|
56 | + */ |
|
57 | + private $tree; |
|
58 | + |
|
59 | + /** |
|
60 | + * @var IDBConnection |
|
61 | + */ |
|
62 | + private $connection; |
|
63 | + |
|
64 | + /** |
|
65 | + * @var string |
|
66 | + */ |
|
67 | + private $user; |
|
68 | + |
|
69 | + /** |
|
70 | + * Properties cache |
|
71 | + * |
|
72 | + * @var array |
|
73 | + */ |
|
74 | + private $cache = []; |
|
75 | + |
|
76 | + /** |
|
77 | + * @param Tree $tree node tree |
|
78 | + * @param IDBConnection $connection database connection |
|
79 | + * @param IUser $user owner of the tree and properties |
|
80 | + */ |
|
81 | + public function __construct( |
|
82 | + Tree $tree, |
|
83 | + IDBConnection $connection, |
|
84 | + IUser $user) { |
|
85 | + $this->tree = $tree; |
|
86 | + $this->connection = $connection; |
|
87 | + $this->user = $user->getUID(); |
|
88 | + } |
|
89 | + |
|
90 | + /** |
|
91 | + * Fetches properties for a path. |
|
92 | + * |
|
93 | + * @param string $path |
|
94 | + * @param PropFind $propFind |
|
95 | + * @return void |
|
96 | + */ |
|
97 | + public function propFind($path, PropFind $propFind) { |
|
98 | + |
|
99 | + $requestedProps = $propFind->get404Properties(); |
|
100 | + |
|
101 | + // these might appear |
|
102 | + $requestedProps = array_diff( |
|
103 | + $requestedProps, |
|
104 | + $this->ignoredProperties |
|
105 | + ); |
|
106 | + |
|
107 | + // substr of calendars/ => path is inside the CalDAV component |
|
108 | + // two '/' => this a calendar (no calendar-home nor calendar object) |
|
109 | + if (substr($path, 0, 10) === 'calendars/' && substr_count($path, '/') === 2) { |
|
110 | + $allRequestedProps = $propFind->getRequestedProperties(); |
|
111 | + $customPropertiesForShares = [ |
|
112 | + '{DAV:}displayname', |
|
113 | + '{urn:ietf:params:xml:ns:caldav}calendar-description', |
|
114 | + '{urn:ietf:params:xml:ns:caldav}calendar-timezone', |
|
115 | + '{http://apple.com/ns/ical/}calendar-order', |
|
116 | + '{http://apple.com/ns/ical/}calendar-color', |
|
117 | + '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp', |
|
118 | + ]; |
|
119 | + |
|
120 | + foreach ($customPropertiesForShares as $customPropertyForShares) { |
|
121 | + if (in_array($customPropertyForShares, $allRequestedProps)) { |
|
122 | + $requestedProps[] = $customPropertyForShares; |
|
123 | + } |
|
124 | + } |
|
125 | + } |
|
126 | + |
|
127 | + if (empty($requestedProps)) { |
|
128 | + return; |
|
129 | + } |
|
130 | + |
|
131 | + $props = $this->getProperties($path, $requestedProps); |
|
132 | + foreach ($props as $propName => $propValue) { |
|
133 | + $propFind->set($propName, $propValue); |
|
134 | + } |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * Updates properties for a path |
|
139 | + * |
|
140 | + * @param string $path |
|
141 | + * @param PropPatch $propPatch |
|
142 | + * |
|
143 | + * @return void |
|
144 | + */ |
|
145 | + public function propPatch($path, PropPatch $propPatch) { |
|
146 | + $propPatch->handleRemaining(function($changedProps) use ($path) { |
|
147 | + return $this->updateProperties($path, $changedProps); |
|
148 | + }); |
|
149 | + } |
|
150 | + |
|
151 | + /** |
|
152 | + * This method is called after a node is deleted. |
|
153 | + * |
|
154 | + * @param string $path path of node for which to delete properties |
|
155 | + */ |
|
156 | + public function delete($path) { |
|
157 | + $statement = $this->connection->prepare( |
|
158 | + 'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?' |
|
159 | + ); |
|
160 | + $statement->execute(array($this->user, $path)); |
|
161 | + $statement->closeCursor(); |
|
162 | + |
|
163 | + unset($this->cache[$path]); |
|
164 | + } |
|
165 | + |
|
166 | + /** |
|
167 | + * This method is called after a successful MOVE |
|
168 | + * |
|
169 | + * @param string $source |
|
170 | + * @param string $destination |
|
171 | + * |
|
172 | + * @return void |
|
173 | + */ |
|
174 | + public function move($source, $destination) { |
|
175 | + $statement = $this->connection->prepare( |
|
176 | + 'UPDATE `*PREFIX*properties` SET `propertypath` = ?' . |
|
177 | + ' WHERE `userid` = ? AND `propertypath` = ?' |
|
178 | + ); |
|
179 | + $statement->execute(array($destination, $this->user, $source)); |
|
180 | + $statement->closeCursor(); |
|
181 | + } |
|
182 | + |
|
183 | + /** |
|
184 | + * Returns a list of properties for this nodes.; |
|
185 | + * @param string $path |
|
186 | + * @param array $requestedProperties requested properties or empty array for "all" |
|
187 | + * @return array |
|
188 | + * @note The properties list is a list of propertynames the client |
|
189 | + * requested, encoded as xmlnamespace#tagName, for example: |
|
190 | + * http://www.example.org/namespace#author If the array is empty, all |
|
191 | + * properties should be returned |
|
192 | + */ |
|
193 | + private function getProperties($path, array $requestedProperties) { |
|
194 | + if (isset($this->cache[$path])) { |
|
195 | + return $this->cache[$path]; |
|
196 | + } |
|
197 | + |
|
198 | + // TODO: chunking if more than 1000 properties |
|
199 | + $sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'; |
|
200 | + |
|
201 | + $whereValues = array($this->user, $path); |
|
202 | + $whereTypes = array(null, null); |
|
203 | + |
|
204 | + if (!empty($requestedProperties)) { |
|
205 | + // request only a subset |
|
206 | + $sql .= ' AND `propertyname` in (?)'; |
|
207 | + $whereValues[] = $requestedProperties; |
|
208 | + $whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY; |
|
209 | + } |
|
210 | + |
|
211 | + $result = $this->connection->executeQuery( |
|
212 | + $sql, |
|
213 | + $whereValues, |
|
214 | + $whereTypes |
|
215 | + ); |
|
216 | + |
|
217 | + $props = []; |
|
218 | + while ($row = $result->fetch()) { |
|
219 | + $props[$row['propertyname']] = $row['propertyvalue']; |
|
220 | + } |
|
221 | + |
|
222 | + $result->closeCursor(); |
|
223 | + |
|
224 | + $this->cache[$path] = $props; |
|
225 | + return $props; |
|
226 | + } |
|
227 | + |
|
228 | + /** |
|
229 | + * Update properties |
|
230 | + * |
|
231 | + * @param string $path node for which to update properties |
|
232 | + * @param array $properties array of properties to update |
|
233 | + * |
|
234 | + * @return bool |
|
235 | + */ |
|
236 | + private function updateProperties($path, $properties) { |
|
237 | + |
|
238 | + $deleteStatement = 'DELETE FROM `*PREFIX*properties`' . |
|
239 | + ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'; |
|
240 | + |
|
241 | + $insertStatement = 'INSERT INTO `*PREFIX*properties`' . |
|
242 | + ' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)'; |
|
243 | + |
|
244 | + $updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' . |
|
245 | + ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'; |
|
246 | + |
|
247 | + // TODO: use "insert or update" strategy ? |
|
248 | + $existing = $this->getProperties($path, array()); |
|
249 | + $this->connection->beginTransaction(); |
|
250 | + foreach ($properties as $propertyName => $propertyValue) { |
|
251 | + // If it was null, we need to delete the property |
|
252 | + if (is_null($propertyValue)) { |
|
253 | + if (array_key_exists($propertyName, $existing)) { |
|
254 | + $this->connection->executeUpdate($deleteStatement, |
|
255 | + array( |
|
256 | + $this->user, |
|
257 | + $path, |
|
258 | + $propertyName |
|
259 | + ) |
|
260 | + ); |
|
261 | + } |
|
262 | + } else { |
|
263 | + if (!array_key_exists($propertyName, $existing)) { |
|
264 | + $this->connection->executeUpdate($insertStatement, |
|
265 | + array( |
|
266 | + $this->user, |
|
267 | + $path, |
|
268 | + $propertyName, |
|
269 | + $propertyValue |
|
270 | + ) |
|
271 | + ); |
|
272 | + } else { |
|
273 | + $this->connection->executeUpdate($updateStatement, |
|
274 | + array( |
|
275 | + $propertyValue, |
|
276 | + $this->user, |
|
277 | + $path, |
|
278 | + $propertyName |
|
279 | + ) |
|
280 | + ); |
|
281 | + } |
|
282 | + } |
|
283 | + } |
|
284 | + |
|
285 | + $this->connection->commit(); |
|
286 | + unset($this->cache[$path]); |
|
287 | + |
|
288 | + return true; |
|
289 | + } |
|
290 | 290 | |
291 | 291 | } |
@@ -27,230 +27,230 @@ |
||
27 | 27 | |
28 | 28 | class EventMerger implements IEventMerger { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l10n; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l10n; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l10n |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l10n) { |
|
37 | - $this->l10n = $l10n; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l10n |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l10n) { |
|
37 | + $this->l10n = $l10n; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Combines two events when possible to have grouping: |
|
42 | - * |
|
43 | - * Example1: Two events with subject '{user} created {file}' and |
|
44 | - * $mergeParameter file with different file and same user will be merged |
|
45 | - * to '{user} created {file1} and {file2}' and the childEvent on the return |
|
46 | - * will be set, if the events have been merged. |
|
47 | - * |
|
48 | - * Example2: Two events with subject '{user} created {file}' and |
|
49 | - * $mergeParameter file with same file and same user will be merged to |
|
50 | - * '{user} created {file1}' and the childEvent on the return will be set, if |
|
51 | - * the events have been merged. |
|
52 | - * |
|
53 | - * The following requirements have to be met, in order to be merged: |
|
54 | - * - Both events need to have the same `getApp()` |
|
55 | - * - Both events must not have a message `getMessage()` |
|
56 | - * - Both events need to have the same subject `getSubject()` |
|
57 | - * - Both events need to have the same object type `getObjectType()` |
|
58 | - * - The time difference between both events must not be bigger then 3 hours |
|
59 | - * - Only up to 5 events can be merged. |
|
60 | - * - All parameters apart from such starting with $mergeParameter must be |
|
61 | - * the same for both events. |
|
62 | - * |
|
63 | - * @param string $mergeParameter |
|
64 | - * @param IEvent $event |
|
65 | - * @param IEvent|null $previousEvent |
|
66 | - * @return IEvent |
|
67 | - */ |
|
68 | - public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) { |
|
69 | - // No second event => can not combine |
|
70 | - if (!$previousEvent instanceof IEvent) { |
|
71 | - return $event; |
|
72 | - } |
|
40 | + /** |
|
41 | + * Combines two events when possible to have grouping: |
|
42 | + * |
|
43 | + * Example1: Two events with subject '{user} created {file}' and |
|
44 | + * $mergeParameter file with different file and same user will be merged |
|
45 | + * to '{user} created {file1} and {file2}' and the childEvent on the return |
|
46 | + * will be set, if the events have been merged. |
|
47 | + * |
|
48 | + * Example2: Two events with subject '{user} created {file}' and |
|
49 | + * $mergeParameter file with same file and same user will be merged to |
|
50 | + * '{user} created {file1}' and the childEvent on the return will be set, if |
|
51 | + * the events have been merged. |
|
52 | + * |
|
53 | + * The following requirements have to be met, in order to be merged: |
|
54 | + * - Both events need to have the same `getApp()` |
|
55 | + * - Both events must not have a message `getMessage()` |
|
56 | + * - Both events need to have the same subject `getSubject()` |
|
57 | + * - Both events need to have the same object type `getObjectType()` |
|
58 | + * - The time difference between both events must not be bigger then 3 hours |
|
59 | + * - Only up to 5 events can be merged. |
|
60 | + * - All parameters apart from such starting with $mergeParameter must be |
|
61 | + * the same for both events. |
|
62 | + * |
|
63 | + * @param string $mergeParameter |
|
64 | + * @param IEvent $event |
|
65 | + * @param IEvent|null $previousEvent |
|
66 | + * @return IEvent |
|
67 | + */ |
|
68 | + public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) { |
|
69 | + // No second event => can not combine |
|
70 | + if (!$previousEvent instanceof IEvent) { |
|
71 | + return $event; |
|
72 | + } |
|
73 | 73 | |
74 | - // Different app => can not combine |
|
75 | - if ($event->getApp() !== $previousEvent->getApp()) { |
|
76 | - return $event; |
|
77 | - } |
|
74 | + // Different app => can not combine |
|
75 | + if ($event->getApp() !== $previousEvent->getApp()) { |
|
76 | + return $event; |
|
77 | + } |
|
78 | 78 | |
79 | - // Message is set => can not combine |
|
80 | - if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') { |
|
81 | - return $event; |
|
82 | - } |
|
79 | + // Message is set => can not combine |
|
80 | + if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') { |
|
81 | + return $event; |
|
82 | + } |
|
83 | 83 | |
84 | - // Different subject => can not combine |
|
85 | - if ($event->getSubject() !== $previousEvent->getSubject()) { |
|
86 | - return $event; |
|
87 | - } |
|
84 | + // Different subject => can not combine |
|
85 | + if ($event->getSubject() !== $previousEvent->getSubject()) { |
|
86 | + return $event; |
|
87 | + } |
|
88 | 88 | |
89 | - // Different object type => can not combine |
|
90 | - if ($event->getObjectType() !== $previousEvent->getObjectType()) { |
|
91 | - return $event; |
|
92 | - } |
|
89 | + // Different object type => can not combine |
|
90 | + if ($event->getObjectType() !== $previousEvent->getObjectType()) { |
|
91 | + return $event; |
|
92 | + } |
|
93 | 93 | |
94 | - // More than 3 hours difference => can not combine |
|
95 | - if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) { |
|
96 | - return $event; |
|
97 | - } |
|
94 | + // More than 3 hours difference => can not combine |
|
95 | + if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) { |
|
96 | + return $event; |
|
97 | + } |
|
98 | 98 | |
99 | - // Other parameters are not the same => can not combine |
|
100 | - try { |
|
101 | - list($combined, $parameters) = $this->combineParameters($mergeParameter, $event, $previousEvent); |
|
102 | - } catch (\UnexpectedValueException $e) { |
|
103 | - return $event; |
|
104 | - } |
|
99 | + // Other parameters are not the same => can not combine |
|
100 | + try { |
|
101 | + list($combined, $parameters) = $this->combineParameters($mergeParameter, $event, $previousEvent); |
|
102 | + } catch (\UnexpectedValueException $e) { |
|
103 | + return $event; |
|
104 | + } |
|
105 | 105 | |
106 | - try { |
|
107 | - $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined); |
|
108 | - $parsedSubject = $this->generateParsedSubject($newSubject, $parameters); |
|
106 | + try { |
|
107 | + $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined); |
|
108 | + $parsedSubject = $this->generateParsedSubject($newSubject, $parameters); |
|
109 | 109 | |
110 | - $event->setRichSubject($newSubject, $parameters) |
|
111 | - ->setParsedSubject($parsedSubject) |
|
112 | - ->setChildEvent($previousEvent); |
|
113 | - } catch (\UnexpectedValueException $e) { |
|
114 | - return $event; |
|
115 | - } |
|
110 | + $event->setRichSubject($newSubject, $parameters) |
|
111 | + ->setParsedSubject($parsedSubject) |
|
112 | + ->setChildEvent($previousEvent); |
|
113 | + } catch (\UnexpectedValueException $e) { |
|
114 | + return $event; |
|
115 | + } |
|
116 | 116 | |
117 | - return $event; |
|
118 | - } |
|
117 | + return $event; |
|
118 | + } |
|
119 | 119 | |
120 | - /** |
|
121 | - * @param string $mergeParameter |
|
122 | - * @param IEvent $event |
|
123 | - * @param IEvent $previousEvent |
|
124 | - * @return array |
|
125 | - * @throws \UnexpectedValueException |
|
126 | - */ |
|
127 | - protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) { |
|
128 | - $params1 = $event->getRichSubjectParameters(); |
|
129 | - $params2 = $previousEvent->getRichSubjectParameters(); |
|
130 | - $params = []; |
|
120 | + /** |
|
121 | + * @param string $mergeParameter |
|
122 | + * @param IEvent $event |
|
123 | + * @param IEvent $previousEvent |
|
124 | + * @return array |
|
125 | + * @throws \UnexpectedValueException |
|
126 | + */ |
|
127 | + protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) { |
|
128 | + $params1 = $event->getRichSubjectParameters(); |
|
129 | + $params2 = $previousEvent->getRichSubjectParameters(); |
|
130 | + $params = []; |
|
131 | 131 | |
132 | - $combined = 0; |
|
132 | + $combined = 0; |
|
133 | 133 | |
134 | - // Check that all parameters from $event exist in $previousEvent |
|
135 | - foreach ($params1 as $key => $parameter) { |
|
136 | - if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) { |
|
137 | - if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) { |
|
138 | - $combined++; |
|
139 | - $params[$mergeParameter . $combined] = $parameter; |
|
140 | - } |
|
141 | - continue; |
|
142 | - } |
|
134 | + // Check that all parameters from $event exist in $previousEvent |
|
135 | + foreach ($params1 as $key => $parameter) { |
|
136 | + if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) { |
|
137 | + if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) { |
|
138 | + $combined++; |
|
139 | + $params[$mergeParameter . $combined] = $parameter; |
|
140 | + } |
|
141 | + continue; |
|
142 | + } |
|
143 | 143 | |
144 | - if (!isset($params2[$key]) || $params2[$key] !== $parameter) { |
|
145 | - // Parameter missing on $previousEvent or different => can not combine |
|
146 | - throw new \UnexpectedValueException(); |
|
147 | - } |
|
144 | + if (!isset($params2[$key]) || $params2[$key] !== $parameter) { |
|
145 | + // Parameter missing on $previousEvent or different => can not combine |
|
146 | + throw new \UnexpectedValueException(); |
|
147 | + } |
|
148 | 148 | |
149 | - $params[$key] = $parameter; |
|
150 | - } |
|
149 | + $params[$key] = $parameter; |
|
150 | + } |
|
151 | 151 | |
152 | - // Check that all parameters from $previousEvent exist in $event |
|
153 | - foreach ($params2 as $key => $parameter) { |
|
154 | - if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) { |
|
155 | - if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) { |
|
156 | - $combined++; |
|
157 | - $params[$mergeParameter . $combined] = $parameter; |
|
158 | - } |
|
159 | - continue; |
|
160 | - } |
|
152 | + // Check that all parameters from $previousEvent exist in $event |
|
153 | + foreach ($params2 as $key => $parameter) { |
|
154 | + if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) { |
|
155 | + if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) { |
|
156 | + $combined++; |
|
157 | + $params[$mergeParameter . $combined] = $parameter; |
|
158 | + } |
|
159 | + continue; |
|
160 | + } |
|
161 | 161 | |
162 | - if (!isset($params1[$key]) || $params1[$key] !== $parameter) { |
|
163 | - // Parameter missing on $event or different => can not combine |
|
164 | - throw new \UnexpectedValueException(); |
|
165 | - } |
|
162 | + if (!isset($params1[$key]) || $params1[$key] !== $parameter) { |
|
163 | + // Parameter missing on $event or different => can not combine |
|
164 | + throw new \UnexpectedValueException(); |
|
165 | + } |
|
166 | 166 | |
167 | - $params[$key] = $parameter; |
|
168 | - } |
|
167 | + $params[$key] = $parameter; |
|
168 | + } |
|
169 | 169 | |
170 | - return [$combined, $params]; |
|
171 | - } |
|
170 | + return [$combined, $params]; |
|
171 | + } |
|
172 | 172 | |
173 | - /** |
|
174 | - * @param array[] $parameters |
|
175 | - * @param string $mergeParameter |
|
176 | - * @param array $parameter |
|
177 | - * @return bool |
|
178 | - */ |
|
179 | - protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) { |
|
180 | - foreach ($parameters as $key => $param) { |
|
181 | - if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) { |
|
182 | - if ($param === $parameter) { |
|
183 | - return true; |
|
184 | - } |
|
185 | - } |
|
186 | - } |
|
187 | - return false; |
|
188 | - } |
|
173 | + /** |
|
174 | + * @param array[] $parameters |
|
175 | + * @param string $mergeParameter |
|
176 | + * @param array $parameter |
|
177 | + * @return bool |
|
178 | + */ |
|
179 | + protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) { |
|
180 | + foreach ($parameters as $key => $param) { |
|
181 | + if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) { |
|
182 | + if ($param === $parameter) { |
|
183 | + return true; |
|
184 | + } |
|
185 | + } |
|
186 | + } |
|
187 | + return false; |
|
188 | + } |
|
189 | 189 | |
190 | - /** |
|
191 | - * @param string $subject |
|
192 | - * @param string $parameter |
|
193 | - * @param int $counter |
|
194 | - * @return mixed |
|
195 | - */ |
|
196 | - protected function getExtendedSubject($subject, $parameter, $counter) { |
|
197 | - switch ($counter) { |
|
198 | - case 1: |
|
199 | - $replacement = '{' . $parameter . '1}'; |
|
200 | - break; |
|
201 | - case 2: |
|
202 | - $replacement = $this->l10n->t( |
|
203 | - '%1$s and %2$s', |
|
204 | - ['{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
205 | - ); |
|
206 | - break; |
|
207 | - case 3: |
|
208 | - $replacement = $this->l10n->t( |
|
209 | - '%1$s, %2$s and %3$s', |
|
210 | - ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
211 | - ); |
|
212 | - break; |
|
213 | - case 4: |
|
214 | - $replacement = $this->l10n->t( |
|
215 | - '%1$s, %2$s, %3$s and %4$s', |
|
216 | - ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
217 | - ); |
|
218 | - break; |
|
219 | - case 5: |
|
220 | - $replacement = $this->l10n->t( |
|
221 | - '%1$s, %2$s, %3$s, %4$s and %5$s', |
|
222 | - ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
223 | - ); |
|
224 | - break; |
|
225 | - default: |
|
226 | - throw new \UnexpectedValueException(); |
|
227 | - } |
|
190 | + /** |
|
191 | + * @param string $subject |
|
192 | + * @param string $parameter |
|
193 | + * @param int $counter |
|
194 | + * @return mixed |
|
195 | + */ |
|
196 | + protected function getExtendedSubject($subject, $parameter, $counter) { |
|
197 | + switch ($counter) { |
|
198 | + case 1: |
|
199 | + $replacement = '{' . $parameter . '1}'; |
|
200 | + break; |
|
201 | + case 2: |
|
202 | + $replacement = $this->l10n->t( |
|
203 | + '%1$s and %2$s', |
|
204 | + ['{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
205 | + ); |
|
206 | + break; |
|
207 | + case 3: |
|
208 | + $replacement = $this->l10n->t( |
|
209 | + '%1$s, %2$s and %3$s', |
|
210 | + ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
211 | + ); |
|
212 | + break; |
|
213 | + case 4: |
|
214 | + $replacement = $this->l10n->t( |
|
215 | + '%1$s, %2$s, %3$s and %4$s', |
|
216 | + ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
217 | + ); |
|
218 | + break; |
|
219 | + case 5: |
|
220 | + $replacement = $this->l10n->t( |
|
221 | + '%1$s, %2$s, %3$s, %4$s and %5$s', |
|
222 | + ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] |
|
223 | + ); |
|
224 | + break; |
|
225 | + default: |
|
226 | + throw new \UnexpectedValueException(); |
|
227 | + } |
|
228 | 228 | |
229 | - return str_replace( |
|
230 | - '{' . $parameter . '}', |
|
231 | - $replacement, |
|
232 | - $subject |
|
233 | - ); |
|
234 | - } |
|
229 | + return str_replace( |
|
230 | + '{' . $parameter . '}', |
|
231 | + $replacement, |
|
232 | + $subject |
|
233 | + ); |
|
234 | + } |
|
235 | 235 | |
236 | - /** |
|
237 | - * @param string $subject |
|
238 | - * @param array[] $parameters |
|
239 | - * @return string |
|
240 | - */ |
|
241 | - protected function generateParsedSubject($subject, $parameters) { |
|
242 | - $placeholders = $replacements = []; |
|
243 | - foreach ($parameters as $placeholder => $parameter) { |
|
244 | - $placeholders[] = '{' . $placeholder . '}'; |
|
245 | - if ($parameter['type'] === 'file') { |
|
246 | - $replacements[] = trim($parameter['path'], '/'); |
|
247 | - } else if (isset($parameter['name'])) { |
|
248 | - $replacements[] = $parameter['name']; |
|
249 | - } else { |
|
250 | - $replacements[] = $parameter['id']; |
|
251 | - } |
|
252 | - } |
|
236 | + /** |
|
237 | + * @param string $subject |
|
238 | + * @param array[] $parameters |
|
239 | + * @return string |
|
240 | + */ |
|
241 | + protected function generateParsedSubject($subject, $parameters) { |
|
242 | + $placeholders = $replacements = []; |
|
243 | + foreach ($parameters as $placeholder => $parameter) { |
|
244 | + $placeholders[] = '{' . $placeholder . '}'; |
|
245 | + if ($parameter['type'] === 'file') { |
|
246 | + $replacements[] = trim($parameter['path'], '/'); |
|
247 | + } else if (isset($parameter['name'])) { |
|
248 | + $replacements[] = $parameter['name']; |
|
249 | + } else { |
|
250 | + $replacements[] = $parameter['id']; |
|
251 | + } |
|
252 | + } |
|
253 | 253 | |
254 | - return str_replace($placeholders, $replacements, $subject); |
|
255 | - } |
|
254 | + return str_replace($placeholders, $replacements, $subject); |
|
255 | + } |
|
256 | 256 | } |
@@ -27,72 +27,72 @@ |
||
27 | 27 | use Sabre\DAV\File; |
28 | 28 | |
29 | 29 | class AvatarNode extends File { |
30 | - private $ext; |
|
31 | - private $size; |
|
32 | - private $avatar; |
|
30 | + private $ext; |
|
31 | + private $size; |
|
32 | + private $avatar; |
|
33 | 33 | |
34 | - /** |
|
35 | - * AvatarNode constructor. |
|
36 | - * |
|
37 | - * @param integer $size |
|
38 | - * @param string $ext |
|
39 | - * @param IAvatar $avatar |
|
40 | - */ |
|
41 | - public function __construct($size, $ext, $avatar) { |
|
42 | - $this->size = $size; |
|
43 | - $this->ext = $ext; |
|
44 | - $this->avatar = $avatar; |
|
45 | - } |
|
34 | + /** |
|
35 | + * AvatarNode constructor. |
|
36 | + * |
|
37 | + * @param integer $size |
|
38 | + * @param string $ext |
|
39 | + * @param IAvatar $avatar |
|
40 | + */ |
|
41 | + public function __construct($size, $ext, $avatar) { |
|
42 | + $this->size = $size; |
|
43 | + $this->ext = $ext; |
|
44 | + $this->avatar = $avatar; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Returns the name of the node. |
|
49 | - * |
|
50 | - * This is used to generate the url. |
|
51 | - * |
|
52 | - * @return string |
|
53 | - */ |
|
54 | - public function getName() { |
|
55 | - return "$this->size.$this->ext"; |
|
56 | - } |
|
47 | + /** |
|
48 | + * Returns the name of the node. |
|
49 | + * |
|
50 | + * This is used to generate the url. |
|
51 | + * |
|
52 | + * @return string |
|
53 | + */ |
|
54 | + public function getName() { |
|
55 | + return "$this->size.$this->ext"; |
|
56 | + } |
|
57 | 57 | |
58 | - public function get() { |
|
59 | - $image = $this->avatar->get($this->size); |
|
60 | - $res = $image->resource(); |
|
58 | + public function get() { |
|
59 | + $image = $this->avatar->get($this->size); |
|
60 | + $res = $image->resource(); |
|
61 | 61 | |
62 | - ob_start(); |
|
63 | - if ($this->ext === 'png') { |
|
64 | - imagepng($res); |
|
65 | - } else { |
|
66 | - imagejpeg($res); |
|
67 | - } |
|
62 | + ob_start(); |
|
63 | + if ($this->ext === 'png') { |
|
64 | + imagepng($res); |
|
65 | + } else { |
|
66 | + imagejpeg($res); |
|
67 | + } |
|
68 | 68 | |
69 | - return ob_get_clean(); |
|
70 | - } |
|
69 | + return ob_get_clean(); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * Returns the mime-type for a file |
|
74 | - * |
|
75 | - * If null is returned, we'll assume application/octet-stream |
|
76 | - * |
|
77 | - * @return string|null |
|
78 | - */ |
|
79 | - public function getContentType() { |
|
80 | - if ($this->ext === 'png') { |
|
81 | - return 'image/png'; |
|
82 | - } |
|
83 | - return 'image/jpeg'; |
|
84 | - } |
|
72 | + /** |
|
73 | + * Returns the mime-type for a file |
|
74 | + * |
|
75 | + * If null is returned, we'll assume application/octet-stream |
|
76 | + * |
|
77 | + * @return string|null |
|
78 | + */ |
|
79 | + public function getContentType() { |
|
80 | + if ($this->ext === 'png') { |
|
81 | + return 'image/png'; |
|
82 | + } |
|
83 | + return 'image/jpeg'; |
|
84 | + } |
|
85 | 85 | |
86 | - public function getETag() { |
|
87 | - return $this->avatar->getFile($this->size)->getEtag(); |
|
88 | - } |
|
86 | + public function getETag() { |
|
87 | + return $this->avatar->getFile($this->size)->getEtag(); |
|
88 | + } |
|
89 | 89 | |
90 | - public function getLastModified() { |
|
91 | - $timestamp = $this->avatar->getFile($this->size)->getMTime(); |
|
92 | - if (!empty($timestamp)) { |
|
93 | - return (int)$timestamp; |
|
94 | - } |
|
95 | - return $timestamp; |
|
90 | + public function getLastModified() { |
|
91 | + $timestamp = $this->avatar->getFile($this->size)->getMTime(); |
|
92 | + if (!empty($timestamp)) { |
|
93 | + return (int)$timestamp; |
|
94 | + } |
|
95 | + return $timestamp; |
|
96 | 96 | |
97 | - } |
|
97 | + } |
|
98 | 98 | } |