@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $dir = $pathinfo['dirname']; |
59 | 59 | $i = 2; |
60 | 60 | while ($view->file_exists($path) || in_array($path, $excludeList)) { |
61 | - $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext); |
|
61 | + $path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext); |
|
62 | 62 | $i++; |
63 | 63 | } |
64 | 64 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $dir = ''; |
83 | 83 | $subdirs = explode('/', $shareFolder); |
84 | 84 | foreach ($subdirs as $subdir) { |
85 | - $dir = $dir . '/' . $subdir; |
|
85 | + $dir = $dir.'/'.$subdir; |
|
86 | 86 | if (!$view->is_dir($dir)) { |
87 | 87 | $view->mkdir($dir); |
88 | 88 | } |
@@ -32,81 +32,81 @@ |
||
32 | 32 | use OCA\Files_Sharing\AppInfo\Application; |
33 | 33 | |
34 | 34 | class Helper { |
35 | - public static function registerHooks() { |
|
36 | - \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook'); |
|
37 | - \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren'); |
|
35 | + public static function registerHooks() { |
|
36 | + \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook'); |
|
37 | + \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren'); |
|
38 | 38 | |
39 | - \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser'); |
|
40 | - } |
|
39 | + \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser'); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * check if file name already exists and generate unique target |
|
44 | - * |
|
45 | - * @param string $path |
|
46 | - * @param array $excludeList |
|
47 | - * @param View $view |
|
48 | - * @return string $path |
|
49 | - */ |
|
50 | - public static function generateUniqueTarget($path, $excludeList, $view) { |
|
51 | - $pathinfo = pathinfo($path); |
|
52 | - $ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : ''; |
|
53 | - $name = $pathinfo['filename']; |
|
54 | - $dir = $pathinfo['dirname']; |
|
55 | - $i = 2; |
|
56 | - while ($view->file_exists($path) || in_array($path, $excludeList)) { |
|
57 | - $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext); |
|
58 | - $i++; |
|
59 | - } |
|
42 | + /** |
|
43 | + * check if file name already exists and generate unique target |
|
44 | + * |
|
45 | + * @param string $path |
|
46 | + * @param array $excludeList |
|
47 | + * @param View $view |
|
48 | + * @return string $path |
|
49 | + */ |
|
50 | + public static function generateUniqueTarget($path, $excludeList, $view) { |
|
51 | + $pathinfo = pathinfo($path); |
|
52 | + $ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : ''; |
|
53 | + $name = $pathinfo['filename']; |
|
54 | + $dir = $pathinfo['dirname']; |
|
55 | + $i = 2; |
|
56 | + while ($view->file_exists($path) || in_array($path, $excludeList)) { |
|
57 | + $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext); |
|
58 | + $i++; |
|
59 | + } |
|
60 | 60 | |
61 | - return $path; |
|
62 | - } |
|
61 | + return $path; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * get default share folder |
|
66 | - * |
|
67 | - * @param \OC\Files\View|null $view |
|
68 | - * @param string|null $userId |
|
69 | - * @return string |
|
70 | - */ |
|
71 | - public static function getShareFolder(View $view = null, string $userId = null): string { |
|
72 | - if ($view === null) { |
|
73 | - $view = Filesystem::getView(); |
|
74 | - } |
|
64 | + /** |
|
65 | + * get default share folder |
|
66 | + * |
|
67 | + * @param \OC\Files\View|null $view |
|
68 | + * @param string|null $userId |
|
69 | + * @return string |
|
70 | + */ |
|
71 | + public static function getShareFolder(View $view = null, string $userId = null): string { |
|
72 | + if ($view === null) { |
|
73 | + $view = Filesystem::getView(); |
|
74 | + } |
|
75 | 75 | |
76 | - $config = \OC::$server->getConfig(); |
|
77 | - $systemDefault = $config->getSystemValue('share_folder', '/'); |
|
78 | - $allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true); |
|
76 | + $config = \OC::$server->getConfig(); |
|
77 | + $systemDefault = $config->getSystemValue('share_folder', '/'); |
|
78 | + $allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true); |
|
79 | 79 | |
80 | - // Init custom shareFolder |
|
81 | - $shareFolder = $systemDefault; |
|
82 | - if ($userId !== null && $allowCustomShareFolder) { |
|
83 | - $shareFolder = $config->getUserValue($userId, Application::APP_ID, 'share_folder', $systemDefault); |
|
84 | - } |
|
80 | + // Init custom shareFolder |
|
81 | + $shareFolder = $systemDefault; |
|
82 | + if ($userId !== null && $allowCustomShareFolder) { |
|
83 | + $shareFolder = $config->getUserValue($userId, Application::APP_ID, 'share_folder', $systemDefault); |
|
84 | + } |
|
85 | 85 | |
86 | - // Verify and sanitize path |
|
87 | - $shareFolder = Filesystem::normalizePath($shareFolder); |
|
86 | + // Verify and sanitize path |
|
87 | + $shareFolder = Filesystem::normalizePath($shareFolder); |
|
88 | 88 | |
89 | - // Init path if folder doesn't exists |
|
90 | - if (!$view->file_exists($shareFolder)) { |
|
91 | - $dir = ''; |
|
92 | - $subdirs = explode('/', $shareFolder); |
|
93 | - foreach ($subdirs as $subdir) { |
|
94 | - $dir = $dir . '/' . $subdir; |
|
95 | - if (!$view->is_dir($dir)) { |
|
96 | - $view->mkdir($dir); |
|
97 | - } |
|
98 | - } |
|
99 | - } |
|
89 | + // Init path if folder doesn't exists |
|
90 | + if (!$view->file_exists($shareFolder)) { |
|
91 | + $dir = ''; |
|
92 | + $subdirs = explode('/', $shareFolder); |
|
93 | + foreach ($subdirs as $subdir) { |
|
94 | + $dir = $dir . '/' . $subdir; |
|
95 | + if (!$view->is_dir($dir)) { |
|
96 | + $view->mkdir($dir); |
|
97 | + } |
|
98 | + } |
|
99 | + } |
|
100 | 100 | |
101 | - return $shareFolder; |
|
102 | - } |
|
101 | + return $shareFolder; |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * set default share folder |
|
106 | - * |
|
107 | - * @param string $shareFolder |
|
108 | - */ |
|
109 | - public static function setShareFolder($shareFolder) { |
|
110 | - \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder); |
|
111 | - } |
|
104 | + /** |
|
105 | + * set default share folder |
|
106 | + * |
|
107 | + * @param string $shareFolder |
|
108 | + */ |
|
109 | + public static function setShareFolder($shareFolder) { |
|
110 | + \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder); |
|
111 | + } |
|
112 | 112 | } |
@@ -34,48 +34,48 @@ |
||
34 | 34 | */ |
35 | 35 | class Attachment implements IAttachment { |
36 | 36 | |
37 | - /** @var \Swift_Mime_Attachment */ |
|
38 | - protected $swiftAttachment; |
|
37 | + /** @var \Swift_Mime_Attachment */ |
|
38 | + protected $swiftAttachment; |
|
39 | 39 | |
40 | - public function __construct(\Swift_Mime_Attachment $attachment) { |
|
41 | - $this->swiftAttachment = $attachment; |
|
42 | - } |
|
40 | + public function __construct(\Swift_Mime_Attachment $attachment) { |
|
41 | + $this->swiftAttachment = $attachment; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param string $filename |
|
46 | - * @return $this |
|
47 | - * @since 13.0.0 |
|
48 | - */ |
|
49 | - public function setFilename(string $filename): IAttachment { |
|
50 | - $this->swiftAttachment->setFilename($filename); |
|
51 | - return $this; |
|
52 | - } |
|
44 | + /** |
|
45 | + * @param string $filename |
|
46 | + * @return $this |
|
47 | + * @since 13.0.0 |
|
48 | + */ |
|
49 | + public function setFilename(string $filename): IAttachment { |
|
50 | + $this->swiftAttachment->setFilename($filename); |
|
51 | + return $this; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param string $contentType |
|
56 | - * @return $this |
|
57 | - * @since 13.0.0 |
|
58 | - */ |
|
59 | - public function setContentType(string $contentType): IAttachment { |
|
60 | - $this->swiftAttachment->setContentType($contentType); |
|
61 | - return $this; |
|
62 | - } |
|
54 | + /** |
|
55 | + * @param string $contentType |
|
56 | + * @return $this |
|
57 | + * @since 13.0.0 |
|
58 | + */ |
|
59 | + public function setContentType(string $contentType): IAttachment { |
|
60 | + $this->swiftAttachment->setContentType($contentType); |
|
61 | + return $this; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * @param string $body |
|
66 | - * @return $this |
|
67 | - * @since 13.0.0 |
|
68 | - */ |
|
69 | - public function setBody(string $body): IAttachment { |
|
70 | - $this->swiftAttachment->setBody($body); |
|
71 | - return $this; |
|
72 | - } |
|
64 | + /** |
|
65 | + * @param string $body |
|
66 | + * @return $this |
|
67 | + * @since 13.0.0 |
|
68 | + */ |
|
69 | + public function setBody(string $body): IAttachment { |
|
70 | + $this->swiftAttachment->setBody($body); |
|
71 | + return $this; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return \Swift_Mime_Attachment |
|
76 | - */ |
|
77 | - public function getSwiftAttachment(): \Swift_Mime_Attachment { |
|
78 | - return $this->swiftAttachment; |
|
79 | - } |
|
74 | + /** |
|
75 | + * @return \Swift_Mime_Attachment |
|
76 | + */ |
|
77 | + public function getSwiftAttachment(): \Swift_Mime_Attachment { |
|
78 | + return $this->swiftAttachment; |
|
79 | + } |
|
80 | 80 | |
81 | 81 | } |
@@ -46,60 +46,60 @@ |
||
46 | 46 | * @since 8.1.0 |
47 | 47 | */ |
48 | 48 | interface IMailer { |
49 | - /** |
|
50 | - * Creates a new message object that can be passed to send() |
|
51 | - * |
|
52 | - * @return IMessage |
|
53 | - * @since 8.1.0 |
|
54 | - */ |
|
55 | - public function createMessage(): IMessage; |
|
49 | + /** |
|
50 | + * Creates a new message object that can be passed to send() |
|
51 | + * |
|
52 | + * @return IMessage |
|
53 | + * @since 8.1.0 |
|
54 | + */ |
|
55 | + public function createMessage(): IMessage; |
|
56 | 56 | |
57 | - /** |
|
58 | - * @param string|null $data |
|
59 | - * @param string|null $filename |
|
60 | - * @param string|null $contentType |
|
61 | - * @return IAttachment |
|
62 | - * @since 13.0.0 |
|
63 | - */ |
|
64 | - public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment; |
|
57 | + /** |
|
58 | + * @param string|null $data |
|
59 | + * @param string|null $filename |
|
60 | + * @param string|null $contentType |
|
61 | + * @return IAttachment |
|
62 | + * @since 13.0.0 |
|
63 | + */ |
|
64 | + public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment; |
|
65 | 65 | |
66 | - /** |
|
67 | - * @param string $path |
|
68 | - * @param string|null $contentType |
|
69 | - * @return IAttachment |
|
70 | - * @since 13.0.0 |
|
71 | - */ |
|
72 | - public function createAttachmentFromPath(string $path, $contentType = null): IAttachment; |
|
66 | + /** |
|
67 | + * @param string $path |
|
68 | + * @param string|null $contentType |
|
69 | + * @return IAttachment |
|
70 | + * @since 13.0.0 |
|
71 | + */ |
|
72 | + public function createAttachmentFromPath(string $path, $contentType = null): IAttachment; |
|
73 | 73 | |
74 | - /** |
|
75 | - * Creates a new email template object |
|
76 | - * |
|
77 | - * @param string $emailId |
|
78 | - * @param array $data |
|
79 | - * @return IEMailTemplate |
|
80 | - * @since 12.0.0 Parameters added in 12.0.3 |
|
81 | - */ |
|
82 | - public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate; |
|
74 | + /** |
|
75 | + * Creates a new email template object |
|
76 | + * |
|
77 | + * @param string $emailId |
|
78 | + * @param array $data |
|
79 | + * @return IEMailTemplate |
|
80 | + * @since 12.0.0 Parameters added in 12.0.3 |
|
81 | + */ |
|
82 | + public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate; |
|
83 | 83 | |
84 | - /** |
|
85 | - * Send the specified message. Also sets the from address to the value defined in config.php |
|
86 | - * if no-one has been passed. |
|
87 | - * |
|
88 | - * @param IMessage $message Message to send |
|
89 | - * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and |
|
90 | - * therefore should be considered |
|
91 | - * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address |
|
92 | - * has been supplied.) |
|
93 | - * @since 8.1.0 |
|
94 | - */ |
|
95 | - public function send(IMessage $message): array; |
|
84 | + /** |
|
85 | + * Send the specified message. Also sets the from address to the value defined in config.php |
|
86 | + * if no-one has been passed. |
|
87 | + * |
|
88 | + * @param IMessage $message Message to send |
|
89 | + * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and |
|
90 | + * therefore should be considered |
|
91 | + * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address |
|
92 | + * has been supplied.) |
|
93 | + * @since 8.1.0 |
|
94 | + */ |
|
95 | + public function send(IMessage $message): array; |
|
96 | 96 | |
97 | - /** |
|
98 | - * Checks if an e-mail address is valid |
|
99 | - * |
|
100 | - * @param string $email Email address to be validated |
|
101 | - * @return bool True if the mail address is valid, false otherwise |
|
102 | - * @since 8.1.0 |
|
103 | - */ |
|
104 | - public function validateMailAddress(string $email): bool; |
|
97 | + /** |
|
98 | + * Checks if an e-mail address is valid |
|
99 | + * |
|
100 | + * @param string $email Email address to be validated |
|
101 | + * @return bool True if the mail address is valid, false otherwise |
|
102 | + * @since 8.1.0 |
|
103 | + */ |
|
104 | + public function validateMailAddress(string $email): bool; |
|
105 | 105 | } |
@@ -32,25 +32,25 @@ |
||
32 | 32 | */ |
33 | 33 | interface IAttachment { |
34 | 34 | |
35 | - /** |
|
36 | - * @param string $filename |
|
37 | - * @return IAttachment |
|
38 | - * @since 13.0.0 |
|
39 | - */ |
|
40 | - public function setFilename(string $filename): IAttachment; |
|
35 | + /** |
|
36 | + * @param string $filename |
|
37 | + * @return IAttachment |
|
38 | + * @since 13.0.0 |
|
39 | + */ |
|
40 | + public function setFilename(string $filename): IAttachment; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param string $contentType |
|
44 | - * @return IAttachment |
|
45 | - * @since 13.0.0 |
|
46 | - */ |
|
47 | - public function setContentType(string $contentType): IAttachment; |
|
42 | + /** |
|
43 | + * @param string $contentType |
|
44 | + * @return IAttachment |
|
45 | + * @since 13.0.0 |
|
46 | + */ |
|
47 | + public function setContentType(string $contentType): IAttachment; |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param string $body |
|
51 | - * @return IAttachment |
|
52 | - * @since 13.0.0 |
|
53 | - */ |
|
54 | - public function setBody(string $body): IAttachment; |
|
49 | + /** |
|
50 | + * @param string $body |
|
51 | + * @return IAttachment |
|
52 | + * @since 13.0.0 |
|
53 | + */ |
|
54 | + public function setBody(string $body): IAttachment; |
|
55 | 55 | |
56 | 56 | } |
@@ -32,64 +32,64 @@ |
||
32 | 32 | */ |
33 | 33 | interface IMessage { |
34 | 34 | |
35 | - /** |
|
36 | - * @param IAttachment $attachment |
|
37 | - * @return IMessage |
|
38 | - * @since 13.0.0 |
|
39 | - */ |
|
40 | - public function attach(IAttachment $attachment): IMessage; |
|
35 | + /** |
|
36 | + * @param IAttachment $attachment |
|
37 | + * @return IMessage |
|
38 | + * @since 13.0.0 |
|
39 | + */ |
|
40 | + public function attach(IAttachment $attachment): IMessage; |
|
41 | 41 | |
42 | - /** |
|
43 | - * Set the from address of this message. |
|
44 | - * |
|
45 | - * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php |
|
46 | - * |
|
47 | - * @param array $addresses Example: array('[email protected]', '[email protected]' => 'A name') |
|
48 | - * @return IMessage |
|
49 | - * @since 13.0.0 |
|
50 | - */ |
|
51 | - public function setFrom(array $addresses): IMessage; |
|
42 | + /** |
|
43 | + * Set the from address of this message. |
|
44 | + * |
|
45 | + * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php |
|
46 | + * |
|
47 | + * @param array $addresses Example: array('[email protected]', '[email protected]' => 'A name') |
|
48 | + * @return IMessage |
|
49 | + * @since 13.0.0 |
|
50 | + */ |
|
51 | + public function setFrom(array $addresses): IMessage; |
|
52 | 52 | |
53 | - /** |
|
54 | - * Set the Reply-To address of this message |
|
55 | - * |
|
56 | - * @param array $addresses |
|
57 | - * @return IMessage |
|
58 | - * @since 13.0.0 |
|
59 | - */ |
|
60 | - public function setReplyTo(array $addresses): IMessage; |
|
53 | + /** |
|
54 | + * Set the Reply-To address of this message |
|
55 | + * |
|
56 | + * @param array $addresses |
|
57 | + * @return IMessage |
|
58 | + * @since 13.0.0 |
|
59 | + */ |
|
60 | + public function setReplyTo(array $addresses): IMessage; |
|
61 | 61 | |
62 | - /** |
|
63 | - * Set the to addresses of this message. |
|
64 | - * |
|
65 | - * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
66 | - * @return IMessage |
|
67 | - * @since 13.0.0 |
|
68 | - */ |
|
69 | - public function setTo(array $recipients): IMessage; |
|
62 | + /** |
|
63 | + * Set the to addresses of this message. |
|
64 | + * |
|
65 | + * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
66 | + * @return IMessage |
|
67 | + * @since 13.0.0 |
|
68 | + */ |
|
69 | + public function setTo(array $recipients): IMessage; |
|
70 | 70 | |
71 | - /** |
|
72 | - * Set the CC recipients of this message. |
|
73 | - * |
|
74 | - * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
75 | - * @return IMessage |
|
76 | - * @since 13.0.0 |
|
77 | - */ |
|
78 | - public function setCc(array $recipients): IMessage; |
|
71 | + /** |
|
72 | + * Set the CC recipients of this message. |
|
73 | + * |
|
74 | + * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
75 | + * @return IMessage |
|
76 | + * @since 13.0.0 |
|
77 | + */ |
|
78 | + public function setCc(array $recipients): IMessage; |
|
79 | 79 | |
80 | - /** |
|
81 | - * Set the BCC recipients of this message. |
|
82 | - * |
|
83 | - * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
84 | - * @return IMessage |
|
85 | - * @since 13.0.0 |
|
86 | - */ |
|
87 | - public function setBcc(array $recipients): IMessage; |
|
80 | + /** |
|
81 | + * Set the BCC recipients of this message. |
|
82 | + * |
|
83 | + * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
84 | + * @return IMessage |
|
85 | + * @since 13.0.0 |
|
86 | + */ |
|
87 | + public function setBcc(array $recipients): IMessage; |
|
88 | 88 | |
89 | - /** |
|
90 | - * @param IEMailTemplate $emailTemplate |
|
91 | - * @return IMessage |
|
92 | - * @since 13.0.0 |
|
93 | - */ |
|
94 | - public function useTemplate(IEMailTemplate $emailTemplate): IMessage; |
|
89 | + /** |
|
90 | + * @param IEMailTemplate $emailTemplate |
|
91 | + * @return IMessage |
|
92 | + * @since 13.0.0 |
|
93 | + */ |
|
94 | + public function useTemplate(IEMailTemplate $emailTemplate): IMessage; |
|
95 | 95 | } |
@@ -32,23 +32,23 @@ |
||
32 | 32 | * @package OC\Security\CSRF |
33 | 33 | */ |
34 | 34 | class CsrfTokenGenerator { |
35 | - /** @var ISecureRandom */ |
|
36 | - private $random; |
|
35 | + /** @var ISecureRandom */ |
|
36 | + private $random; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param ISecureRandom $random |
|
40 | - */ |
|
41 | - public function __construct(ISecureRandom $random) { |
|
42 | - $this->random = $random; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @param ISecureRandom $random |
|
40 | + */ |
|
41 | + public function __construct(ISecureRandom $random) { |
|
42 | + $this->random = $random; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Generate a new CSRF token. |
|
47 | - * |
|
48 | - * @param int $length Length of the token in characters. |
|
49 | - * @return string |
|
50 | - */ |
|
51 | - public function generateToken(int $length = 32): string { |
|
52 | - return $this->random->generate($length); |
|
53 | - } |
|
45 | + /** |
|
46 | + * Generate a new CSRF token. |
|
47 | + * |
|
48 | + * @param int $length Length of the token in characters. |
|
49 | + * @return string |
|
50 | + */ |
|
51 | + public function generateToken(int $length = 32): string { |
|
52 | + return $this->random->generate($length); |
|
53 | + } |
|
54 | 54 | } |
@@ -25,25 +25,25 @@ |
||
25 | 25 | namespace OC\Security\IdentityProof; |
26 | 26 | |
27 | 27 | class Key { |
28 | - /** @var string */ |
|
29 | - private $publicKey; |
|
30 | - /** @var string */ |
|
31 | - private $privateKey; |
|
28 | + /** @var string */ |
|
29 | + private $publicKey; |
|
30 | + /** @var string */ |
|
31 | + private $privateKey; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param string $publicKey |
|
35 | - * @param string $privateKey |
|
36 | - */ |
|
37 | - public function __construct(string $publicKey, string $privateKey) { |
|
38 | - $this->publicKey = $publicKey; |
|
39 | - $this->privateKey = $privateKey; |
|
40 | - } |
|
33 | + /** |
|
34 | + * @param string $publicKey |
|
35 | + * @param string $privateKey |
|
36 | + */ |
|
37 | + public function __construct(string $publicKey, string $privateKey) { |
|
38 | + $this->publicKey = $publicKey; |
|
39 | + $this->privateKey = $privateKey; |
|
40 | + } |
|
41 | 41 | |
42 | - public function getPrivate(): string { |
|
43 | - return $this->privateKey; |
|
44 | - } |
|
42 | + public function getPrivate(): string { |
|
43 | + return $this->privateKey; |
|
44 | + } |
|
45 | 45 | |
46 | - public function getPublic(): string { |
|
47 | - return $this->publicKey; |
|
48 | - } |
|
46 | + public function getPublic(): string { |
|
47 | + return $this->publicKey; |
|
48 | + } |
|
49 | 49 | } |
@@ -100,7 +100,7 @@ |
||
100 | 100 | |
101 | 101 | // casted to string because cast to float cause equality for non equal numbers |
102 | 102 | // and integer has the problem of limited size on 32 bit systems |
103 | - if ((string)$expectedSize !== (string)$actualSize) { |
|
103 | + if ((string) $expectedSize !== (string) $actualSize) { |
|
104 | 104 | throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
105 | 105 | } |
106 | 106 | } |
@@ -35,97 +35,97 @@ |
||
35 | 35 | |
36 | 36 | class ChunkingPlugin extends ServerPlugin { |
37 | 37 | |
38 | - /** @var Server */ |
|
39 | - private $server; |
|
40 | - /** @var FutureFile */ |
|
41 | - private $sourceNode; |
|
38 | + /** @var Server */ |
|
39 | + private $server; |
|
40 | + /** @var FutureFile */ |
|
41 | + private $sourceNode; |
|
42 | 42 | |
43 | - /** |
|
44 | - * @inheritdoc |
|
45 | - */ |
|
46 | - public function initialize(Server $server) { |
|
47 | - $server->on('beforeMove', [$this, 'beforeMove']); |
|
48 | - $this->server = $server; |
|
49 | - } |
|
43 | + /** |
|
44 | + * @inheritdoc |
|
45 | + */ |
|
46 | + public function initialize(Server $server) { |
|
47 | + $server->on('beforeMove', [$this, 'beforeMove']); |
|
48 | + $this->server = $server; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @param string $sourcePath source path |
|
53 | - * @param string $destination destination path |
|
54 | - * @return bool|void |
|
55 | - * @throws BadRequest |
|
56 | - * @throws NotFound |
|
57 | - */ |
|
58 | - public function beforeMove($sourcePath, $destination) { |
|
59 | - $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath); |
|
60 | - if (!$this->sourceNode instanceof FutureFile) { |
|
61 | - // skip handling as the source is not a chunked FutureFile |
|
62 | - return; |
|
63 | - } |
|
51 | + /** |
|
52 | + * @param string $sourcePath source path |
|
53 | + * @param string $destination destination path |
|
54 | + * @return bool|void |
|
55 | + * @throws BadRequest |
|
56 | + * @throws NotFound |
|
57 | + */ |
|
58 | + public function beforeMove($sourcePath, $destination) { |
|
59 | + $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath); |
|
60 | + if (!$this->sourceNode instanceof FutureFile) { |
|
61 | + // skip handling as the source is not a chunked FutureFile |
|
62 | + return; |
|
63 | + } |
|
64 | 64 | |
65 | - try { |
|
66 | - /** @var INode $destinationNode */ |
|
67 | - $destinationNode = $this->server->tree->getNodeForPath($destination); |
|
68 | - if ($destinationNode instanceof Directory) { |
|
69 | - throw new BadRequest("The given destination $destination is a directory."); |
|
70 | - } |
|
71 | - } catch (NotFound $e) { |
|
72 | - // If the destination does not exist yet it's not a directory either ;) |
|
73 | - } |
|
65 | + try { |
|
66 | + /** @var INode $destinationNode */ |
|
67 | + $destinationNode = $this->server->tree->getNodeForPath($destination); |
|
68 | + if ($destinationNode instanceof Directory) { |
|
69 | + throw new BadRequest("The given destination $destination is a directory."); |
|
70 | + } |
|
71 | + } catch (NotFound $e) { |
|
72 | + // If the destination does not exist yet it's not a directory either ;) |
|
73 | + } |
|
74 | 74 | |
75 | - $this->verifySize(); |
|
76 | - return $this->performMove($sourcePath, $destination); |
|
77 | - } |
|
75 | + $this->verifySize(); |
|
76 | + return $this->performMove($sourcePath, $destination); |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * Move handler for future file. |
|
81 | - * |
|
82 | - * This overrides the default move behavior to prevent Sabre |
|
83 | - * to delete the target file before moving. Because deleting would |
|
84 | - * lose the file id and metadata. |
|
85 | - * |
|
86 | - * @param string $path source path |
|
87 | - * @param string $destination destination path |
|
88 | - * @return bool|void false to stop handling, void to skip this handler |
|
89 | - */ |
|
90 | - public function performMove($path, $destination) { |
|
91 | - $fileExists = $this->server->tree->nodeExists($destination); |
|
92 | - // do a move manually, skipping Sabre's default "delete" for existing nodes |
|
93 | - try { |
|
94 | - $this->server->tree->move($path, $destination); |
|
95 | - } catch (Forbidden $e) { |
|
96 | - $sourceNode = $this->server->tree->getNodeForPath($path); |
|
97 | - if ($sourceNode instanceof FutureFile) { |
|
98 | - $sourceNode->delete(); |
|
99 | - } |
|
100 | - throw $e; |
|
101 | - } |
|
79 | + /** |
|
80 | + * Move handler for future file. |
|
81 | + * |
|
82 | + * This overrides the default move behavior to prevent Sabre |
|
83 | + * to delete the target file before moving. Because deleting would |
|
84 | + * lose the file id and metadata. |
|
85 | + * |
|
86 | + * @param string $path source path |
|
87 | + * @param string $destination destination path |
|
88 | + * @return bool|void false to stop handling, void to skip this handler |
|
89 | + */ |
|
90 | + public function performMove($path, $destination) { |
|
91 | + $fileExists = $this->server->tree->nodeExists($destination); |
|
92 | + // do a move manually, skipping Sabre's default "delete" for existing nodes |
|
93 | + try { |
|
94 | + $this->server->tree->move($path, $destination); |
|
95 | + } catch (Forbidden $e) { |
|
96 | + $sourceNode = $this->server->tree->getNodeForPath($path); |
|
97 | + if ($sourceNode instanceof FutureFile) { |
|
98 | + $sourceNode->delete(); |
|
99 | + } |
|
100 | + throw $e; |
|
101 | + } |
|
102 | 102 | |
103 | - // trigger all default events (copied from CorePlugin::move) |
|
104 | - $this->server->emit('afterMove', [$path, $destination]); |
|
105 | - $this->server->emit('afterUnbind', [$path]); |
|
106 | - $this->server->emit('afterBind', [$destination]); |
|
103 | + // trigger all default events (copied from CorePlugin::move) |
|
104 | + $this->server->emit('afterMove', [$path, $destination]); |
|
105 | + $this->server->emit('afterUnbind', [$path]); |
|
106 | + $this->server->emit('afterBind', [$destination]); |
|
107 | 107 | |
108 | - $response = $this->server->httpResponse; |
|
109 | - $response->setHeader('Content-Length', '0'); |
|
110 | - $response->setStatus($fileExists ? 204 : 201); |
|
108 | + $response = $this->server->httpResponse; |
|
109 | + $response->setHeader('Content-Length', '0'); |
|
110 | + $response->setStatus($fileExists ? 204 : 201); |
|
111 | 111 | |
112 | - return false; |
|
113 | - } |
|
112 | + return false; |
|
113 | + } |
|
114 | 114 | |
115 | - /** |
|
116 | - * @throws BadRequest |
|
117 | - */ |
|
118 | - private function verifySize() { |
|
119 | - $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length'); |
|
120 | - if ($expectedSize === null) { |
|
121 | - return; |
|
122 | - } |
|
123 | - $actualSize = $this->sourceNode->getSize(); |
|
115 | + /** |
|
116 | + * @throws BadRequest |
|
117 | + */ |
|
118 | + private function verifySize() { |
|
119 | + $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length'); |
|
120 | + if ($expectedSize === null) { |
|
121 | + return; |
|
122 | + } |
|
123 | + $actualSize = $this->sourceNode->getSize(); |
|
124 | 124 | |
125 | - // casted to string because cast to float cause equality for non equal numbers |
|
126 | - // and integer has the problem of limited size on 32 bit systems |
|
127 | - if ((string)$expectedSize !== (string)$actualSize) { |
|
128 | - throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
|
129 | - } |
|
130 | - } |
|
125 | + // casted to string because cast to float cause equality for non equal numbers |
|
126 | + // and integer has the problem of limited size on 32 bit systems |
|
127 | + if ((string)$expectedSize !== (string)$actualSize) { |
|
128 | + throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
|
129 | + } |
|
130 | + } |
|
131 | 131 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | \OC_JSON::checkAppEnabled('user_ldap'); |
30 | 30 | \OC_JSON::callCheck(); |
31 | 31 | |
32 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
32 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
33 | 33 | $ldapWrapper = new OCA\User_LDAP\LDAP(); |
34 | 34 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
35 | 35 | $configuration = $connection->getConfiguration(); |
@@ -35,7 +35,7 @@ |
||
35 | 35 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
36 | 36 | $configuration = $connection->getConfiguration(); |
37 | 37 | if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') { |
38 | - // hide password |
|
39 | - $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
38 | + // hide password |
|
39 | + $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
40 | 40 | } |
41 | 41 | \OC_JSON::success(['configuration' => $configuration]); |