@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
Fixed T2630
Summary: Fixes T2630
Test Plan: Did not test yet.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T2630
Differential Revision: https://secure.phabricator.com/D5456
authored by
deedydas
and committed by
epriestley
0b1410b1
1df43572
+43
-15
+3
-3
src/applications/config/check/PhabricatorSetupCheckDatabase.php
+3
-3
src/applications/config/check/PhabricatorSetupCheckDatabase.php
···
39
39
->setName(pht('Can Not Connect to MySQL'))
40
40
->setMessage($message)
41
41
->setIsFatal(true)
42
-
->addPhabricatorConfig('mysql.host')
43
-
->addPhabricatorConfig('mysql.user')
44
-
->addPhabricatorConfig('mysql.pass');
42
+
->addRelatedPhabricatorConfig('mysql.host')
43
+
->addRelatedPhabricatorConfig('mysql.user')
44
+
->addRelatedPhabricatorConfig('mysql.pass');
45
45
return;
46
46
}
47
47
+2
-2
src/applications/config/check/PhabricatorSetupCheckFacebook.php
+2
-2
src/applications/config/check/PhabricatorSetupCheckFacebook.php
···
17
17
$this->newIssue('config.facebook.application-id')
18
18
->setName(pht("Facebook Application ID Not Set"))
19
19
->setMessage($message)
20
-
->addPhabricatorConfig('facebook.auth-enabled')
20
+
->addRelatedPhabricatorConfig('facebook.auth-enabled')
21
21
->addPhabricatorConfig('facebook.application-id');
22
22
}
23
23
···
30
30
$this->newIssue('config.facebook.application-secret')
31
31
->setName(pht("Facebook Application Secret Not Set"))
32
32
->setMessage($message)
33
-
->addPhabricatorConfig('facebook.auth-enabled')
33
+
->addRelatedPhabricatorConfig('facebook.auth-enabled')
34
34
->addPhabricatorConfig('facebook.application-secret');
35
35
}
36
36
}
+1
-1
src/applications/config/check/PhabricatorSetupCheckImagemagick.php
+1
-1
src/applications/config/check/PhabricatorSetupCheckImagemagick.php
···
16
16
->setName(pht(
17
17
"'convert' binary not found or Imagemagick is not installed."))
18
18
->setMessage($message)
19
-
->addPhabricatorConfig('files.enable-imagemagick')
19
+
->addRelatedPhabricatorConfig('files.enable-imagemagick')
20
20
->addPhabricatorConfig('environment.append-paths');
21
21
}
22
22
}
+5
-5
src/applications/config/check/PhabricatorSetupCheckMail.php
+5
-5
src/applications/config/check/PhabricatorSetupCheckMail.php
···
18
18
->setShortName(pht('Missing Sendmail'))
19
19
->setName(pht('No Sendmail Binary Found'))
20
20
->setMessage($message)
21
-
->addPhabricatorConfig('metamta.mail-adapter');
21
+
->addRelatedPhabricatorConfig('metamta.mail-adapter');
22
22
}
23
23
break;
24
24
case 'PhabricatorMailImplementationAmazonSESAdapter':
···
30
30
$this->newIssue('config.can-send-as-user')
31
31
->setName(pht("SES Can't Send As User"))
32
32
->setMessage($message)
33
-
->addPhabricatorConfig('metamta.mail-adapter')
33
+
->addRelatedPhabricatorConfig('metamta.mail-adapter')
34
34
->addPhabricatorConfig('metamta.can-send-as-user');
35
35
}
36
36
···
43
43
$this->newIssue('config.amazon-ses.access-key')
44
44
->setName(pht("Amazon SES Access Key Not Set"))
45
45
->setMessage($message)
46
-
->addPhabricatorConfig('metamta.mail-adapter')
46
+
->addRelatedPhabricatorConfig('metamta.mail-adapter')
47
47
->addPhabricatorConfig('amazon-ses.access-key');
48
48
}
49
49
···
56
56
$this->newIssue('config.amazon-ses.secret-key')
57
57
->setName(pht("Amazon SES Secret Key Not Set"))
58
58
->setMessage($message)
59
-
->addPhabricatorConfig('metamta.mail-adapter')
59
+
->addRelatedPhabricatorConfig('metamta.mail-adapter')
60
60
->addPhabricatorConfig('amazon-ses.secret-key');
61
61
}
62
62
···
73
73
$this->newIssue('config.metamta.default-address')
74
74
->setName(pht("No SES From Address Configured"))
75
75
->setMessage($message)
76
-
->addPhabricatorConfig('metamta.mail-adapter')
76
+
->addRelatedPhabricatorConfig('metamta.mail-adapter')
77
77
->addPhabricatorConfig('metamta.default-address');
78
78
}
79
79
break;
+1
-1
src/applications/config/check/PhabricatorSetupCheckMySQL.php
+1
-1
src/applications/config/check/PhabricatorSetupCheckMySQL.php
+1
-1
src/applications/config/check/PhabricatorSetupCheckPygment.php
+1
-1
src/applications/config/check/PhabricatorSetupCheckPygment.php
+10
src/applications/config/issue/PhabricatorSetupIssue.php
+10
src/applications/config/issue/PhabricatorSetupIssue.php
···
12
12
private $isIgnored = false;
13
13
private $phpExtensions = array();
14
14
private $phabricatorConfig = array();
15
+
private $relatedPhabricatorConfig = array();
15
16
private $phpConfig = array();
16
17
private $commands = array();
17
18
···
91
92
92
93
public function getPhabricatorConfig() {
93
94
return $this->phabricatorConfig;
95
+
}
96
+
97
+
public function addRelatedPhabricatorConfig($phabricator_config) {
98
+
$this->relatedPhabricatorConfig[] = $phabricator_config;
99
+
return $this;
100
+
}
101
+
102
+
public function getRelatedPhabricatorConfig() {
103
+
return $this->relatedPhabricatorConfig;
94
104
}
95
105
96
106
public function addPHPExtension($php_extension) {
+16
-2
src/applications/config/view/PhabricatorSetupIssueView.php
+16
-2
src/applications/config/view/PhabricatorSetupIssueView.php
···
34
34
$description[] = $this->renderPhabricatorConfig($configs);
35
35
}
36
36
37
+
$related_configs = $issue->getRelatedPhabricatorConfig();
38
+
if ($related_configs) {
39
+
$description[] = $this->renderPhabricatorConfig($related_configs,
40
+
$related = true);
41
+
}
42
+
37
43
$commands = $issue->getCommands();
38
44
if ($commands) {
39
45
$run_these = pht("Run these %d command(s):", count($commands));
···
122
128
));
123
129
}
124
130
125
-
private function renderPhabricatorConfig(array $configs) {
131
+
private function renderPhabricatorConfig(array $configs, $related = false) {
126
132
$issue = $this->getIssue();
127
133
128
134
$table_info = phutil_tag(
···
184
190
}
185
191
if ($update) {
186
192
$update = phutil_tag('ul', array(), $update);
187
-
$update_info = phutil_tag(
193
+
if (!$related) {
194
+
195
+
$update_info = phutil_tag(
188
196
'p',
189
197
array(),
190
198
pht("You can update these %d value(s) here:", count($configs)));
199
+
} else {
200
+
$update_info = phutil_tag(
201
+
'p',
202
+
array(),
203
+
pht("These %d configuration value(s) are related:", count($configs)));
204
+
}
191
205
} else {
192
206
$update = null;
193
207
$update_info = null;
+4
src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php
+4
src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php
···
9
9
10
10
public function getTranslations() {
11
11
return array(
12
+
'These %d configuration value(s) are related:' => array(
13
+
'This configuration value is related:',
14
+
'These configuration values are related:',
15
+
),
12
16
'Differential Revision(s)' => array(
13
17
'Differential Revision',
14
18
'Differential Revisions',