@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
Display e-mail preferences even if user can't change them
Test Plan: Displayed e-mail preferences with and without multiplexing.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin
Differential Revision: https://secure.phabricator.com/D2699
+39
-29
+39
-29
src/applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php
+39
-29
src/applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php
···
123
123
->setValue($preferences->getPreference($pref_no_self_mail, 0)));
124
124
125
125
if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
126
-
$form
127
-
->appendChild(
128
-
id(new AphrontFormSelectControl())
129
-
->setLabel('Add "Re:" Prefix')
130
-
->setName($pref_re_prefix)
131
-
->setCaption(
132
-
'Enable this option to fix threading in Mail.app on OS X Lion, '.
133
-
'or if you like "Re:" in your email subjects.')
134
-
->setOptions(
135
-
array(
136
-
'default' => 'Use Server Default ('.$re_prefix_default.')',
137
-
'true' => 'Enable "Re:" prefix',
138
-
'false' => 'Disable "Re:" prefix',
139
-
))
140
-
->setValue($re_prefix_value))
141
-
->appendChild(
142
-
id(new AphrontFormSelectControl())
143
-
->setLabel('Vary Subjects')
144
-
->setName($pref_vary)
145
-
->setCaption(
146
-
'This option adds more information to email subjects, but may '.
147
-
'break threading in some clients.')
148
-
->setOptions(
149
-
array(
150
-
'default' => 'Use Server Default ('.$vary_default.')',
151
-
'true' => 'Vary Subjects',
152
-
'false' => 'Do Not Vary Subjects',
153
-
))
154
-
->setValue($vary_value));
126
+
$re_control = id(new AphrontFormSelectControl())
127
+
->setName($pref_re_prefix)
128
+
->setOptions(
129
+
array(
130
+
'default' => 'Use Server Default ('.$re_prefix_default.')',
131
+
'true' => 'Enable "Re:" prefix',
132
+
'false' => 'Disable "Re:" prefix',
133
+
))
134
+
->setValue($re_prefix_value);
135
+
136
+
$vary_control = id(new AphrontFormSelectControl())
137
+
->setName($pref_vary)
138
+
->setOptions(
139
+
array(
140
+
'default' => 'Use Server Default ('.$vary_default.')',
141
+
'true' => 'Vary Subjects',
142
+
'false' => 'Do Not Vary Subjects',
143
+
))
144
+
->setValue($vary_value);
145
+
} else {
146
+
$re_control = id(new AphrontFormStaticControl())
147
+
->setValue('Server Default ('.$re_prefix_default.')');
148
+
149
+
$vary_control = id(new AphrontFormStaticControl())
150
+
->setValue('Server Default ('.$vary_default.')');
155
151
}
152
+
153
+
$form
154
+
->appendChild(
155
+
$re_control
156
+
->setLabel('Add "Re:" Prefix')
157
+
->setCaption(
158
+
'Enable this option to fix threading in Mail.app on OS X Lion, '.
159
+
'or if you like "Re:" in your email subjects.'))
160
+
->appendChild(
161
+
$vary_control
162
+
->setLabel('Vary Subjects')
163
+
->setCaption(
164
+
'This option adds more information to email subjects, but may '.
165
+
'break threading in some clients.'));
156
166
157
167
$form
158
168
->appendChild(