revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-29 18:22:41 +01:00
Code Issues Releases Wiki Activity

Display e-mail preferences even if user can't change them

Browse source 
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
This commit is contained in:
vrana 2012-06-08 19:42:05 -07:00
parent a11deec4d4
commit 11b3c6a4d5
1 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php
View file

@ -123,37 +123,47 @@ final class PhabricatorUserEmailPreferenceSettingsPanelController
->setValue($preferences->getPreference($pref_no_self_mail, 0)));
if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
$form
->appendChild(
id(new AphrontFormSelectControl())
->setLabel('Add "Re:" Prefix')
$re_control = id(new AphrontFormSelectControl())
->setName($pref_re_prefix)
->setCaption(
'Enable this option to fix threading in Mail.app on OS X Lion, '.
'or if you like "Re:" in your email subjects.')
->setOptions(
array(
'default' => 'Use Server Default ('.$re_prefix_default.')',
'true' => 'Enable "Re:" prefix',
'false' => 'Disable "Re:" prefix',
))
->setValue($re_prefix_value))
->appendChild(
id(new AphrontFormSelectControl())
->setLabel('Vary Subjects')
->setValue($re_prefix_value);
$vary_control = id(new AphrontFormSelectControl())
->setName($pref_vary)
->setCaption(
'This option adds more information to email subjects, but may '.
'break threading in some clients.')
->setOptions(
array(
'default' => 'Use Server Default ('.$vary_default.')',
'true' => 'Vary Subjects',
'false' => 'Do Not Vary Subjects',
))
->setValue($vary_value));
->setValue($vary_value);
} else {
$re_control = id(new AphrontFormStaticControl())
->setValue('Server Default ('.$re_prefix_default.')');
$vary_control = id(new AphrontFormStaticControl())
->setValue('Server Default ('.$vary_default.')');
}
$form
->appendChild(
$re_control
->setLabel('Add "Re:" Prefix')
->setCaption(
'Enable this option to fix threading in Mail.app on OS X Lion, '.
'or if you like "Re:" in your email subjects.'))
->appendChild(
$vary_control
->setLabel('Vary Subjects')
->setCaption(
'This option adds more information to email subjects, but may '.
'break threading in some clients.'));
$form
->appendChild(
'<br />'.