@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 Flag for handleRequest
Summary: Updates Flag app for handleRequest
Test Plan: Flag, Unflag, list flags, remove flag
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Differential Revision: https://secure.phabricator.com/D13757
+17
-32
+5
-10
src/applications/flag/controller/PhabricatorFlagDeleteController.php
+5
-10
src/applications/flag/controller/PhabricatorFlagDeleteController.php
···
2
2
3
3
final class PhabricatorFlagDeleteController extends PhabricatorFlagController {
4
4
5
-
private $id;
6
5
7
-
public function willProcessRequest(array $data) {
8
-
$this->id = $data['id'];
9
-
}
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $request->getViewer();
8
+
$id = $request->getURIData('id');
10
9
11
-
public function processRequest() {
12
-
$request = $this->getRequest();
13
-
$user = $request->getUser();
14
-
15
-
$flag = id(new PhabricatorFlag())->load($this->id);
10
+
$flag = id(new PhabricatorFlag())->load($id);
16
11
if (!$flag) {
17
12
return new Aphront404Response();
18
13
}
19
14
20
-
if ($flag->getOwnerPHID() != $user->getPHID()) {
15
+
if ($flag->getOwnerPHID() != $viewer->getPHID()) {
21
16
return new Aphront400Response();
22
17
}
23
18
+8
-15
src/applications/flag/controller/PhabricatorFlagEditController.php
+8
-15
src/applications/flag/controller/PhabricatorFlagEditController.php
···
2
2
3
3
final class PhabricatorFlagEditController extends PhabricatorFlagController {
4
4
5
-
private $phid;
6
-
7
-
public function willProcessRequest(array $data) {
8
-
$this->phid = $data['phid'];
9
-
}
10
-
11
-
public function processRequest() {
12
-
$request = $this->getRequest();
13
-
$user = $request->getUser();
5
+
public function handleRequest(AphrontRequest $request) {
6
+
$viewer = $request->getViewer();
7
+
$phid = $request->getURIData('phid');
14
8
15
-
$phid = $this->phid;
16
9
$handle = id(new PhabricatorHandleQuery())
17
-
->setViewer($user)
10
+
->setViewer($viewer)
18
11
->withPHIDs(array($phid))
19
12
->executeOne();
20
13
···
22
15
return new Aphront404Response();
23
16
}
24
17
25
-
$flag = PhabricatorFlagQuery::loadUserFlag($user, $phid);
18
+
$flag = PhabricatorFlagQuery::loadUserFlag($viewer, $phid);
26
19
27
20
if (!$flag) {
28
21
$flag = new PhabricatorFlag();
29
-
$flag->setOwnerPHID($user->getPHID());
22
+
$flag->setOwnerPHID($viewer->getPHID());
30
23
$flag->setType($handle->getType());
31
24
$flag->setObjectPHID($handle->getPHID());
32
-
$flag->setReasonPHID($user->getPHID());
25
+
$flag->setReasonPHID($viewer->getPHID());
33
26
}
34
27
35
28
if ($request->isDialogFormPost()) {
···
43
36
$type_name = $handle->getTypeName();
44
37
45
38
$dialog = new AphrontDialogView();
46
-
$dialog->setUser($user);
39
+
$dialog->setUser($viewer);
47
40
48
41
$dialog->setTitle(pht('Flag %s', $type_name));
49
42
+4
-7
src/applications/flag/controller/PhabricatorFlagListController.php
+4
-7
src/applications/flag/controller/PhabricatorFlagListController.php
···
2
2
3
3
final class PhabricatorFlagListController extends PhabricatorFlagController {
4
4
5
-
private $queryKey;
6
-
7
5
public function shouldAllowPublic() {
8
6
return true;
9
7
}
10
8
11
-
public function willProcessRequest(array $data) {
12
-
$this->queryKey = idx($data, 'queryKey');
13
-
}
9
+
public function handleRequest(AphrontRequest $request) {
10
+
$viewer = $request->getViewer();
11
+
$querykey = $request->getURIData('queryKey');
14
12
15
-
public function processRequest() {
16
13
$controller = id(new PhabricatorApplicationSearchController())
17
-
->setQueryKey($this->queryKey)
14
+
->setQueryKey($querykey)
18
15
->setSearchEngine(new PhabricatorFlagSearchEngine())
19
16
->setNavigation($this->buildSideNavView());
20
17