@@ -26,60 +26,60 @@ |
||
26 | 26 | use OCP\ITagManager; |
27 | 27 | |
28 | 28 | class Helper { |
29 | - /** If a user has a lot of favorites the query might get too slow and long */ |
|
30 | - const FAVORITE_LIMIT = 50; |
|
29 | + /** If a user has a lot of favorites the query might get too slow and long */ |
|
30 | + const FAVORITE_LIMIT = 50; |
|
31 | 31 | |
32 | - /** @var ITagManager */ |
|
33 | - protected $tagManager; |
|
32 | + /** @var ITagManager */ |
|
33 | + protected $tagManager; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param ITagManager $tagManager |
|
37 | - */ |
|
38 | - public function __construct(ITagManager $tagManager) { |
|
39 | - $this->tagManager = $tagManager; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @param ITagManager $tagManager |
|
37 | + */ |
|
38 | + public function __construct(ITagManager $tagManager) { |
|
39 | + $this->tagManager = $tagManager; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Returns an array with the favorites |
|
44 | - * |
|
45 | - * @param string $user |
|
46 | - * @return array |
|
47 | - * @throws \RuntimeException when too many or no favorites where found |
|
48 | - */ |
|
49 | - public function getFavoriteFilePaths($user) { |
|
50 | - $tags = $this->tagManager->load('files', [], false, $user); |
|
51 | - $favorites = $tags->getFavorites(); |
|
42 | + /** |
|
43 | + * Returns an array with the favorites |
|
44 | + * |
|
45 | + * @param string $user |
|
46 | + * @return array |
|
47 | + * @throws \RuntimeException when too many or no favorites where found |
|
48 | + */ |
|
49 | + public function getFavoriteFilePaths($user) { |
|
50 | + $tags = $this->tagManager->load('files', [], false, $user); |
|
51 | + $favorites = $tags->getFavorites(); |
|
52 | 52 | |
53 | - if (empty($favorites)) { |
|
54 | - throw new \RuntimeException('No favorites', 1); |
|
55 | - } else if (isset($favorites[self::FAVORITE_LIMIT])) { |
|
56 | - throw new \RuntimeException('Too many favorites', 2); |
|
57 | - } |
|
53 | + if (empty($favorites)) { |
|
54 | + throw new \RuntimeException('No favorites', 1); |
|
55 | + } else if (isset($favorites[self::FAVORITE_LIMIT])) { |
|
56 | + throw new \RuntimeException('Too many favorites', 2); |
|
57 | + } |
|
58 | 58 | |
59 | - // Can not DI because the user is not known on instantiation |
|
60 | - $rootFolder = \OC::$server->getUserFolder($user); |
|
61 | - $folders = $items = []; |
|
62 | - foreach ($favorites as $favorite) { |
|
63 | - $nodes = $rootFolder->getById($favorite); |
|
64 | - if (!empty($nodes)) { |
|
65 | - /** @var \OCP\Files\Node $node */ |
|
66 | - $node = array_shift($nodes); |
|
67 | - $path = substr($node->getPath(), strlen($user . '/files/')); |
|
59 | + // Can not DI because the user is not known on instantiation |
|
60 | + $rootFolder = \OC::$server->getUserFolder($user); |
|
61 | + $folders = $items = []; |
|
62 | + foreach ($favorites as $favorite) { |
|
63 | + $nodes = $rootFolder->getById($favorite); |
|
64 | + if (!empty($nodes)) { |
|
65 | + /** @var \OCP\Files\Node $node */ |
|
66 | + $node = array_shift($nodes); |
|
67 | + $path = substr($node->getPath(), strlen($user . '/files/')); |
|
68 | 68 | |
69 | - $items[] = $path; |
|
70 | - if ($node instanceof Folder) { |
|
71 | - $folders[] = $path; |
|
72 | - } |
|
73 | - } |
|
74 | - } |
|
69 | + $items[] = $path; |
|
70 | + if ($node instanceof Folder) { |
|
71 | + $folders[] = $path; |
|
72 | + } |
|
73 | + } |
|
74 | + } |
|
75 | 75 | |
76 | - if (empty($items)) { |
|
77 | - throw new \RuntimeException('No favorites', 1); |
|
78 | - } |
|
76 | + if (empty($items)) { |
|
77 | + throw new \RuntimeException('No favorites', 1); |
|
78 | + } |
|
79 | 79 | |
80 | - return [ |
|
81 | - 'items' => $items, |
|
82 | - 'folders' => $folders, |
|
83 | - ]; |
|
84 | - } |
|
80 | + return [ |
|
81 | + 'items' => $items, |
|
82 | + 'folders' => $folders, |
|
83 | + ]; |
|
84 | + } |
|
85 | 85 | } |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class FileChanged implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'file_changed'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'file_changed'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 1; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 1; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class FileCreated implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'file_created'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'file_created'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('A new file or folder has been <strong>created</strong>'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('A new file or folder has been <strong>created</strong>'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 0; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 0; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class FavoriteAction implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'favorite'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'favorite'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 5; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 5; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class FileFavorite implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'file_favorite'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'file_favorite'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 2; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 2; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return false; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return false; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return false; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return false; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -29,23 +29,23 @@ |
||
29 | 29 | use OCP\Util; |
30 | 30 | |
31 | 31 | class SettingsController extends Controller { |
32 | - public function __construct($appName, IRequest $request) { |
|
33 | - parent::__construct($appName, $request); |
|
34 | - } |
|
32 | + public function __construct($appName, IRequest $request) { |
|
33 | + parent::__construct($appName, $request); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $maxUploadSize |
|
38 | - * @return JSONResponse |
|
39 | - */ |
|
40 | - public function setMaxUploadSize($maxUploadSize) { |
|
41 | - $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize)); |
|
36 | + /** |
|
37 | + * @param string $maxUploadSize |
|
38 | + * @return JSONResponse |
|
39 | + */ |
|
40 | + public function setMaxUploadSize($maxUploadSize) { |
|
41 | + $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize)); |
|
42 | 42 | |
43 | - if ($setMaxSize === false) { |
|
44 | - return new JSONResponse([], Http::STATUS_BAD_REQUEST); |
|
45 | - } else { |
|
46 | - return new JSONResponse([ |
|
47 | - 'maxUploadSize' => Util::humanFileSize($setMaxSize) |
|
48 | - ]); |
|
49 | - } |
|
50 | - } |
|
43 | + if ($setMaxSize === false) { |
|
44 | + return new JSONResponse([], Http::STATUS_BAD_REQUEST); |
|
45 | + } else { |
|
46 | + return new JSONResponse([ |
|
47 | + 'maxUploadSize' => Util::humanFileSize($setMaxSize) |
|
48 | + ]); |
|
49 | + } |
|
50 | + } |
|
51 | 51 | } |
@@ -34,29 +34,29 @@ |
||
34 | 34 | * @package OCA\Files |
35 | 35 | */ |
36 | 36 | class Capabilities implements ICapability { |
37 | - /** @var IConfig */ |
|
38 | - protected $config; |
|
37 | + /** @var IConfig */ |
|
38 | + protected $config; |
|
39 | 39 | |
40 | - /** |
|
41 | - * Capabilities constructor. |
|
42 | - * |
|
43 | - * @param IConfig $config |
|
44 | - */ |
|
45 | - public function __construct(IConfig $config) { |
|
46 | - $this->config = $config; |
|
47 | - } |
|
40 | + /** |
|
41 | + * Capabilities constructor. |
|
42 | + * |
|
43 | + * @param IConfig $config |
|
44 | + */ |
|
45 | + public function __construct(IConfig $config) { |
|
46 | + $this->config = $config; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Return this classes capabilities |
|
51 | - * |
|
52 | - * @return array |
|
53 | - */ |
|
54 | - public function getCapabilities() { |
|
55 | - return [ |
|
56 | - 'files' => [ |
|
57 | - 'bigfilechunking' => true, |
|
58 | - 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), |
|
59 | - ], |
|
60 | - ]; |
|
61 | - } |
|
49 | + /** |
|
50 | + * Return this classes capabilities |
|
51 | + * |
|
52 | + * @return array |
|
53 | + */ |
|
54 | + public function getCapabilities() { |
|
55 | + return [ |
|
56 | + 'files' => [ |
|
57 | + 'bigfilechunking' => true, |
|
58 | + 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), |
|
59 | + ], |
|
60 | + ]; |
|
61 | + } |
|
62 | 62 | } |
@@ -30,29 +30,29 @@ |
||
30 | 30 | */ |
31 | 31 | class CleanupFileLocks extends TimedJob { |
32 | 32 | |
33 | - /** |
|
34 | - * Default interval in minutes |
|
35 | - * |
|
36 | - * @var int $defaultIntervalMin |
|
37 | - **/ |
|
38 | - protected $defaultIntervalMin = 5; |
|
33 | + /** |
|
34 | + * Default interval in minutes |
|
35 | + * |
|
36 | + * @var int $defaultIntervalMin |
|
37 | + **/ |
|
38 | + protected $defaultIntervalMin = 5; |
|
39 | 39 | |
40 | - /** |
|
41 | - * sets the correct interval for this timed job |
|
42 | - */ |
|
43 | - public function __construct() { |
|
44 | - $this->interval = $this->defaultIntervalMin * 60; |
|
45 | - } |
|
40 | + /** |
|
41 | + * sets the correct interval for this timed job |
|
42 | + */ |
|
43 | + public function __construct() { |
|
44 | + $this->interval = $this->defaultIntervalMin * 60; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Makes the background job do its work |
|
49 | - * |
|
50 | - * @param array $argument unused argument |
|
51 | - */ |
|
52 | - public function run($argument) { |
|
53 | - $lockingProvider = \OC::$server->getLockingProvider(); |
|
54 | - if($lockingProvider instanceof DBLockingProvider) { |
|
55 | - $lockingProvider->cleanExpiredLocks(); |
|
56 | - } |
|
57 | - } |
|
47 | + /** |
|
48 | + * Makes the background job do its work |
|
49 | + * |
|
50 | + * @param array $argument unused argument |
|
51 | + */ |
|
52 | + public function run($argument) { |
|
53 | + $lockingProvider = \OC::$server->getLockingProvider(); |
|
54 | + if($lockingProvider instanceof DBLockingProvider) { |
|
55 | + $lockingProvider->cleanExpiredLocks(); |
|
56 | + } |
|
57 | + } |
|
58 | 58 | } |
@@ -32,123 +32,123 @@ |
||
32 | 32 | */ |
33 | 33 | class DeleteOrphanedItems extends TimedJob { |
34 | 34 | |
35 | - const CHUNK_SIZE = 200; |
|
36 | - |
|
37 | - /** @var \OCP\IDBConnection */ |
|
38 | - protected $connection; |
|
39 | - |
|
40 | - /** @var \OCP\ILogger */ |
|
41 | - protected $logger; |
|
42 | - |
|
43 | - /** |
|
44 | - * Default interval in minutes |
|
45 | - * |
|
46 | - * @var int $defaultIntervalMin |
|
47 | - **/ |
|
48 | - protected $defaultIntervalMin = 60; |
|
49 | - |
|
50 | - /** |
|
51 | - * sets the correct interval for this timed job |
|
52 | - */ |
|
53 | - public function __construct() { |
|
54 | - $this->interval = $this->defaultIntervalMin * 60; |
|
55 | - $this->connection = \OC::$server->getDatabaseConnection(); |
|
56 | - $this->logger = \OC::$server->getLogger(); |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * Makes the background job do its work |
|
61 | - * |
|
62 | - * @param array $argument unused argument |
|
63 | - */ |
|
64 | - public function run($argument) { |
|
65 | - $this->cleanSystemTags(); |
|
66 | - $this->cleanUserTags(); |
|
67 | - $this->cleanComments(); |
|
68 | - $this->cleanCommentMarkers(); |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * Deleting orphaned system tag mappings |
|
73 | - * |
|
74 | - * @param string $table |
|
75 | - * @param string $idCol |
|
76 | - * @param string $typeCol |
|
77 | - * @return int Number of deleted entries |
|
78 | - */ |
|
79 | - protected function cleanUp($table, $idCol, $typeCol) { |
|
80 | - $deletedEntries = 0; |
|
81 | - |
|
82 | - $query = $this->connection->getQueryBuilder(); |
|
83 | - $query->select('t1.' . $idCol) |
|
84 | - ->from($table, 't1') |
|
85 | - ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
|
86 | - ->andWhere($query->expr()->isNull('t2.fileid')) |
|
87 | - ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | - ->groupBy('t1.' . $idCol) |
|
89 | - ->setMaxResults(self::CHUNK_SIZE); |
|
90 | - |
|
91 | - $deleteQuery = $this->connection->getQueryBuilder(); |
|
92 | - $deleteQuery->delete($table) |
|
93 | - ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid'))); |
|
94 | - |
|
95 | - $deletedInLastChunk = self::CHUNK_SIZE; |
|
96 | - while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
97 | - $result = $query->execute(); |
|
98 | - $deletedInLastChunk = 0; |
|
99 | - while ($row = $result->fetch()) { |
|
100 | - $deletedInLastChunk++; |
|
101 | - $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol]) |
|
102 | - ->execute(); |
|
103 | - } |
|
104 | - $result->closeCursor(); |
|
105 | - } |
|
106 | - |
|
107 | - return $deletedEntries; |
|
108 | - } |
|
109 | - |
|
110 | - /** |
|
111 | - * Deleting orphaned system tag mappings |
|
112 | - * |
|
113 | - * @return int Number of deleted entries |
|
114 | - */ |
|
115 | - protected function cleanSystemTags() { |
|
116 | - $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype'); |
|
117 | - $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
118 | - return $deletedEntries; |
|
119 | - } |
|
120 | - |
|
121 | - /** |
|
122 | - * Deleting orphaned user tag mappings |
|
123 | - * |
|
124 | - * @return int Number of deleted entries |
|
125 | - */ |
|
126 | - protected function cleanUserTags() { |
|
127 | - $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type'); |
|
128 | - $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
129 | - return $deletedEntries; |
|
130 | - } |
|
131 | - |
|
132 | - /** |
|
133 | - * Deleting orphaned comments |
|
134 | - * |
|
135 | - * @return int Number of deleted entries |
|
136 | - */ |
|
137 | - protected function cleanComments() { |
|
138 | - $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type'); |
|
139 | - $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']); |
|
140 | - return $deletedEntries; |
|
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * Deleting orphaned comment read markers |
|
145 | - * |
|
146 | - * @return int Number of deleted entries |
|
147 | - */ |
|
148 | - protected function cleanCommentMarkers() { |
|
149 | - $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type'); |
|
150 | - $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']); |
|
151 | - return $deletedEntries; |
|
152 | - } |
|
35 | + const CHUNK_SIZE = 200; |
|
36 | + |
|
37 | + /** @var \OCP\IDBConnection */ |
|
38 | + protected $connection; |
|
39 | + |
|
40 | + /** @var \OCP\ILogger */ |
|
41 | + protected $logger; |
|
42 | + |
|
43 | + /** |
|
44 | + * Default interval in minutes |
|
45 | + * |
|
46 | + * @var int $defaultIntervalMin |
|
47 | + **/ |
|
48 | + protected $defaultIntervalMin = 60; |
|
49 | + |
|
50 | + /** |
|
51 | + * sets the correct interval for this timed job |
|
52 | + */ |
|
53 | + public function __construct() { |
|
54 | + $this->interval = $this->defaultIntervalMin * 60; |
|
55 | + $this->connection = \OC::$server->getDatabaseConnection(); |
|
56 | + $this->logger = \OC::$server->getLogger(); |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * Makes the background job do its work |
|
61 | + * |
|
62 | + * @param array $argument unused argument |
|
63 | + */ |
|
64 | + public function run($argument) { |
|
65 | + $this->cleanSystemTags(); |
|
66 | + $this->cleanUserTags(); |
|
67 | + $this->cleanComments(); |
|
68 | + $this->cleanCommentMarkers(); |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * Deleting orphaned system tag mappings |
|
73 | + * |
|
74 | + * @param string $table |
|
75 | + * @param string $idCol |
|
76 | + * @param string $typeCol |
|
77 | + * @return int Number of deleted entries |
|
78 | + */ |
|
79 | + protected function cleanUp($table, $idCol, $typeCol) { |
|
80 | + $deletedEntries = 0; |
|
81 | + |
|
82 | + $query = $this->connection->getQueryBuilder(); |
|
83 | + $query->select('t1.' . $idCol) |
|
84 | + ->from($table, 't1') |
|
85 | + ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
|
86 | + ->andWhere($query->expr()->isNull('t2.fileid')) |
|
87 | + ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | + ->groupBy('t1.' . $idCol) |
|
89 | + ->setMaxResults(self::CHUNK_SIZE); |
|
90 | + |
|
91 | + $deleteQuery = $this->connection->getQueryBuilder(); |
|
92 | + $deleteQuery->delete($table) |
|
93 | + ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid'))); |
|
94 | + |
|
95 | + $deletedInLastChunk = self::CHUNK_SIZE; |
|
96 | + while ($deletedInLastChunk === self::CHUNK_SIZE) { |
|
97 | + $result = $query->execute(); |
|
98 | + $deletedInLastChunk = 0; |
|
99 | + while ($row = $result->fetch()) { |
|
100 | + $deletedInLastChunk++; |
|
101 | + $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol]) |
|
102 | + ->execute(); |
|
103 | + } |
|
104 | + $result->closeCursor(); |
|
105 | + } |
|
106 | + |
|
107 | + return $deletedEntries; |
|
108 | + } |
|
109 | + |
|
110 | + /** |
|
111 | + * Deleting orphaned system tag mappings |
|
112 | + * |
|
113 | + * @return int Number of deleted entries |
|
114 | + */ |
|
115 | + protected function cleanSystemTags() { |
|
116 | + $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype'); |
|
117 | + $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
118 | + return $deletedEntries; |
|
119 | + } |
|
120 | + |
|
121 | + /** |
|
122 | + * Deleting orphaned user tag mappings |
|
123 | + * |
|
124 | + * @return int Number of deleted entries |
|
125 | + */ |
|
126 | + protected function cleanUserTags() { |
|
127 | + $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type'); |
|
128 | + $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']); |
|
129 | + return $deletedEntries; |
|
130 | + } |
|
131 | + |
|
132 | + /** |
|
133 | + * Deleting orphaned comments |
|
134 | + * |
|
135 | + * @return int Number of deleted entries |
|
136 | + */ |
|
137 | + protected function cleanComments() { |
|
138 | + $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type'); |
|
139 | + $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']); |
|
140 | + return $deletedEntries; |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * Deleting orphaned comment read markers |
|
145 | + * |
|
146 | + * @return int Number of deleted entries |
|
147 | + */ |
|
148 | + protected function cleanCommentMarkers() { |
|
149 | + $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type'); |
|
150 | + $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']); |
|
151 | + return $deletedEntries; |
|
152 | + } |
|
153 | 153 | |
154 | 154 | } |