@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
Don't use deprected "1" value to cURL CURLOPT_SSL_VERIFYHOST
Summary: Fixes T2962. That task discusses this issue.
Test Plan: Read php-curl documentation to verify this change makes sense. Sent an email with SES.
Reviewers: btrahan, garoevans
Reviewed By: garoevans
CC: aran
Maniphest Tasks: T2962
Differential Revision: https://secure.phabricator.com/D5669
+84
-1
+1
-1
externals/amazon-ses/ses.php
+1
-1
externals/amazon-ses/ses.php
···
495
495
$curl = curl_init();
496
496
curl_setopt($curl, CURLOPT_USERAGENT, 'SimpleEmailService/php');
497
497
498
-
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, ($this->ses->verifyHost() ? 1 : 0));
498
+
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, ($this->ses->verifyHost() ? 2 : 0));
499
499
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, ($this->ses->verifyPeer() ? 1 : 0));
500
500
501
501
// Request types
+2
src/__phutil_library_map__.php
+2
src/__phutil_library_map__.php
···
1556
1556
'PholioTransactionType' => 'applications/pholio/constants/PholioTransactionType.php',
1557
1557
'PholioTransactionView' => 'applications/pholio/view/PholioTransactionView.php',
1558
1558
'PhortuneAccount' => 'applications/phortune/storage/PhortuneAccount.php',
1559
+
'PhortuneAccountBuyController' => 'applications/phortune/controller/PhortuneAccountBuyController.php',
1559
1560
'PhortuneAccountEditor' => 'applications/phortune/editor/PhortuneAccountEditor.php',
1560
1561
'PhortuneAccountQuery' => 'applications/phortune/query/PhortuneAccountQuery.php',
1561
1562
'PhortuneAccountTransaction' => 'applications/phortune/storage/PhortuneAccountTransaction.php',
···
3252
3253
0 => 'PhortuneDAO',
3253
3254
1 => 'PhabricatorPolicyInterface',
3254
3255
),
3256
+
'PhortuneAccountBuyController' => 'PhortuneController',
3255
3257
'PhortuneAccountEditor' => 'PhabricatorApplicationTransactionEditor',
3256
3258
'PhortuneAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
3257
3259
'PhortuneAccountTransaction' => 'PhabricatorApplicationTransaction',
+1
src/applications/phortune/application/PhabricatorApplicationPhortune.php
+1
src/applications/phortune/application/PhabricatorApplicationPhortune.php
+75
src/applications/phortune/controller/PhortuneAccountBuyController.php
+75
src/applications/phortune/controller/PhortuneAccountBuyController.php
···
1
+
<?php
2
+
3
+
final class PhortuneAccountBuyController
4
+
extends PhortuneController {
5
+
6
+
private $accountID;
7
+
private $id;
8
+
9
+
public function willProcessRequest(array $data) {
10
+
$this->accountID = $data['accountID'];
11
+
$this->id = $data['id'];
12
+
}
13
+
14
+
public function processRequest() {
15
+
$request = $this->getRequest();
16
+
$user = $request->getUser();
17
+
18
+
$account = id(new PhortuneAccountQuery())
19
+
->setViewer($user)
20
+
->withIDs(array($this->accountID))
21
+
->executeOne();
22
+
if (!$account) {
23
+
return new Aphront404Response();
24
+
}
25
+
26
+
$account_uri = $this->getApplicationURI($account->getID().'/');
27
+
28
+
$product = id(new PhortuneProductQuery())
29
+
->setViewer($user)
30
+
->withIDs(array($this->id))
31
+
->executeOne();
32
+
if (!$product) {
33
+
return new Aphront404Response();
34
+
}
35
+
36
+
$title = pht('Buy %s', $product->getProductName());
37
+
38
+
$payment_method_uri = $this->getApplicationURI(
39
+
$account->getID().'/paymentmethod/edit/');
40
+
41
+
$new_method = phutil_tag(
42
+
'a',
43
+
array(
44
+
'href' => $payment_method_uri,
45
+
'sigil' => 'workflow',
46
+
),
47
+
pht('Add New Payment Method'));
48
+
49
+
50
+
$form = id(new AphrontFormView())
51
+
->setUser($user)
52
+
->appendChild(
53
+
id(new AphrontFormStaticControl())
54
+
->setLabel(pht('Stuff'))
55
+
->setValue($product->getProductName()))
56
+
->appendChild(
57
+
id(new AphrontFormRadioButtonControl())
58
+
->setLabel(pht('Payment Method')))
59
+
->appendChild(
60
+
id(new AphrontFormMarkupControl())
61
+
->setValue($new_method))
62
+
->appendChild(
63
+
id(new AphrontFormSubmitControl())
64
+
->setValue(pht("Dolla Dolla Bill Y'all")));
65
+
66
+
return $this->buildApplicationPage(
67
+
$form,
68
+
array(
69
+
'title' => $title,
70
+
'device' => true,
71
+
'dust' => true,
72
+
));
73
+
74
+
}
75
+
}
+5
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
+5
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
···
45
45
const TYPE_ACCOUNT_HAS_MEMBER = 27;
46
46
const TYPE_MEMBER_HAS_ACCOUNT = 28;
47
47
48
+
const TYPE_PURCAHSE_HAS_CHARGE = 29;
49
+
const TYPE_CHARGE_HAS_PURCHASE = 30;
50
+
48
51
const TYPE_TEST_NO_CYCLE = 9000;
49
52
50
53
···
125
128
PhabricatorPHIDConstants::PHID_TYPE_CONP => 'ConpherenceThread',
126
129
PhabricatorPHIDConstants::PHID_TYPE_WIKI => 'PhrictionDocument',
127
130
PhabricatorPHIDConstants::PHID_TYPE_ACNT => 'PhortuneAccount',
131
+
PhabricatorPHIDConstants::PHID_TYPE_PRCH => 'PhortunePurchase',
132
+
PhabricatorPHIDConstants::PHID_TYPE_CHRG => 'PhortuneCharge',
128
133
);
129
134
130
135
$class = idx($class_map, $phid_type);