@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
Remove "re prefix" and "vary subjects" config
Summary: Ref T11098. There is no reason to maintain these as separate values now that they can be configured in global settings.
Test Plan:
- Hit and read setup issue.
- Fiddled with settings.
- I'll vet this more throughly in the next diff since I need to fix an issue with global defaults in mail and can explicitly test this at the same time.
Reviewers: chad
Reviewed By: chad
Subscribers: eadler
Maniphest Tasks: T11098
Differential Revision: https://secure.phabricator.com/D16117
+10
-30
+7
src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+7
src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
···
190
190
'The Differential revision list view age UI elements have been removed '.
191
191
'to simplify the interface.');
192
192
193
+
$global_settings_reason = pht(
194
+
'The "Re: Prefix" and "Vary Subjects" settings are now configured '.
195
+
'in global settings.');
196
+
193
197
$ancient_config += array(
194
198
'phid.external-loaders' =>
195
199
pht(
···
321
325
322
326
'differential.days-fresh' => $stale_reason,
323
327
'differential.days-stale' => $stale_reason,
328
+
329
+
'metamta.re-prefix' => $global_settings_reason,
330
+
'metamta.vary-subjects' => $global_settings_reason,
324
331
);
325
332
326
333
return $ancient_config;
-16
src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
-16
src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
···
276
276
))
277
277
->setSummary(pht('Show email preferences link in email.'))
278
278
->setDescription($email_preferences_description),
279
-
$this->newOption('metamta.re-prefix', 'bool', false)
280
-
->setBoolOptions(
281
-
array(
282
-
pht('Force "Re:" Subject Prefix'),
283
-
pht('No "Re:" Subject Prefix'),
284
-
))
285
-
->setSummary(pht('Control "Re:" subject prefix, for Mail.app.'))
286
-
->setDescription($re_prefix_description),
287
-
$this->newOption('metamta.vary-subjects', 'bool', true)
288
-
->setBoolOptions(
289
-
array(
290
-
pht('Allow Varied Subjects'),
291
-
pht('Always Use the Same Thread Subject'),
292
-
))
293
-
->setSummary(pht('Control subject variance, for some mail clients.'))
294
-
->setDescription($vary_subjects_description),
295
279
$this->newOption('metamta.insecure-auth-with-reply-to', 'bool', false)
296
280
->setBoolOptions(
297
281
array(
+2
-13
src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+2
-13
src/applications/metamta/storage/PhabricatorMetaMTAMail.php
···
1131
1131
}
1132
1132
1133
1133
private function shouldAddRePrefix(PhabricatorUserPreferences $preferences) {
1134
-
$default_value = PhabricatorEnv::getEnvConfig('metamta.re-prefix');
1135
-
1136
-
$value = $preferences->getPreference(
1134
+
$value = $preferences->getSettingValue(
1137
1135
PhabricatorEmailRePrefixSetting::SETTINGKEY);
1138
-
if ($value === null) {
1139
-
return $default_value;
1140
-
}
1141
1136
1142
1137
return ($value == PhabricatorEmailRePrefixSetting::VALUE_RE_PREFIX);
1143
1138
}
1144
1139
1145
1140
private function shouldVarySubject(PhabricatorUserPreferences $preferences) {
1146
-
$default_value = PhabricatorEnv::getEnvConfig('metamta.vary-subjects');
1147
-
1148
-
$value = $preferences->getPreference(
1141
+
$value = $preferences->getSettingValue(
1149
1142
PhabricatorEmailVarySubjectsSetting::SETTINGKEY);
1150
-
1151
-
if ($value === null) {
1152
-
return $default_value;
1153
-
}
1154
1143
1155
1144
return ($value == PhabricatorEmailVarySubjectsSetting::VALUE_VARY_SUBJECTS);
1156
1145
}