@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update Calendar for handleRequest
Summary: Run through Calendar and update/cleanup processRequest
Test Plan: New Event, Edit, etc.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T8628
Differential Revision: https://secure.phabricator.com/D13747
+30
-55
+9
-15
src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
+9
-15
src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
···
3
3
final class PhabricatorCalendarEventCancelController
4
4
extends PhabricatorCalendarController {
5
5
6
-
private $id;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = idx($data, 'id');
10
-
}
11
-
12
-
public function processRequest() {
13
-
$request = $this->getRequest();
14
-
$user = $request->getUser();
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $request->getViewer();
8
+
$id = $request->getURIData('id');
15
9
$sequence = $request->getURIData('sequence');
16
10
17
11
$event = id(new PhabricatorCalendarEventQuery())
18
-
->setViewer($user)
19
-
->withIDs(array($this->id))
12
+
->setViewer($viewer)
13
+
->withIDs(array($id))
20
14
->requireCapabilities(
21
15
array(
22
16
PhabricatorPolicyCapability::CAN_VIEW,
···
26
20
27
21
if ($sequence) {
28
22
$parent_event = $event;
29
-
$event = $parent_event->generateNthGhost($sequence, $user);
23
+
$event = $parent_event->generateNthGhost($sequence, $viewer);
30
24
$event->attachParentEvent($parent_event);
31
25
}
32
26
···
51
45
return id(new AphrontRedirectResponse())->setURI($cancel_uri);
52
46
} else if ($sequence) {
53
47
$event = $this->createEventFromGhost(
54
-
$user,
48
+
$viewer,
55
49
$event,
56
50
$sequence);
57
-
$event->applyViewerTimezone($user);
51
+
$event->applyViewerTimezone($viewer);
58
52
}
59
53
60
54
$xactions = array();
···
65
59
->setNewValue(!$is_cancelled);
66
60
67
61
$editor = id(new PhabricatorCalendarEventEditor())
68
-
->setActor($user)
62
+
->setActor($viewer)
69
63
->setContentSourceFromRequest($request)
70
64
->setContinueOnNoEffect(true)
71
65
->setContinueOnMissingFields(true);
+10
-14
src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
+10
-14
src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
···
3
3
final class PhabricatorCalendarEventCommentController
4
4
extends PhabricatorCalendarController {
5
5
6
-
private $id;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = idx($data, 'id');
10
-
}
11
-
12
6
public function handleRequest(AphrontRequest $request) {
13
7
if (!$request->isFormPost()) {
14
8
return new Aphront400Response();
15
9
}
16
10
17
-
$user = $request->getUser();
11
+
$viewer = $request->getViewer();
12
+
$id = $request->getURIData('id');
13
+
18
14
$is_preview = $request->isPreviewRequest();
19
15
$draft = PhabricatorDraft::buildFromRequest($request);
20
16
21
17
$event = id(new PhabricatorCalendarEventQuery())
22
-
->setViewer($user)
23
-
->withIDs(array($this->id))
18
+
->setViewer($viewer)
19
+
->withIDs(array($id))
24
20
->executeOne();
25
21
if (!$event) {
26
22
return new Aphront404Response();
···
29
25
$index = $request->getURIData('sequence');
30
26
if ($index && !$is_preview) {
31
27
$result = $this->getEventAtIndexForGhostPHID(
32
-
$user,
28
+
$viewer,
33
29
$event->getPHID(),
34
30
$index);
35
31
···
37
33
$event = $result;
38
34
} else {
39
35
$event = $this->createEventFromGhost(
40
-
$user,
36
+
$viewer,
41
37
$event,
42
38
$index);
43
-
$event->applyViewerTimezone($user);
39
+
$event->applyViewerTimezone($viewer);
44
40
}
45
41
}
46
42
···
54
50
->setContent($request->getStr('comment')));
55
51
56
52
$editor = id(new PhabricatorCalendarEventEditor())
57
-
->setActor($user)
53
+
->setActor($viewer)
58
54
->setContinueOnNoEffect($request->isContinueRequest())
59
55
->setContentSourceFromRequest($request)
60
56
->setIsPreview($is_preview);
···
73
69
74
70
if ($request->isAjax() && $is_preview) {
75
71
return id(new PhabricatorApplicationTransactionResponse())
76
-
->setViewer($user)
72
+
->setViewer($viewer)
77
73
->setTransactions($xactions)
78
74
->setIsPreview($is_preview);
79
75
} else {
+2
-4
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+2
-4
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
···
5
5
6
6
private $id;
7
7
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = idx($data, 'id');
10
-
}
11
-
12
8
public function isCreate() {
13
9
return !$this->id;
14
10
}
···
16
12
public function handleRequest(AphrontRequest $request) {
17
13
$viewer = $request->getViewer();
18
14
$user_phid = $viewer->getPHID();
15
+
$this->id = $request->getURIData('id');
16
+
19
17
$error_name = true;
20
18
$error_recurrence_end_date = null;
21
19
$error_start_date = true;
+3
-8
src/applications/calendar/controller/PhabricatorCalendarEventEditIconController.php
+3
-8
src/applications/calendar/controller/PhabricatorCalendarEventEditIconController.php
···
3
3
final class PhabricatorCalendarEventEditIconController
4
4
extends PhabricatorCalendarController {
5
5
6
-
private $id;
7
-
8
-
public function willProcessRequest(array $data) {
9
-
$this->id = idx($data, 'id');
10
-
}
11
-
12
6
public function handleRequest(AphrontRequest $request) {
13
7
$viewer = $request->getUser();
8
+
$id = $request->getURIData('id');
14
9
15
-
if ($this->id) {
10
+
if ($id) {
16
11
$event = id(new PhabricatorCalendarEventQuery())
17
12
->setViewer($viewer)
18
-
->withIDs(array($this->id))
13
+
->withIDs(array($id))
19
14
->requireCapabilities(
20
15
array(
21
16
PhabricatorPolicyCapability::CAN_VIEW,
+2
-4
src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
+2
-4
src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
···
3
3
final class PhabricatorCalendarEventJoinController
4
4
extends PhabricatorCalendarController {
5
5
6
-
private $id;
7
-
8
6
const ACTION_ACCEPT = 'accept';
9
7
const ACTION_DECLINE = 'decline';
10
8
const ACTION_JOIN = 'join';
11
9
12
10
public function handleRequest(AphrontRequest $request) {
13
-
$this->id = $request->getURIData('id');
11
+
$id = $request->getURIData('id');
14
12
$action = $request->getURIData('action');
15
13
16
14
$request = $this->getRequest();
···
20
18
21
19
$event = id(new PhabricatorCalendarEventQuery())
22
20
->setViewer($viewer)
23
-
->withIDs(array($this->id))
21
+
->withIDs(array($id))
24
22
->executeOne();
25
23
26
24
if (!$event) {
+4
-10
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+4
-10
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
···
3
3
final class PhabricatorCalendarEventViewController
4
4
extends PhabricatorCalendarController {
5
5
6
-
private $id;
7
-
8
6
public function shouldAllowPublic() {
9
7
return true;
10
8
}
11
9
12
-
public function willProcessRequest(array $data) {
13
-
$this->id = $data['id'];
14
-
}
15
-
16
-
public function processRequest() {
17
-
$request = $this->getRequest();
18
-
$viewer = $request->getUser();
10
+
public function handleRequest(AphrontRequest $request) {
11
+
$viewer = $request->getViewer();
12
+
$id = $request->getURIData('id');
19
13
$sequence = $request->getURIData('sequence');
20
14
21
15
$timeline = null;
22
16
23
17
$event = id(new PhabricatorCalendarEventQuery())
24
18
->setViewer($viewer)
25
-
->withIDs(array($this->id))
19
+
->withIDs(array($id))
26
20
->executeOne();
27
21
if (!$event) {
28
22
return new Aphront404Response();