@@ -33,44 +33,44 @@ |
||
33 | 33 | */ |
34 | 34 | class File extends \OCP\Search\Provider { |
35 | 35 | |
36 | - /** |
|
37 | - * Search for files and folders matching the given query |
|
38 | - * @param string $query |
|
39 | - * @return \OCP\Search\Result |
|
40 | - */ |
|
41 | - public function search($query) { |
|
42 | - $files = Filesystem::search($query); |
|
43 | - $results = []; |
|
44 | - // edit results |
|
45 | - foreach ($files as $fileData) { |
|
46 | - // skip versions |
|
47 | - if (strpos($fileData['path'], '_versions') === 0) { |
|
48 | - continue; |
|
49 | - } |
|
50 | - // skip top-level folder |
|
51 | - if ($fileData['name'] === 'files' && $fileData['parent'] === -1) { |
|
52 | - continue; |
|
53 | - } |
|
54 | - // create audio result |
|
55 | - if ($fileData['mimepart'] === 'audio') { |
|
56 | - $result = new \OC\Search\Result\Audio($fileData); |
|
57 | - } |
|
58 | - // create image result |
|
59 | - elseif ($fileData['mimepart'] === 'image') { |
|
60 | - $result = new \OC\Search\Result\Image($fileData); |
|
61 | - } |
|
62 | - // create folder result |
|
63 | - elseif ($fileData['mimetype'] === 'httpd/unix-directory') { |
|
64 | - $result = new \OC\Search\Result\Folder($fileData); |
|
65 | - } |
|
66 | - // or create file result |
|
67 | - else { |
|
68 | - $result = new \OC\Search\Result\File($fileData); |
|
69 | - } |
|
70 | - // add to results |
|
71 | - $results[] = $result; |
|
72 | - } |
|
73 | - // return |
|
74 | - return $results; |
|
75 | - } |
|
36 | + /** |
|
37 | + * Search for files and folders matching the given query |
|
38 | + * @param string $query |
|
39 | + * @return \OCP\Search\Result |
|
40 | + */ |
|
41 | + public function search($query) { |
|
42 | + $files = Filesystem::search($query); |
|
43 | + $results = []; |
|
44 | + // edit results |
|
45 | + foreach ($files as $fileData) { |
|
46 | + // skip versions |
|
47 | + if (strpos($fileData['path'], '_versions') === 0) { |
|
48 | + continue; |
|
49 | + } |
|
50 | + // skip top-level folder |
|
51 | + if ($fileData['name'] === 'files' && $fileData['parent'] === -1) { |
|
52 | + continue; |
|
53 | + } |
|
54 | + // create audio result |
|
55 | + if ($fileData['mimepart'] === 'audio') { |
|
56 | + $result = new \OC\Search\Result\Audio($fileData); |
|
57 | + } |
|
58 | + // create image result |
|
59 | + elseif ($fileData['mimepart'] === 'image') { |
|
60 | + $result = new \OC\Search\Result\Image($fileData); |
|
61 | + } |
|
62 | + // create folder result |
|
63 | + elseif ($fileData['mimetype'] === 'httpd/unix-directory') { |
|
64 | + $result = new \OC\Search\Result\Folder($fileData); |
|
65 | + } |
|
66 | + // or create file result |
|
67 | + else { |
|
68 | + $result = new \OC\Search\Result\File($fileData); |
|
69 | + } |
|
70 | + // add to results |
|
71 | + $results[] = $result; |
|
72 | + } |
|
73 | + // return |
|
74 | + return $results; |
|
75 | + } |
|
76 | 76 | } |
@@ -27,104 +27,104 @@ |
||
27 | 27 | use OCP\ICertificate; |
28 | 28 | |
29 | 29 | class Certificate implements ICertificate { |
30 | - protected $name; |
|
31 | - |
|
32 | - protected $commonName; |
|
33 | - |
|
34 | - protected $organization; |
|
35 | - |
|
36 | - protected $serial; |
|
37 | - |
|
38 | - protected $issueDate; |
|
39 | - |
|
40 | - protected $expireDate; |
|
41 | - |
|
42 | - protected $issuerName; |
|
43 | - |
|
44 | - protected $issuerOrganization; |
|
45 | - |
|
46 | - /** |
|
47 | - * @param string $data base64 encoded certificate |
|
48 | - * @param string $name |
|
49 | - * @throws \Exception If the certificate could not get parsed |
|
50 | - */ |
|
51 | - public function __construct($data, $name) { |
|
52 | - $this->name = $name; |
|
53 | - $gmt = new \DateTimeZone('GMT'); |
|
54 | - |
|
55 | - // If string starts with "file://" ignore the certificate |
|
56 | - $query = 'file://'; |
|
57 | - if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
58 | - throw new \Exception('Certificate could not get parsed.'); |
|
59 | - } |
|
60 | - |
|
61 | - $info = openssl_x509_parse($data); |
|
62 | - if (!is_array($info)) { |
|
63 | - throw new \Exception('Certificate could not get parsed.'); |
|
64 | - } |
|
65 | - |
|
66 | - $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
|
67 | - $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
|
68 | - $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
69 | - $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
70 | - $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
|
71 | - $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
|
72 | - } |
|
73 | - |
|
74 | - /** |
|
75 | - * @return string |
|
76 | - */ |
|
77 | - public function getName() { |
|
78 | - return $this->name; |
|
79 | - } |
|
80 | - |
|
81 | - /** |
|
82 | - * @return string|null |
|
83 | - */ |
|
84 | - public function getCommonName() { |
|
85 | - return $this->commonName; |
|
86 | - } |
|
87 | - |
|
88 | - /** |
|
89 | - * @return string |
|
90 | - */ |
|
91 | - public function getOrganization() { |
|
92 | - return $this->organization; |
|
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * @return \DateTime |
|
97 | - */ |
|
98 | - public function getIssueDate() { |
|
99 | - return $this->issueDate; |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * @return \DateTime |
|
104 | - */ |
|
105 | - public function getExpireDate() { |
|
106 | - return $this->expireDate; |
|
107 | - } |
|
108 | - |
|
109 | - /** |
|
110 | - * @return bool |
|
111 | - */ |
|
112 | - public function isExpired() { |
|
113 | - $now = new \DateTime(); |
|
114 | - return $this->issueDate > $now or $now > $this->expireDate; |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * @return string|null |
|
119 | - */ |
|
120 | - public function getIssuerName() { |
|
121 | - return $this->issuerName; |
|
122 | - } |
|
123 | - |
|
124 | - /** |
|
125 | - * @return string|null |
|
126 | - */ |
|
127 | - public function getIssuerOrganization() { |
|
128 | - return $this->issuerOrganization; |
|
129 | - } |
|
30 | + protected $name; |
|
31 | + |
|
32 | + protected $commonName; |
|
33 | + |
|
34 | + protected $organization; |
|
35 | + |
|
36 | + protected $serial; |
|
37 | + |
|
38 | + protected $issueDate; |
|
39 | + |
|
40 | + protected $expireDate; |
|
41 | + |
|
42 | + protected $issuerName; |
|
43 | + |
|
44 | + protected $issuerOrganization; |
|
45 | + |
|
46 | + /** |
|
47 | + * @param string $data base64 encoded certificate |
|
48 | + * @param string $name |
|
49 | + * @throws \Exception If the certificate could not get parsed |
|
50 | + */ |
|
51 | + public function __construct($data, $name) { |
|
52 | + $this->name = $name; |
|
53 | + $gmt = new \DateTimeZone('GMT'); |
|
54 | + |
|
55 | + // If string starts with "file://" ignore the certificate |
|
56 | + $query = 'file://'; |
|
57 | + if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
58 | + throw new \Exception('Certificate could not get parsed.'); |
|
59 | + } |
|
60 | + |
|
61 | + $info = openssl_x509_parse($data); |
|
62 | + if (!is_array($info)) { |
|
63 | + throw new \Exception('Certificate could not get parsed.'); |
|
64 | + } |
|
65 | + |
|
66 | + $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
|
67 | + $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
|
68 | + $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
69 | + $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
70 | + $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
|
71 | + $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
|
72 | + } |
|
73 | + |
|
74 | + /** |
|
75 | + * @return string |
|
76 | + */ |
|
77 | + public function getName() { |
|
78 | + return $this->name; |
|
79 | + } |
|
80 | + |
|
81 | + /** |
|
82 | + * @return string|null |
|
83 | + */ |
|
84 | + public function getCommonName() { |
|
85 | + return $this->commonName; |
|
86 | + } |
|
87 | + |
|
88 | + /** |
|
89 | + * @return string |
|
90 | + */ |
|
91 | + public function getOrganization() { |
|
92 | + return $this->organization; |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * @return \DateTime |
|
97 | + */ |
|
98 | + public function getIssueDate() { |
|
99 | + return $this->issueDate; |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * @return \DateTime |
|
104 | + */ |
|
105 | + public function getExpireDate() { |
|
106 | + return $this->expireDate; |
|
107 | + } |
|
108 | + |
|
109 | + /** |
|
110 | + * @return bool |
|
111 | + */ |
|
112 | + public function isExpired() { |
|
113 | + $now = new \DateTime(); |
|
114 | + return $this->issueDate > $now or $now > $this->expireDate; |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * @return string|null |
|
119 | + */ |
|
120 | + public function getIssuerName() { |
|
121 | + return $this->issuerName; |
|
122 | + } |
|
123 | + |
|
124 | + /** |
|
125 | + * @return string|null |
|
126 | + */ |
|
127 | + public function getIssuerOrganization() { |
|
128 | + return $this->issuerOrganization; |
|
129 | + } |
|
130 | 130 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | use OCP\Encryption\Exceptions\GenericEncryptionException; |
28 | 28 | |
29 | 29 | class EncryptionHeaderToLargeException extends GenericEncryptionException { |
30 | - public function __construct() { |
|
31 | - parent::__construct('max header size exceeded'); |
|
32 | - } |
|
30 | + public function __construct() { |
|
31 | + parent::__construct('max header size exceeded'); |
|
32 | + } |
|
33 | 33 | } |
@@ -33,159 +33,159 @@ |
||
33 | 33 | */ |
34 | 34 | class Update { |
35 | 35 | |
36 | - /** @var \OC\Files\View */ |
|
37 | - protected $view; |
|
38 | - |
|
39 | - /** @var \OC\Encryption\Util */ |
|
40 | - protected $util; |
|
41 | - |
|
42 | - /** @var \OC\Files\Mount\Manager */ |
|
43 | - protected $mountManager; |
|
44 | - |
|
45 | - /** @var \OC\Encryption\Manager */ |
|
46 | - protected $encryptionManager; |
|
47 | - |
|
48 | - /** @var string */ |
|
49 | - protected $uid; |
|
50 | - |
|
51 | - /** @var \OC\Encryption\File */ |
|
52 | - protected $file; |
|
53 | - |
|
54 | - /** |
|
55 | - * |
|
56 | - * @param \OC\Files\View $view |
|
57 | - * @param \OC\Encryption\Util $util |
|
58 | - * @param \OC\Files\Mount\Manager $mountManager |
|
59 | - * @param \OC\Encryption\Manager $encryptionManager |
|
60 | - * @param \OC\Encryption\File $file |
|
61 | - * @param string $uid |
|
62 | - */ |
|
63 | - public function __construct( |
|
64 | - View $view, |
|
65 | - Util $util, |
|
66 | - Mount\Manager $mountManager, |
|
67 | - Manager $encryptionManager, |
|
68 | - File $file, |
|
69 | - $uid |
|
70 | - ) { |
|
71 | - $this->view = $view; |
|
72 | - $this->util = $util; |
|
73 | - $this->mountManager = $mountManager; |
|
74 | - $this->encryptionManager = $encryptionManager; |
|
75 | - $this->file = $file; |
|
76 | - $this->uid = $uid; |
|
77 | - } |
|
78 | - |
|
79 | - /** |
|
80 | - * hook after file was shared |
|
81 | - * |
|
82 | - * @param array $params |
|
83 | - */ |
|
84 | - public function postShared($params) { |
|
85 | - if ($this->encryptionManager->isEnabled()) { |
|
86 | - if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { |
|
87 | - $path = Filesystem::getPath($params['fileSource']); |
|
88 | - list($owner, $ownerPath) = $this->getOwnerPath($path); |
|
89 | - $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
90 | - $this->update($absPath); |
|
91 | - } |
|
92 | - } |
|
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * hook after file was unshared |
|
97 | - * |
|
98 | - * @param array $params |
|
99 | - */ |
|
100 | - public function postUnshared($params) { |
|
101 | - if ($this->encryptionManager->isEnabled()) { |
|
102 | - if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { |
|
103 | - $path = Filesystem::getPath($params['fileSource']); |
|
104 | - list($owner, $ownerPath) = $this->getOwnerPath($path); |
|
105 | - $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
106 | - $this->update($absPath); |
|
107 | - } |
|
108 | - } |
|
109 | - } |
|
110 | - |
|
111 | - /** |
|
112 | - * inform encryption module that a file was restored from the trash bin, |
|
113 | - * e.g. to update the encryption keys |
|
114 | - * |
|
115 | - * @param array $params |
|
116 | - */ |
|
117 | - public function postRestore($params) { |
|
118 | - if ($this->encryptionManager->isEnabled()) { |
|
119 | - $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']); |
|
120 | - $this->update($path); |
|
121 | - } |
|
122 | - } |
|
123 | - |
|
124 | - /** |
|
125 | - * inform encryption module that a file was renamed, |
|
126 | - * e.g. to update the encryption keys |
|
127 | - * |
|
128 | - * @param array $params |
|
129 | - */ |
|
130 | - public function postRename($params) { |
|
131 | - $source = $params['oldpath']; |
|
132 | - $target = $params['newpath']; |
|
133 | - if ( |
|
134 | - $this->encryptionManager->isEnabled() && |
|
135 | - dirname($source) !== dirname($target) |
|
136 | - ) { |
|
137 | - list($owner, $ownerPath) = $this->getOwnerPath($target); |
|
138 | - $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
139 | - $this->update($absPath); |
|
140 | - } |
|
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * get owner and path relative to data/<owner>/files |
|
145 | - * |
|
146 | - * @param string $path path to file for current user |
|
147 | - * @return array ['owner' => $owner, 'path' => $path] |
|
148 | - * @throw \InvalidArgumentException |
|
149 | - */ |
|
150 | - protected function getOwnerPath($path) { |
|
151 | - $info = Filesystem::getFileInfo($path); |
|
152 | - $owner = Filesystem::getOwner($path); |
|
153 | - $view = new View('/' . $owner . '/files'); |
|
154 | - $path = $view->getPath($info->getId()); |
|
155 | - if ($path === null) { |
|
156 | - throw new \InvalidArgumentException('No file found for ' . $info->getId()); |
|
157 | - } |
|
158 | - |
|
159 | - return [$owner, $path]; |
|
160 | - } |
|
161 | - |
|
162 | - /** |
|
163 | - * notify encryption module about added/removed users from a file/folder |
|
164 | - * |
|
165 | - * @param string $path relative to data/ |
|
166 | - * @throws Exceptions\ModuleDoesNotExistsException |
|
167 | - */ |
|
168 | - public function update($path) { |
|
169 | - $encryptionModule = $this->encryptionManager->getEncryptionModule(); |
|
170 | - |
|
171 | - // if the encryption module doesn't encrypt the files on a per-user basis |
|
172 | - // we have nothing to do here. |
|
173 | - if ($encryptionModule->needDetailedAccessList() === false) { |
|
174 | - return; |
|
175 | - } |
|
176 | - |
|
177 | - // if a folder was shared, get a list of all (sub-)folders |
|
178 | - if ($this->view->is_dir($path)) { |
|
179 | - $allFiles = $this->util->getAllFiles($path); |
|
180 | - } else { |
|
181 | - $allFiles = [$path]; |
|
182 | - } |
|
183 | - |
|
184 | - |
|
185 | - |
|
186 | - foreach ($allFiles as $file) { |
|
187 | - $usersSharing = $this->file->getAccessList($file); |
|
188 | - $encryptionModule->update($file, $this->uid, $usersSharing); |
|
189 | - } |
|
190 | - } |
|
36 | + /** @var \OC\Files\View */ |
|
37 | + protected $view; |
|
38 | + |
|
39 | + /** @var \OC\Encryption\Util */ |
|
40 | + protected $util; |
|
41 | + |
|
42 | + /** @var \OC\Files\Mount\Manager */ |
|
43 | + protected $mountManager; |
|
44 | + |
|
45 | + /** @var \OC\Encryption\Manager */ |
|
46 | + protected $encryptionManager; |
|
47 | + |
|
48 | + /** @var string */ |
|
49 | + protected $uid; |
|
50 | + |
|
51 | + /** @var \OC\Encryption\File */ |
|
52 | + protected $file; |
|
53 | + |
|
54 | + /** |
|
55 | + * |
|
56 | + * @param \OC\Files\View $view |
|
57 | + * @param \OC\Encryption\Util $util |
|
58 | + * @param \OC\Files\Mount\Manager $mountManager |
|
59 | + * @param \OC\Encryption\Manager $encryptionManager |
|
60 | + * @param \OC\Encryption\File $file |
|
61 | + * @param string $uid |
|
62 | + */ |
|
63 | + public function __construct( |
|
64 | + View $view, |
|
65 | + Util $util, |
|
66 | + Mount\Manager $mountManager, |
|
67 | + Manager $encryptionManager, |
|
68 | + File $file, |
|
69 | + $uid |
|
70 | + ) { |
|
71 | + $this->view = $view; |
|
72 | + $this->util = $util; |
|
73 | + $this->mountManager = $mountManager; |
|
74 | + $this->encryptionManager = $encryptionManager; |
|
75 | + $this->file = $file; |
|
76 | + $this->uid = $uid; |
|
77 | + } |
|
78 | + |
|
79 | + /** |
|
80 | + * hook after file was shared |
|
81 | + * |
|
82 | + * @param array $params |
|
83 | + */ |
|
84 | + public function postShared($params) { |
|
85 | + if ($this->encryptionManager->isEnabled()) { |
|
86 | + if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { |
|
87 | + $path = Filesystem::getPath($params['fileSource']); |
|
88 | + list($owner, $ownerPath) = $this->getOwnerPath($path); |
|
89 | + $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
90 | + $this->update($absPath); |
|
91 | + } |
|
92 | + } |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * hook after file was unshared |
|
97 | + * |
|
98 | + * @param array $params |
|
99 | + */ |
|
100 | + public function postUnshared($params) { |
|
101 | + if ($this->encryptionManager->isEnabled()) { |
|
102 | + if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { |
|
103 | + $path = Filesystem::getPath($params['fileSource']); |
|
104 | + list($owner, $ownerPath) = $this->getOwnerPath($path); |
|
105 | + $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
106 | + $this->update($absPath); |
|
107 | + } |
|
108 | + } |
|
109 | + } |
|
110 | + |
|
111 | + /** |
|
112 | + * inform encryption module that a file was restored from the trash bin, |
|
113 | + * e.g. to update the encryption keys |
|
114 | + * |
|
115 | + * @param array $params |
|
116 | + */ |
|
117 | + public function postRestore($params) { |
|
118 | + if ($this->encryptionManager->isEnabled()) { |
|
119 | + $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']); |
|
120 | + $this->update($path); |
|
121 | + } |
|
122 | + } |
|
123 | + |
|
124 | + /** |
|
125 | + * inform encryption module that a file was renamed, |
|
126 | + * e.g. to update the encryption keys |
|
127 | + * |
|
128 | + * @param array $params |
|
129 | + */ |
|
130 | + public function postRename($params) { |
|
131 | + $source = $params['oldpath']; |
|
132 | + $target = $params['newpath']; |
|
133 | + if ( |
|
134 | + $this->encryptionManager->isEnabled() && |
|
135 | + dirname($source) !== dirname($target) |
|
136 | + ) { |
|
137 | + list($owner, $ownerPath) = $this->getOwnerPath($target); |
|
138 | + $absPath = '/' . $owner . '/files/' . $ownerPath; |
|
139 | + $this->update($absPath); |
|
140 | + } |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * get owner and path relative to data/<owner>/files |
|
145 | + * |
|
146 | + * @param string $path path to file for current user |
|
147 | + * @return array ['owner' => $owner, 'path' => $path] |
|
148 | + * @throw \InvalidArgumentException |
|
149 | + */ |
|
150 | + protected function getOwnerPath($path) { |
|
151 | + $info = Filesystem::getFileInfo($path); |
|
152 | + $owner = Filesystem::getOwner($path); |
|
153 | + $view = new View('/' . $owner . '/files'); |
|
154 | + $path = $view->getPath($info->getId()); |
|
155 | + if ($path === null) { |
|
156 | + throw new \InvalidArgumentException('No file found for ' . $info->getId()); |
|
157 | + } |
|
158 | + |
|
159 | + return [$owner, $path]; |
|
160 | + } |
|
161 | + |
|
162 | + /** |
|
163 | + * notify encryption module about added/removed users from a file/folder |
|
164 | + * |
|
165 | + * @param string $path relative to data/ |
|
166 | + * @throws Exceptions\ModuleDoesNotExistsException |
|
167 | + */ |
|
168 | + public function update($path) { |
|
169 | + $encryptionModule = $this->encryptionManager->getEncryptionModule(); |
|
170 | + |
|
171 | + // if the encryption module doesn't encrypt the files on a per-user basis |
|
172 | + // we have nothing to do here. |
|
173 | + if ($encryptionModule->needDetailedAccessList() === false) { |
|
174 | + return; |
|
175 | + } |
|
176 | + |
|
177 | + // if a folder was shared, get a list of all (sub-)folders |
|
178 | + if ($this->view->is_dir($path)) { |
|
179 | + $allFiles = $this->util->getAllFiles($path); |
|
180 | + } else { |
|
181 | + $allFiles = [$path]; |
|
182 | + } |
|
183 | + |
|
184 | + |
|
185 | + |
|
186 | + foreach ($allFiles as $file) { |
|
187 | + $usersSharing = $this->file->getAccessList($file); |
|
188 | + $encryptionModule->update($file, $this->uid, $usersSharing); |
|
189 | + } |
|
190 | + } |
|
191 | 191 | } |
@@ -36,54 +36,54 @@ |
||
36 | 36 | * @method void setName(string $name) |
37 | 37 | */ |
38 | 38 | class Tag extends Entity { |
39 | - protected $owner; |
|
40 | - protected $type; |
|
41 | - protected $name; |
|
39 | + protected $owner; |
|
40 | + protected $type; |
|
41 | + protected $name; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Constructor. |
|
45 | - * |
|
46 | - * @param string $owner The tag's owner |
|
47 | - * @param string $type The type of item this tag is used for |
|
48 | - * @param string $name The tag's name |
|
49 | - */ |
|
50 | - public function __construct($owner = null, $type = null, $name = null) { |
|
51 | - $this->setOwner($owner); |
|
52 | - $this->setType($type); |
|
53 | - $this->setName($name); |
|
54 | - } |
|
43 | + /** |
|
44 | + * Constructor. |
|
45 | + * |
|
46 | + * @param string $owner The tag's owner |
|
47 | + * @param string $type The type of item this tag is used for |
|
48 | + * @param string $name The tag's name |
|
49 | + */ |
|
50 | + public function __construct($owner = null, $type = null, $name = null) { |
|
51 | + $this->setOwner($owner); |
|
52 | + $this->setType($type); |
|
53 | + $this->setName($name); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Transform a database columnname to a property |
|
58 | - * |
|
59 | - * @param string $columnName the name of the column |
|
60 | - * @return string the property name |
|
61 | - * @todo migrate existing database columns to the correct names |
|
62 | - * to be able to drop this direct mapping |
|
63 | - */ |
|
64 | - public function columnToProperty($columnName) { |
|
65 | - if ($columnName === 'category') { |
|
66 | - return 'name'; |
|
67 | - } elseif ($columnName === 'uid') { |
|
68 | - return 'owner'; |
|
69 | - } else { |
|
70 | - return parent::columnToProperty($columnName); |
|
71 | - } |
|
72 | - } |
|
56 | + /** |
|
57 | + * Transform a database columnname to a property |
|
58 | + * |
|
59 | + * @param string $columnName the name of the column |
|
60 | + * @return string the property name |
|
61 | + * @todo migrate existing database columns to the correct names |
|
62 | + * to be able to drop this direct mapping |
|
63 | + */ |
|
64 | + public function columnToProperty($columnName) { |
|
65 | + if ($columnName === 'category') { |
|
66 | + return 'name'; |
|
67 | + } elseif ($columnName === 'uid') { |
|
68 | + return 'owner'; |
|
69 | + } else { |
|
70 | + return parent::columnToProperty($columnName); |
|
71 | + } |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * Transform a property to a database column name |
|
76 | - * |
|
77 | - * @param string $property the name of the property |
|
78 | - * @return string the column name |
|
79 | - */ |
|
80 | - public function propertyToColumn($property) { |
|
81 | - if ($property === 'name') { |
|
82 | - return 'category'; |
|
83 | - } elseif ($property === 'owner') { |
|
84 | - return 'uid'; |
|
85 | - } else { |
|
86 | - return parent::propertyToColumn($property); |
|
87 | - } |
|
88 | - } |
|
74 | + /** |
|
75 | + * Transform a property to a database column name |
|
76 | + * |
|
77 | + * @param string $property the name of the property |
|
78 | + * @return string the column name |
|
79 | + */ |
|
80 | + public function propertyToColumn($property) { |
|
81 | + if ($property === 'name') { |
|
82 | + return 'category'; |
|
83 | + } elseif ($property === 'owner') { |
|
84 | + return 'uid'; |
|
85 | + } else { |
|
86 | + return parent::propertyToColumn($property); |
|
87 | + } |
|
88 | + } |
|
89 | 89 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @package OC\AppFramework\Middleware\Security\Exceptions |
33 | 33 | */ |
34 | 34 | class StrictCookieMissingException extends SecurityException { |
35 | - public function __construct() { |
|
36 | - parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | - } |
|
35 | + public function __construct() { |
|
36 | + parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | + } |
|
38 | 38 | } |
@@ -43,84 +43,84 @@ |
||
43 | 43 | */ |
44 | 44 | class EntityTypeCollection extends RootCollection { |
45 | 45 | |
46 | - /** @var ILogger */ |
|
47 | - protected $logger; |
|
46 | + /** @var ILogger */ |
|
47 | + protected $logger; |
|
48 | 48 | |
49 | - /** @var IUserManager */ |
|
50 | - protected $userManager; |
|
49 | + /** @var IUserManager */ |
|
50 | + protected $userManager; |
|
51 | 51 | |
52 | - /** @var \Closure */ |
|
53 | - protected $childExistsFunction; |
|
52 | + /** @var \Closure */ |
|
53 | + protected $childExistsFunction; |
|
54 | 54 | |
55 | - /** |
|
56 | - * @param string $name |
|
57 | - * @param ICommentsManager $commentsManager |
|
58 | - * @param IUserManager $userManager |
|
59 | - * @param IUserSession $userSession |
|
60 | - * @param ILogger $logger |
|
61 | - * @param \Closure $childExistsFunction |
|
62 | - */ |
|
63 | - public function __construct( |
|
64 | - $name, |
|
65 | - ICommentsManager $commentsManager, |
|
66 | - IUserManager $userManager, |
|
67 | - IUserSession $userSession, |
|
68 | - ILogger $logger, |
|
69 | - \Closure $childExistsFunction |
|
70 | - ) { |
|
71 | - $name = trim($name); |
|
72 | - if (empty($name) || !is_string($name)) { |
|
73 | - throw new \InvalidArgumentException('"name" parameter must be non-empty string'); |
|
74 | - } |
|
75 | - $this->name = $name; |
|
76 | - $this->commentsManager = $commentsManager; |
|
77 | - $this->logger = $logger; |
|
78 | - $this->userManager = $userManager; |
|
79 | - $this->userSession = $userSession; |
|
80 | - $this->childExistsFunction = $childExistsFunction; |
|
81 | - } |
|
55 | + /** |
|
56 | + * @param string $name |
|
57 | + * @param ICommentsManager $commentsManager |
|
58 | + * @param IUserManager $userManager |
|
59 | + * @param IUserSession $userSession |
|
60 | + * @param ILogger $logger |
|
61 | + * @param \Closure $childExistsFunction |
|
62 | + */ |
|
63 | + public function __construct( |
|
64 | + $name, |
|
65 | + ICommentsManager $commentsManager, |
|
66 | + IUserManager $userManager, |
|
67 | + IUserSession $userSession, |
|
68 | + ILogger $logger, |
|
69 | + \Closure $childExistsFunction |
|
70 | + ) { |
|
71 | + $name = trim($name); |
|
72 | + if (empty($name) || !is_string($name)) { |
|
73 | + throw new \InvalidArgumentException('"name" parameter must be non-empty string'); |
|
74 | + } |
|
75 | + $this->name = $name; |
|
76 | + $this->commentsManager = $commentsManager; |
|
77 | + $this->logger = $logger; |
|
78 | + $this->userManager = $userManager; |
|
79 | + $this->userSession = $userSession; |
|
80 | + $this->childExistsFunction = $childExistsFunction; |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * Returns a specific child node, referenced by its name |
|
85 | - * |
|
86 | - * This method must throw Sabre\DAV\Exception\NotFound if the node does not |
|
87 | - * exist. |
|
88 | - * |
|
89 | - * @param string $name |
|
90 | - * @return \Sabre\DAV\INode |
|
91 | - * @throws NotFound |
|
92 | - */ |
|
93 | - public function getChild($name) { |
|
94 | - if (!$this->childExists($name)) { |
|
95 | - throw new NotFound('Entity does not exist or is not available'); |
|
96 | - } |
|
97 | - return new EntityCollection( |
|
98 | - $name, |
|
99 | - $this->name, |
|
100 | - $this->commentsManager, |
|
101 | - $this->userManager, |
|
102 | - $this->userSession, |
|
103 | - $this->logger |
|
104 | - ); |
|
105 | - } |
|
83 | + /** |
|
84 | + * Returns a specific child node, referenced by its name |
|
85 | + * |
|
86 | + * This method must throw Sabre\DAV\Exception\NotFound if the node does not |
|
87 | + * exist. |
|
88 | + * |
|
89 | + * @param string $name |
|
90 | + * @return \Sabre\DAV\INode |
|
91 | + * @throws NotFound |
|
92 | + */ |
|
93 | + public function getChild($name) { |
|
94 | + if (!$this->childExists($name)) { |
|
95 | + throw new NotFound('Entity does not exist or is not available'); |
|
96 | + } |
|
97 | + return new EntityCollection( |
|
98 | + $name, |
|
99 | + $this->name, |
|
100 | + $this->commentsManager, |
|
101 | + $this->userManager, |
|
102 | + $this->userSession, |
|
103 | + $this->logger |
|
104 | + ); |
|
105 | + } |
|
106 | 106 | |
107 | - /** |
|
108 | - * Returns an array with all the child nodes |
|
109 | - * |
|
110 | - * @return \Sabre\DAV\INode[] |
|
111 | - * @throws MethodNotAllowed |
|
112 | - */ |
|
113 | - public function getChildren() { |
|
114 | - throw new MethodNotAllowed('No permission to list folder contents'); |
|
115 | - } |
|
107 | + /** |
|
108 | + * Returns an array with all the child nodes |
|
109 | + * |
|
110 | + * @return \Sabre\DAV\INode[] |
|
111 | + * @throws MethodNotAllowed |
|
112 | + */ |
|
113 | + public function getChildren() { |
|
114 | + throw new MethodNotAllowed('No permission to list folder contents'); |
|
115 | + } |
|
116 | 116 | |
117 | - /** |
|
118 | - * Checks if a child-node with the specified name exists |
|
119 | - * |
|
120 | - * @param string $name |
|
121 | - * @return bool |
|
122 | - */ |
|
123 | - public function childExists($name) { |
|
124 | - return call_user_func($this->childExistsFunction, $name); |
|
125 | - } |
|
117 | + /** |
|
118 | + * Checks if a child-node with the specified name exists |
|
119 | + * |
|
120 | + * @param string $name |
|
121 | + * @return bool |
|
122 | + */ |
|
123 | + public function childExists($name) { |
|
124 | + return call_user_func($this->childExistsFunction, $name); |
|
125 | + } |
|
126 | 126 | } |
@@ -29,36 +29,36 @@ |
||
29 | 29 | |
30 | 30 | class SyncSystemAddressBook extends Command { |
31 | 31 | |
32 | - /** @var SyncService */ |
|
33 | - private $syncService; |
|
32 | + /** @var SyncService */ |
|
33 | + private $syncService; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param SyncService $syncService |
|
37 | - */ |
|
38 | - public function __construct(SyncService $syncService) { |
|
39 | - parent::__construct(); |
|
40 | - $this->syncService = $syncService; |
|
41 | - } |
|
35 | + /** |
|
36 | + * @param SyncService $syncService |
|
37 | + */ |
|
38 | + public function __construct(SyncService $syncService) { |
|
39 | + parent::__construct(); |
|
40 | + $this->syncService = $syncService; |
|
41 | + } |
|
42 | 42 | |
43 | - protected function configure() { |
|
44 | - $this |
|
45 | - ->setName('dav:sync-system-addressbook') |
|
46 | - ->setDescription('Synchronizes users to the system addressbook'); |
|
47 | - } |
|
43 | + protected function configure() { |
|
44 | + $this |
|
45 | + ->setName('dav:sync-system-addressbook') |
|
46 | + ->setDescription('Synchronizes users to the system addressbook'); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param InputInterface $input |
|
51 | - * @param OutputInterface $output |
|
52 | - */ |
|
53 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
54 | - $output->writeln('Syncing users ...'); |
|
55 | - $progress = new ProgressBar($output); |
|
56 | - $progress->start(); |
|
57 | - $this->syncService->syncInstance(function () use ($progress) { |
|
58 | - $progress->advance(); |
|
59 | - }); |
|
49 | + /** |
|
50 | + * @param InputInterface $input |
|
51 | + * @param OutputInterface $output |
|
52 | + */ |
|
53 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
54 | + $output->writeln('Syncing users ...'); |
|
55 | + $progress = new ProgressBar($output); |
|
56 | + $progress->start(); |
|
57 | + $this->syncService->syncInstance(function () use ($progress) { |
|
58 | + $progress->advance(); |
|
59 | + }); |
|
60 | 60 | |
61 | - $progress->finish(); |
|
62 | - $output->writeln(''); |
|
63 | - } |
|
61 | + $progress->finish(); |
|
62 | + $output->writeln(''); |
|
63 | + } |
|
64 | 64 | } |
@@ -26,71 +26,71 @@ |
||
26 | 26 | use Sabre\DAV\File; |
27 | 27 | |
28 | 28 | class AvatarNode extends File { |
29 | - private $ext; |
|
30 | - private $size; |
|
31 | - private $avatar; |
|
29 | + private $ext; |
|
30 | + private $size; |
|
31 | + private $avatar; |
|
32 | 32 | |
33 | - /** |
|
34 | - * AvatarNode constructor. |
|
35 | - * |
|
36 | - * @param integer $size |
|
37 | - * @param string $ext |
|
38 | - * @param IAvatar $avatar |
|
39 | - */ |
|
40 | - public function __construct($size, $ext, $avatar) { |
|
41 | - $this->size = $size; |
|
42 | - $this->ext = $ext; |
|
43 | - $this->avatar = $avatar; |
|
44 | - } |
|
33 | + /** |
|
34 | + * AvatarNode constructor. |
|
35 | + * |
|
36 | + * @param integer $size |
|
37 | + * @param string $ext |
|
38 | + * @param IAvatar $avatar |
|
39 | + */ |
|
40 | + public function __construct($size, $ext, $avatar) { |
|
41 | + $this->size = $size; |
|
42 | + $this->ext = $ext; |
|
43 | + $this->avatar = $avatar; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Returns the name of the node. |
|
48 | - * |
|
49 | - * This is used to generate the url. |
|
50 | - * |
|
51 | - * @return string |
|
52 | - */ |
|
53 | - public function getName() { |
|
54 | - return "$this->size.$this->ext"; |
|
55 | - } |
|
46 | + /** |
|
47 | + * Returns the name of the node. |
|
48 | + * |
|
49 | + * This is used to generate the url. |
|
50 | + * |
|
51 | + * @return string |
|
52 | + */ |
|
53 | + public function getName() { |
|
54 | + return "$this->size.$this->ext"; |
|
55 | + } |
|
56 | 56 | |
57 | - public function get() { |
|
58 | - $image = $this->avatar->get($this->size); |
|
59 | - $res = $image->resource(); |
|
57 | + public function get() { |
|
58 | + $image = $this->avatar->get($this->size); |
|
59 | + $res = $image->resource(); |
|
60 | 60 | |
61 | - ob_start(); |
|
62 | - if ($this->ext === 'png') { |
|
63 | - imagepng($res); |
|
64 | - } else { |
|
65 | - imagejpeg($res); |
|
66 | - } |
|
61 | + ob_start(); |
|
62 | + if ($this->ext === 'png') { |
|
63 | + imagepng($res); |
|
64 | + } else { |
|
65 | + imagejpeg($res); |
|
66 | + } |
|
67 | 67 | |
68 | - return ob_get_clean(); |
|
69 | - } |
|
68 | + return ob_get_clean(); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Returns the mime-type for a file |
|
73 | - * |
|
74 | - * If null is returned, we'll assume application/octet-stream |
|
75 | - * |
|
76 | - * @return string|null |
|
77 | - */ |
|
78 | - public function getContentType() { |
|
79 | - if ($this->ext === 'png') { |
|
80 | - return 'image/png'; |
|
81 | - } |
|
82 | - return 'image/jpeg'; |
|
83 | - } |
|
71 | + /** |
|
72 | + * Returns the mime-type for a file |
|
73 | + * |
|
74 | + * If null is returned, we'll assume application/octet-stream |
|
75 | + * |
|
76 | + * @return string|null |
|
77 | + */ |
|
78 | + public function getContentType() { |
|
79 | + if ($this->ext === 'png') { |
|
80 | + return 'image/png'; |
|
81 | + } |
|
82 | + return 'image/jpeg'; |
|
83 | + } |
|
84 | 84 | |
85 | - public function getETag() { |
|
86 | - return $this->avatar->getFile($this->size)->getEtag(); |
|
87 | - } |
|
85 | + public function getETag() { |
|
86 | + return $this->avatar->getFile($this->size)->getEtag(); |
|
87 | + } |
|
88 | 88 | |
89 | - public function getLastModified() { |
|
90 | - $timestamp = $this->avatar->getFile($this->size)->getMTime(); |
|
91 | - if (!empty($timestamp)) { |
|
92 | - return (int)$timestamp; |
|
93 | - } |
|
94 | - return $timestamp; |
|
95 | - } |
|
89 | + public function getLastModified() { |
|
90 | + $timestamp = $this->avatar->getFile($this->size)->getMTime(); |
|
91 | + if (!empty($timestamp)) { |
|
92 | + return (int)$timestamp; |
|
93 | + } |
|
94 | + return $timestamp; |
|
95 | + } |
|
96 | 96 | } |