@@ -28,38 +28,38 @@ |
||
28 | 28 | |
29 | 29 | class HookManager { |
30 | 30 | |
31 | - private $hookInstances = []; |
|
31 | + private $hookInstances = []; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param array|IHook $instances |
|
35 | - * - This accepts either a single instance of IHook or an array of instances of IHook |
|
36 | - * @return bool |
|
37 | - */ |
|
38 | - public function registerHook($instances) { |
|
39 | - if (is_array($instances)) { |
|
40 | - foreach ($instances as $instance) { |
|
41 | - if (!$instance instanceof IHook) { |
|
42 | - return false; |
|
43 | - } |
|
44 | - $this->hookInstances[] = $instance; |
|
45 | - } |
|
33 | + /** |
|
34 | + * @param array|IHook $instances |
|
35 | + * - This accepts either a single instance of IHook or an array of instances of IHook |
|
36 | + * @return bool |
|
37 | + */ |
|
38 | + public function registerHook($instances) { |
|
39 | + if (is_array($instances)) { |
|
40 | + foreach ($instances as $instance) { |
|
41 | + if (!$instance instanceof IHook) { |
|
42 | + return false; |
|
43 | + } |
|
44 | + $this->hookInstances[] = $instance; |
|
45 | + } |
|
46 | 46 | |
47 | - } elseif ($instances instanceof IHook) { |
|
48 | - $this->hookInstances[] = $instances; |
|
49 | - } |
|
50 | - return true; |
|
51 | - } |
|
47 | + } elseif ($instances instanceof IHook) { |
|
48 | + $this->hookInstances[] = $instances; |
|
49 | + } |
|
50 | + return true; |
|
51 | + } |
|
52 | 52 | |
53 | - public function fireHooks() { |
|
54 | - foreach ($this->hookInstances as $instance) { |
|
55 | - /** |
|
56 | - * Fire off the add hooks method of each instance stored in cache |
|
57 | - * |
|
58 | - * @var $instance IHook |
|
59 | - */ |
|
60 | - $instance->addHooks(); |
|
61 | - } |
|
53 | + public function fireHooks() { |
|
54 | + foreach ($this->hookInstances as $instance) { |
|
55 | + /** |
|
56 | + * Fire off the add hooks method of each instance stored in cache |
|
57 | + * |
|
58 | + * @var $instance IHook |
|
59 | + */ |
|
60 | + $instance->addHooks(); |
|
61 | + } |
|
62 | 62 | |
63 | - } |
|
63 | + } |
|
64 | 64 | |
65 | 65 | } |
@@ -26,36 +26,36 @@ |
||
26 | 26 | |
27 | 27 | (new Application())->registerRoutes($this, array('routes' => array( |
28 | 28 | |
29 | - [ |
|
30 | - 'name' => 'Recovery#adminRecovery', |
|
31 | - 'url' => '/ajax/adminRecovery', |
|
32 | - 'verb' => 'POST' |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'name' => 'Settings#updatePrivateKeyPassword', |
|
36 | - 'url' => '/ajax/updatePrivateKeyPassword', |
|
37 | - 'verb' => 'POST' |
|
38 | - ], |
|
39 | - [ |
|
40 | - 'name' => 'Settings#setEncryptHomeStorage', |
|
41 | - 'url' => '/ajax/setEncryptHomeStorage', |
|
42 | - 'verb' => 'POST' |
|
43 | - ], |
|
44 | - [ |
|
45 | - 'name' => 'Recovery#changeRecoveryPassword', |
|
46 | - 'url' => '/ajax/changeRecoveryPassword', |
|
47 | - 'verb' => 'POST' |
|
48 | - ], |
|
49 | - [ |
|
50 | - 'name' => 'Recovery#userSetRecovery', |
|
51 | - 'url' => '/ajax/userSetRecovery', |
|
52 | - 'verb' => 'POST' |
|
53 | - ], |
|
54 | - [ |
|
55 | - 'name' => 'Status#getStatus', |
|
56 | - 'url' => '/ajax/getStatus', |
|
57 | - 'verb' => 'GET' |
|
58 | - ] |
|
29 | + [ |
|
30 | + 'name' => 'Recovery#adminRecovery', |
|
31 | + 'url' => '/ajax/adminRecovery', |
|
32 | + 'verb' => 'POST' |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'name' => 'Settings#updatePrivateKeyPassword', |
|
36 | + 'url' => '/ajax/updatePrivateKeyPassword', |
|
37 | + 'verb' => 'POST' |
|
38 | + ], |
|
39 | + [ |
|
40 | + 'name' => 'Settings#setEncryptHomeStorage', |
|
41 | + 'url' => '/ajax/setEncryptHomeStorage', |
|
42 | + 'verb' => 'POST' |
|
43 | + ], |
|
44 | + [ |
|
45 | + 'name' => 'Recovery#changeRecoveryPassword', |
|
46 | + 'url' => '/ajax/changeRecoveryPassword', |
|
47 | + 'verb' => 'POST' |
|
48 | + ], |
|
49 | + [ |
|
50 | + 'name' => 'Recovery#userSetRecovery', |
|
51 | + 'url' => '/ajax/userSetRecovery', |
|
52 | + 'verb' => 'POST' |
|
53 | + ], |
|
54 | + [ |
|
55 | + 'name' => 'Status#getStatus', |
|
56 | + 'url' => '/ajax/getStatus', |
|
57 | + 'verb' => 'GET' |
|
58 | + ] |
|
59 | 59 | |
60 | 60 | |
61 | 61 | ))); |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class Setting 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 'comments'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'comments'; |
|
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('<strong>Comments</strong> for files'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('<strong>Comments</strong> for files'); |
|
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 50; |
|
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 50; |
|
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 |
@@ -28,63 +28,63 @@ |
||
28 | 28 | |
29 | 29 | class Filter implements IFilter { |
30 | 30 | |
31 | - /** @var IL10N */ |
|
32 | - protected $l; |
|
31 | + /** @var IL10N */ |
|
32 | + protected $l; |
|
33 | 33 | |
34 | - /** @var IURLGenerator */ |
|
35 | - protected $url; |
|
34 | + /** @var IURLGenerator */ |
|
35 | + protected $url; |
|
36 | 36 | |
37 | - public function __construct(IL10N $l, IURLGenerator $url) { |
|
38 | - $this->l = $l; |
|
39 | - $this->url = $url; |
|
40 | - } |
|
37 | + public function __construct(IL10N $l, IURLGenerator $url) { |
|
38 | + $this->l = $l; |
|
39 | + $this->url = $url; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string Lowercase a-z only identifier |
|
44 | - * @since 11.0.0 |
|
45 | - */ |
|
46 | - public function getIdentifier() { |
|
47 | - return 'comments'; |
|
48 | - } |
|
42 | + /** |
|
43 | + * @return string Lowercase a-z only identifier |
|
44 | + * @since 11.0.0 |
|
45 | + */ |
|
46 | + public function getIdentifier() { |
|
47 | + return 'comments'; |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @return string A translated string |
|
52 | - * @since 11.0.0 |
|
53 | - */ |
|
54 | - public function getName() { |
|
55 | - return $this->l->t('Comments'); |
|
56 | - } |
|
50 | + /** |
|
51 | + * @return string A translated string |
|
52 | + * @since 11.0.0 |
|
53 | + */ |
|
54 | + public function getName() { |
|
55 | + return $this->l->t('Comments'); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @return int |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 40; |
|
64 | - } |
|
58 | + /** |
|
59 | + * @return int |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 40; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return string Full URL to an icon, empty string when none is given |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function getIcon() { |
|
71 | - return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')); |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return string Full URL to an icon, empty string when none is given |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function getIcon() { |
|
71 | + return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')); |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @param string[] $types |
|
76 | - * @return string[] An array of allowed apps from which activities should be displayed |
|
77 | - * @since 11.0.0 |
|
78 | - */ |
|
79 | - public function filterTypes(array $types) { |
|
80 | - return $types; |
|
81 | - } |
|
74 | + /** |
|
75 | + * @param string[] $types |
|
76 | + * @return string[] An array of allowed apps from which activities should be displayed |
|
77 | + * @since 11.0.0 |
|
78 | + */ |
|
79 | + public function filterTypes(array $types) { |
|
80 | + return $types; |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @return string[] An array of allowed apps from which activities should be displayed |
|
85 | - * @since 11.0.0 |
|
86 | - */ |
|
87 | - public function allowedApps() { |
|
88 | - return ['comments']; |
|
89 | - } |
|
83 | + /** |
|
84 | + * @return string[] An array of allowed apps from which activities should be displayed |
|
85 | + * @since 11.0.0 |
|
86 | + */ |
|
87 | + public function allowedApps() { |
|
88 | + return ['comments']; |
|
89 | + } |
|
90 | 90 | } |
@@ -27,93 +27,93 @@ |
||
27 | 27 | use OCP\Notification\IManager; |
28 | 28 | |
29 | 29 | class Listener { |
30 | - /** @var IManager */ |
|
31 | - protected $notificationManager; |
|
30 | + /** @var IManager */ |
|
31 | + protected $notificationManager; |
|
32 | 32 | |
33 | - /** @var IUserManager */ |
|
34 | - protected $userManager; |
|
33 | + /** @var IUserManager */ |
|
34 | + protected $userManager; |
|
35 | 35 | |
36 | - /** |
|
37 | - * Listener constructor. |
|
38 | - * |
|
39 | - * @param IManager $notificationManager |
|
40 | - * @param IUserManager $userManager |
|
41 | - */ |
|
42 | - public function __construct( |
|
43 | - IManager $notificationManager, |
|
44 | - IUserManager $userManager |
|
45 | - ) { |
|
36 | + /** |
|
37 | + * Listener constructor. |
|
38 | + * |
|
39 | + * @param IManager $notificationManager |
|
40 | + * @param IUserManager $userManager |
|
41 | + */ |
|
42 | + public function __construct( |
|
43 | + IManager $notificationManager, |
|
44 | + IUserManager $userManager |
|
45 | + ) { |
|
46 | 46 | |
47 | - $this->notificationManager = $notificationManager; |
|
48 | - $this->userManager = $userManager; |
|
49 | - } |
|
47 | + $this->notificationManager = $notificationManager; |
|
48 | + $this->userManager = $userManager; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @param CommentsEvent $event |
|
53 | - */ |
|
54 | - public function evaluate(CommentsEvent $event) { |
|
55 | - $comment = $event->getComment(); |
|
51 | + /** |
|
52 | + * @param CommentsEvent $event |
|
53 | + */ |
|
54 | + public function evaluate(CommentsEvent $event) { |
|
55 | + $comment = $event->getComment(); |
|
56 | 56 | |
57 | - $mentions = $this->extractMentions($comment->getMentions()); |
|
58 | - if(empty($mentions)) { |
|
59 | - // no one to notify |
|
60 | - return; |
|
61 | - } |
|
57 | + $mentions = $this->extractMentions($comment->getMentions()); |
|
58 | + if(empty($mentions)) { |
|
59 | + // no one to notify |
|
60 | + return; |
|
61 | + } |
|
62 | 62 | |
63 | - $notification = $this->instantiateNotification($comment); |
|
63 | + $notification = $this->instantiateNotification($comment); |
|
64 | 64 | |
65 | - foreach($mentions as $uid) { |
|
66 | - if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId()) |
|
67 | - || !$this->userManager->userExists($uid) |
|
68 | - ) { |
|
69 | - // do not notify unknown users or yourself |
|
70 | - continue; |
|
71 | - } |
|
65 | + foreach($mentions as $uid) { |
|
66 | + if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId()) |
|
67 | + || !$this->userManager->userExists($uid) |
|
68 | + ) { |
|
69 | + // do not notify unknown users or yourself |
|
70 | + continue; |
|
71 | + } |
|
72 | 72 | |
73 | - $notification->setUser($uid); |
|
74 | - if( $event->getEvent() === CommentsEvent::EVENT_DELETE |
|
75 | - || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) |
|
76 | - { |
|
77 | - $this->notificationManager->markProcessed($notification); |
|
78 | - } else { |
|
79 | - $this->notificationManager->notify($notification); |
|
80 | - } |
|
81 | - } |
|
82 | - } |
|
73 | + $notification->setUser($uid); |
|
74 | + if( $event->getEvent() === CommentsEvent::EVENT_DELETE |
|
75 | + || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) |
|
76 | + { |
|
77 | + $this->notificationManager->markProcessed($notification); |
|
78 | + } else { |
|
79 | + $this->notificationManager->notify($notification); |
|
80 | + } |
|
81 | + } |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * creates a notification instance and fills it with comment data |
|
86 | - * |
|
87 | - * @param IComment $comment |
|
88 | - * @return \OCP\Notification\INotification |
|
89 | - */ |
|
90 | - public function instantiateNotification(IComment $comment) { |
|
91 | - $notification = $this->notificationManager->createNotification(); |
|
92 | - $notification |
|
93 | - ->setApp('comments') |
|
94 | - ->setObject('comment', $comment->getId()) |
|
95 | - ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ]) |
|
96 | - ->setDateTime($comment->getCreationDateTime()); |
|
84 | + /** |
|
85 | + * creates a notification instance and fills it with comment data |
|
86 | + * |
|
87 | + * @param IComment $comment |
|
88 | + * @return \OCP\Notification\INotification |
|
89 | + */ |
|
90 | + public function instantiateNotification(IComment $comment) { |
|
91 | + $notification = $this->notificationManager->createNotification(); |
|
92 | + $notification |
|
93 | + ->setApp('comments') |
|
94 | + ->setObject('comment', $comment->getId()) |
|
95 | + ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ]) |
|
96 | + ->setDateTime($comment->getCreationDateTime()); |
|
97 | 97 | |
98 | - return $notification; |
|
99 | - } |
|
98 | + return $notification; |
|
99 | + } |
|
100 | 100 | |
101 | - /** |
|
102 | - * flattens the mention array returned from comments to a list of user ids. |
|
103 | - * |
|
104 | - * @param array $mentions |
|
105 | - * @return string[] containing the mentions, e.g. ['alice', 'bob'] |
|
106 | - */ |
|
107 | - public function extractMentions(array $mentions) { |
|
108 | - if(empty($mentions)) { |
|
109 | - return []; |
|
110 | - } |
|
111 | - $uids = []; |
|
112 | - foreach($mentions as $mention) { |
|
113 | - if($mention['type'] === 'user') { |
|
114 | - $uids[] = $mention['id']; |
|
115 | - } |
|
116 | - } |
|
117 | - return $uids; |
|
118 | - } |
|
101 | + /** |
|
102 | + * flattens the mention array returned from comments to a list of user ids. |
|
103 | + * |
|
104 | + * @param array $mentions |
|
105 | + * @return string[] containing the mentions, e.g. ['alice', 'bob'] |
|
106 | + */ |
|
107 | + public function extractMentions(array $mentions) { |
|
108 | + if(empty($mentions)) { |
|
109 | + return []; |
|
110 | + } |
|
111 | + $uids = []; |
|
112 | + foreach($mentions as $mention) { |
|
113 | + if($mention['type'] === 'user') { |
|
114 | + $uids[] = $mention['id']; |
|
115 | + } |
|
116 | + } |
|
117 | + return $uids; |
|
118 | + } |
|
119 | 119 | } |
@@ -36,56 +36,56 @@ |
||
36 | 36 | * @package OCA\Comments |
37 | 37 | */ |
38 | 38 | class EventHandler implements ICommentsEventHandler { |
39 | - /** @var ActivityListener */ |
|
40 | - private $activityListener; |
|
39 | + /** @var ActivityListener */ |
|
40 | + private $activityListener; |
|
41 | 41 | |
42 | - /** @var NotificationListener */ |
|
43 | - private $notificationListener; |
|
42 | + /** @var NotificationListener */ |
|
43 | + private $notificationListener; |
|
44 | 44 | |
45 | - public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) { |
|
46 | - $this->activityListener = $activityListener; |
|
47 | - $this->notificationListener = $notificationListener; |
|
48 | - } |
|
45 | + public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) { |
|
46 | + $this->activityListener = $activityListener; |
|
47 | + $this->notificationListener = $notificationListener; |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @param CommentsEvent $event |
|
52 | - */ |
|
53 | - public function handle(CommentsEvent $event) { |
|
54 | - if($event->getComment()->getObjectType() !== 'files') { |
|
55 | - // this is a 'files'-specific Handler |
|
56 | - return; |
|
57 | - } |
|
50 | + /** |
|
51 | + * @param CommentsEvent $event |
|
52 | + */ |
|
53 | + public function handle(CommentsEvent $event) { |
|
54 | + if($event->getComment()->getObjectType() !== 'files') { |
|
55 | + // this is a 'files'-specific Handler |
|
56 | + return; |
|
57 | + } |
|
58 | 58 | |
59 | - $eventType = $event->getEvent(); |
|
60 | - if( $eventType === CommentsEvent::EVENT_ADD |
|
61 | - ) { |
|
62 | - $this->notificationHandler($event); |
|
63 | - $this->activityHandler($event); |
|
64 | - return; |
|
65 | - } |
|
59 | + $eventType = $event->getEvent(); |
|
60 | + if( $eventType === CommentsEvent::EVENT_ADD |
|
61 | + ) { |
|
62 | + $this->notificationHandler($event); |
|
63 | + $this->activityHandler($event); |
|
64 | + return; |
|
65 | + } |
|
66 | 66 | |
67 | - $applicableEvents = [ |
|
68 | - CommentsEvent::EVENT_PRE_UPDATE, |
|
69 | - CommentsEvent::EVENT_UPDATE, |
|
70 | - CommentsEvent::EVENT_DELETE, |
|
71 | - ]; |
|
72 | - if(in_array($eventType, $applicableEvents)) { |
|
73 | - $this->notificationHandler($event); |
|
74 | - return; |
|
75 | - } |
|
76 | - } |
|
67 | + $applicableEvents = [ |
|
68 | + CommentsEvent::EVENT_PRE_UPDATE, |
|
69 | + CommentsEvent::EVENT_UPDATE, |
|
70 | + CommentsEvent::EVENT_DELETE, |
|
71 | + ]; |
|
72 | + if(in_array($eventType, $applicableEvents)) { |
|
73 | + $this->notificationHandler($event); |
|
74 | + return; |
|
75 | + } |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @param CommentsEvent $event |
|
80 | - */ |
|
81 | - private function activityHandler(CommentsEvent $event) { |
|
82 | - $this->activityListener->commentEvent($event); |
|
83 | - } |
|
78 | + /** |
|
79 | + * @param CommentsEvent $event |
|
80 | + */ |
|
81 | + private function activityHandler(CommentsEvent $event) { |
|
82 | + $this->activityListener->commentEvent($event); |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * @param CommentsEvent $event |
|
87 | - */ |
|
88 | - private function notificationHandler(CommentsEvent $event) { |
|
89 | - $this->notificationListener->evaluate($event); |
|
90 | - } |
|
85 | + /** |
|
86 | + * @param CommentsEvent $event |
|
87 | + */ |
|
88 | + private function notificationHandler(CommentsEvent $event) { |
|
89 | + $this->notificationListener->evaluate($event); |
|
90 | + } |
|
91 | 91 | } |
@@ -31,30 +31,30 @@ |
||
31 | 31 | use OCP\Command\ICommand; |
32 | 32 | |
33 | 33 | class Expire implements ICommand { |
34 | - use FileAccess; |
|
34 | + use FileAccess; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
39 | - private $user; |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | + private $user; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param string $user |
|
43 | - */ |
|
44 | - function __construct($user) { |
|
45 | - $this->user = $user; |
|
46 | - } |
|
41 | + /** |
|
42 | + * @param string $user |
|
43 | + */ |
|
44 | + function __construct($user) { |
|
45 | + $this->user = $user; |
|
46 | + } |
|
47 | 47 | |
48 | - public function handle() { |
|
49 | - $userManager = \OC::$server->getUserManager(); |
|
50 | - if (!$userManager->userExists($this->user)) { |
|
51 | - // User has been deleted already |
|
52 | - return; |
|
53 | - } |
|
48 | + public function handle() { |
|
49 | + $userManager = \OC::$server->getUserManager(); |
|
50 | + if (!$userManager->userExists($this->user)) { |
|
51 | + // User has been deleted already |
|
52 | + return; |
|
53 | + } |
|
54 | 54 | |
55 | - \OC_Util::tearDownFS(); |
|
56 | - \OC_Util::setupFS($this->user); |
|
57 | - Trashbin::expire($this->user); |
|
58 | - \OC_Util::tearDownFS(); |
|
59 | - } |
|
55 | + \OC_Util::tearDownFS(); |
|
56 | + \OC_Util::setupFS($this->user); |
|
57 | + Trashbin::expire($this->user); |
|
58 | + \OC_Util::tearDownFS(); |
|
59 | + } |
|
60 | 60 | } |
@@ -34,94 +34,94 @@ |
||
34 | 34 | |
35 | 35 | class ExpireTrash extends Command { |
36 | 36 | |
37 | - /** |
|
38 | - * @var Expiration |
|
39 | - */ |
|
40 | - private $expiration; |
|
37 | + /** |
|
38 | + * @var Expiration |
|
39 | + */ |
|
40 | + private $expiration; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @var IUserManager |
|
44 | - */ |
|
45 | - private $userManager; |
|
42 | + /** |
|
43 | + * @var IUserManager |
|
44 | + */ |
|
45 | + private $userManager; |
|
46 | 46 | |
47 | - /** |
|
48 | - * @param IUserManager|null $userManager |
|
49 | - * @param Expiration|null $expiration |
|
50 | - */ |
|
51 | - public function __construct(IUserManager $userManager = null, |
|
52 | - Expiration $expiration = null) { |
|
53 | - parent::__construct(); |
|
47 | + /** |
|
48 | + * @param IUserManager|null $userManager |
|
49 | + * @param Expiration|null $expiration |
|
50 | + */ |
|
51 | + public function __construct(IUserManager $userManager = null, |
|
52 | + Expiration $expiration = null) { |
|
53 | + parent::__construct(); |
|
54 | 54 | |
55 | - $this->userManager = $userManager; |
|
56 | - $this->expiration = $expiration; |
|
57 | - } |
|
55 | + $this->userManager = $userManager; |
|
56 | + $this->expiration = $expiration; |
|
57 | + } |
|
58 | 58 | |
59 | - protected function configure() { |
|
60 | - $this |
|
61 | - ->setName('trashbin:expire') |
|
62 | - ->setDescription('Expires the users trashbin') |
|
63 | - ->addArgument( |
|
64 | - 'user_id', |
|
65 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
66 | - 'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired' |
|
67 | - ); |
|
68 | - } |
|
59 | + protected function configure() { |
|
60 | + $this |
|
61 | + ->setName('trashbin:expire') |
|
62 | + ->setDescription('Expires the users trashbin') |
|
63 | + ->addArgument( |
|
64 | + 'user_id', |
|
65 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
66 | + 'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired' |
|
67 | + ); |
|
68 | + } |
|
69 | 69 | |
70 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
70 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
71 | 71 | |
72 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
73 | - if (!$maxAge) { |
|
74 | - $output->writeln("No expiry configured."); |
|
75 | - return; |
|
76 | - } |
|
72 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
73 | + if (!$maxAge) { |
|
74 | + $output->writeln("No expiry configured."); |
|
75 | + return; |
|
76 | + } |
|
77 | 77 | |
78 | - $users = $input->getArgument('user_id'); |
|
79 | - if (!empty($users)) { |
|
80 | - foreach ($users as $user) { |
|
81 | - if ($this->userManager->userExists($user)) { |
|
82 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
83 | - $userObject = $this->userManager->get($user); |
|
84 | - $this->expireTrashForUser($userObject); |
|
85 | - } else { |
|
86 | - $output->writeln("<error>Unknown user $user</error>"); |
|
87 | - } |
|
88 | - } |
|
89 | - } else { |
|
90 | - $p = new ProgressBar($output); |
|
91 | - $p->start(); |
|
92 | - $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
93 | - $p->advance(); |
|
94 | - $this->expireTrashForUser($user); |
|
95 | - }); |
|
96 | - $p->finish(); |
|
97 | - $output->writeln(''); |
|
98 | - } |
|
99 | - } |
|
78 | + $users = $input->getArgument('user_id'); |
|
79 | + if (!empty($users)) { |
|
80 | + foreach ($users as $user) { |
|
81 | + if ($this->userManager->userExists($user)) { |
|
82 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
83 | + $userObject = $this->userManager->get($user); |
|
84 | + $this->expireTrashForUser($userObject); |
|
85 | + } else { |
|
86 | + $output->writeln("<error>Unknown user $user</error>"); |
|
87 | + } |
|
88 | + } |
|
89 | + } else { |
|
90 | + $p = new ProgressBar($output); |
|
91 | + $p->start(); |
|
92 | + $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
93 | + $p->advance(); |
|
94 | + $this->expireTrashForUser($user); |
|
95 | + }); |
|
96 | + $p->finish(); |
|
97 | + $output->writeln(''); |
|
98 | + } |
|
99 | + } |
|
100 | 100 | |
101 | - function expireTrashForUser(IUser $user) { |
|
102 | - $uid = $user->getUID(); |
|
103 | - if (!$this->setupFS($uid)) { |
|
104 | - return; |
|
105 | - } |
|
106 | - $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
107 | - Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
108 | - } |
|
101 | + function expireTrashForUser(IUser $user) { |
|
102 | + $uid = $user->getUID(); |
|
103 | + if (!$this->setupFS($uid)) { |
|
104 | + return; |
|
105 | + } |
|
106 | + $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
107 | + Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
108 | + } |
|
109 | 109 | |
110 | - /** |
|
111 | - * Act on behalf on trash item owner |
|
112 | - * @param string $user |
|
113 | - * @return boolean |
|
114 | - */ |
|
115 | - protected function setupFS($user) { |
|
116 | - \OC_Util::tearDownFS(); |
|
117 | - \OC_Util::setupFS($user); |
|
110 | + /** |
|
111 | + * Act on behalf on trash item owner |
|
112 | + * @param string $user |
|
113 | + * @return boolean |
|
114 | + */ |
|
115 | + protected function setupFS($user) { |
|
116 | + \OC_Util::tearDownFS(); |
|
117 | + \OC_Util::setupFS($user); |
|
118 | 118 | |
119 | - // Check if this user has a trashbin directory |
|
120 | - $view = new \OC\Files\View('/' . $user); |
|
121 | - if (!$view->is_dir('/files_trashbin/files')) { |
|
122 | - return false; |
|
123 | - } |
|
119 | + // Check if this user has a trashbin directory |
|
120 | + $view = new \OC\Files\View('/' . $user); |
|
121 | + if (!$view->is_dir('/files_trashbin/files')) { |
|
122 | + return false; |
|
123 | + } |
|
124 | 124 | |
125 | - return true; |
|
126 | - } |
|
125 | + return true; |
|
126 | + } |
|
127 | 127 | } |
@@ -33,17 +33,17 @@ |
||
33 | 33 | */ |
34 | 34 | class Capabilities implements ICapability { |
35 | 35 | |
36 | - /** |
|
37 | - * Return this classes capabilities |
|
38 | - * |
|
39 | - * @return array |
|
40 | - */ |
|
41 | - public function getCapabilities() { |
|
42 | - return [ |
|
43 | - 'files' => [ |
|
44 | - 'undelete' => true |
|
45 | - ] |
|
46 | - ]; |
|
47 | - } |
|
36 | + /** |
|
37 | + * Return this classes capabilities |
|
38 | + * |
|
39 | + * @return array |
|
40 | + */ |
|
41 | + public function getCapabilities() { |
|
42 | + return [ |
|
43 | + 'files' => [ |
|
44 | + 'undelete' => true |
|
45 | + ] |
|
46 | + ]; |
|
47 | + } |
|
48 | 48 | |
49 | 49 | } |