Skip to content

Commit f7939b9

Browse files
relrodepriestley
relrod
authored and
epriestley
committed
Fix reversed order of boolean config options.
Summary: See discussion in D4355, this fixes reversed bool logic. Test Plan: - Quickly viewed in the web interface to make sure it didn't break anything. - Saved `ldap.auth-enabled` with correct boolean value in the db. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4357
1 parent 0f1086f commit f7939b9

11 files changed

+33
-30
lines changed

‎src/applications/config/option/PhabricatorAuthenticationConfigOptions.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public function getOptions() {
1818
->setOptions(
1919
array(
2020
pht("Allow password authentication"),
21-
pht("Don't allow password authentication")))
21+
pht("Don't allow password authentication")
22+
))
2223
->setSummary(pht("Enables password-based authentication."))
2324
->setDescription(
2425
pht(
@@ -60,7 +61,8 @@ public function getOptions() {
6061
->setOptions(
6162
array(
6263
pht("Require email verification"),
63-
pht("Don't require email verification")))
64+
pht("Don't require email verification")
65+
))
6466
->setSummary(
6567
pht("Require email verification before a user can log in."))
6668
->setDescription(
@@ -96,7 +98,8 @@ public function getOptions() {
9698
->setOptions(
9799
array(
98100
pht("Allow editing"),
99-
pht("Prevent editing")))
101+
pht("Prevent editing")
102+
))
100103
->setSummary(
101104
pht(
102105
"Determines whether or not basic account information is ".

‎src/applications/config/option/PhabricatorCoreConfigOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public function getOptions() {
5353
$this->newOption('phabricator.serious-business', 'bool', false)
5454
->setOptions(
5555
array(
56-
pht('Shenanigans'), // That should be interesting to translate. :P
5756
pht('Serious business'),
57+
pht('Shenanigans'), // That should be interesting to translate. :P
5858
))
5959
->setSummary(
6060
pht("Should Phabricator be serious?"))

‎src/applications/config/option/PhabricatorDeveloperConfigOptions.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public function getOptions() {
1616
$this->newOption('darkconsole.enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable DarkConsole"),
2019
pht("Enable DarkConsole"),
20+
pht("Disable DarkConsole"),
2121
))
2222
->setSummary(pht("Enable Phabricator's debugging console."))
2323
->setDescription(
@@ -35,8 +35,8 @@ public function getOptions() {
3535
$this->newOption('darkconsole.always-on', 'bool', false)
3636
->setOptions(
3737
array(
38-
pht("Require DarkConsole Activation"),
3938
pht("Always Activate DarkConsole"),
39+
pht("Require DarkConsole Activation"),
4040
))
4141
->setSummary(pht("Activate DarkConsole on every page."))
4242
->setDescription(
@@ -50,8 +50,8 @@ public function getOptions() {
5050
$this->newOption('debug.stop-on-redirect', 'bool', false)
5151
->setOptions(
5252
array(
53-
pht("Use Normal HTTP Redirects"),
5453
pht("Stop Before HTTP Redirect"),
54+
pht("Use Normal HTTP Redirects"),
5555
))
5656
->setSummary(
5757
pht(
@@ -89,8 +89,8 @@ public function getOptions() {
8989
$this->newOption('phabricator.show-stack-traces', 'bool', false)
9090
->setOptions(
9191
array(
92-
pht('Hide stack traces'),
9392
pht('Show stack traces'),
93+
pht('Hide stack traces'),
9494
))
9595
->setSummary(pht("Show stack traces when unhandled exceptions occur."))
9696
->setDescription(
@@ -101,8 +101,8 @@ public function getOptions() {
101101
$this->newOption('phabricator.show-error-callout', 'bool', false)
102102
->setOptions(
103103
array(
104-
pht('Hide error callout'),
105104
pht('Show error callout'),
105+
pht('Hide error callout'),
106106
))
107107
->setSummary(pht("Show error callout."))
108108
->setDescription(
@@ -114,8 +114,8 @@ public function getOptions() {
114114
$this->newOption('celerity.force-disk-reads', 'bool', false)
115115
->setOptions(
116116
array(
117-
pht("Don't force disk reads"),
118117
pht('Force disk reads'),
118+
pht("Don't force disk reads"),
119119
))
120120
->setSummary(pht("Force Celerity to read from disk on every request."))
121121
->setDescription(
@@ -131,8 +131,8 @@ public function getOptions() {
131131
$this->newOption('celerity.minify', 'bool', false)
132132
->setOptions(
133133
array(
134-
pht("Don't minify static resources."),
135134
pht('Minify static resources.'),
135+
pht("Don't minify static resources."),
136136
))
137137
->setSummary(pht("Minify static Celerity resources."))
138138
->setDescription(

‎src/applications/config/option/PhabricatorDisqusConfigOptions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public function getOptions() {
1616
$this->newOption('disqus.auth-enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable Disqus Authentication"),
2019
pht("Enable Disqus Authentication"),
20+
pht("Disable Disqus Authentication"),
2121
))
2222
->setDescription(
2323
pht(
2424
'Allow users to login to Phabricator using Disqus credentials.')),
2525
$this->newOption('disqus.registration-enabled', 'bool', true)
2626
->setOptions(
2727
array(
28-
pht("Disable Disqus Registration"),
2928
pht("Enable Disqus Registration"),
29+
pht("Disable Disqus Registration"),
3030
))
3131
->setDescription(
3232
pht(
@@ -35,8 +35,8 @@ public function getOptions() {
3535
$this->newOption('disqus.auth-permanent', 'bool', false)
3636
->setOptions(
3737
array(
38-
pht("Allow Disqus Account Unlinking"),
3938
pht("Permanently Bind Disqus Accounts"),
39+
pht("Allow Disqus Account Unlinking"),
4040
))
4141
->setDescription(
4242
pht(

‎src/applications/config/option/PhabricatorFacebookConfigOptions.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public function getOptions() {
1616
$this->newOption('facebook.auth-enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable Facebook Authentication"),
2019
pht("Enable Facebook Authentication"),
20+
pht("Disable Facebook Authentication"),
2121
))
2222
->setDescription(
2323
pht(
2424
'Allow users to login to Phabricator using Facebook credentials.')),
2525
$this->newOption('facebook.registration-enabled', 'bool', true)
2626
->setOptions(
2727
array(
28-
pht("Disable Facebook Registration"),
2928
pht("Enable Facebook Registration"),
29+
pht("Disable Facebook Registration"),
3030
))
3131
->setDescription(
3232
pht(
@@ -35,8 +35,8 @@ public function getOptions() {
3535
$this->newOption('facebook.auth-permanent', 'bool', false)
3636
->setOptions(
3737
array(
38-
pht("Allow Facebook Account Unlinking"),
3938
pht("Permanently Bind Facebook Accounts"),
39+
pht("Allow Facebook Account Unlinking"),
4040
))
4141
->setDescription(
4242
pht(
@@ -53,8 +53,8 @@ public function getOptions() {
5353
$this->newOption('facebook.require-https-auth', 'bool', false)
5454
->setOptions(
5555
array(
56-
pht("Do Not Require HTTPS"),
5756
pht("Require HTTPS"),
57+
pht("Do Not Require HTTPS"),
5858
))
5959
->setSummary(
6060
pht(

‎src/applications/config/option/PhabricatorGitHubConfigOptions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public function getOptions() {
1616
$this->newOption('github.auth-enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable GitHub Authentication"),
2019
pht("Enable GitHub Authentication"),
20+
pht("Disable GitHub Authentication"),
2121
))
2222
->setDescription(
2323
pht(
2424
'Allow users to login to Phabricator using GitHub credentials.')),
2525
$this->newOption('github.registration-enabled', 'bool', true)
2626
->setOptions(
2727
array(
28-
pht("Disable GitHub Registration"),
2928
pht("Enable GitHub Registration"),
29+
pht("Disable GitHub Registration"),
3030
))
3131
->setDescription(
3232
pht(
@@ -35,8 +35,8 @@ public function getOptions() {
3535
$this->newOption('github.auth-permanent', 'bool', false)
3636
->setOptions(
3737
array(
38-
pht("Allow GitHub Account Unlinking"),
3938
pht("Permanently Bind GitHub Accounts"),
39+
pht("Allow GitHub Account Unlinking"),
4040
))
4141
->setDescription(
4242
pht(

‎src/applications/config/option/PhabricatorGoogleConfigOptions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public function getOptions() {
1616
$this->newOption('google.auth-enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable Google Authentication"),
2019
pht("Enable Google Authentication"),
20+
pht("Disable Google Authentication"),
2121
))
2222
->setDescription(
2323
pht(
2424
'Allow users to login to Phabricator using Google credentials.')),
2525
$this->newOption('google.registration-enabled', 'bool', true)
2626
->setOptions(
2727
array(
28-
pht("Disable Google Registration"),
2928
pht("Enable Google Registration"),
29+
pht("Disable Google Registration"),
3030
))
3131
->setDescription(
3232
pht(
@@ -35,8 +35,8 @@ public function getOptions() {
3535
$this->newOption('google.auth-permanent', 'bool', false)
3636
->setOptions(
3737
array(
38-
pht("Allow Google Account Unlinking"),
3938
pht("Permanently Bind Google Accounts"),
39+
pht("Allow Google Account Unlinking"),
4040
))
4141
->setDescription(
4242
pht(

‎src/applications/config/option/PhabricatorLDAPConfigOptions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public function getOptions() {
1616
$this->newOption('ldap.auth-enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable LDAP Authentication"),
2019
pht("Enable LDAP Authentication"),
20+
pht("Disable LDAP Authentication"),
2121
))
2222
->setDescription(
2323
pht('Enable LDAP for authentication and registration.')),
@@ -41,8 +41,8 @@ public function getOptions() {
4141
$this->newOption('ldap.search-first', 'bool', false)
4242
->setOptions(
4343
array(
44-
pht("Disabled"),
4544
pht("Enabled"),
45+
pht("Disabled"),
4646
)),
4747
$this->newOption('ldap.username-attribute', 'string', null),
4848
$this->newOption('ldap.real_name_attributes', 'list<string>', array())
@@ -56,8 +56,8 @@ public function getOptions() {
5656
$this->newOption('ldap.referrals', 'bool', true)
5757
->setOptions(
5858
array(
59-
pht("Do Not Follow Referrals"),
6059
pht("Follow Referrals"),
60+
pht("Do Not Follow Referrals"),
6161
))
6262
->setDescription(
6363
pht("You may need to disable this if you use Windows 2003 ".

‎src/applications/config/option/PhabricatorNotificationConfigOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public function getOptions() {
1616
$this->newOption('notification.enabled', 'bool', false)
1717
->setOptions(
1818
array(
19-
pht("Disable Real-Time Notifications"),
2019
pht("Enable Real-Time Notifications"),
20+
pht("Disable Real-Time Notifications"),
2121
))
2222
->setSummary(pht('Enable real-time notifications.'))
2323
->setDescription(

‎src/applications/config/option/PhabricatorRecaptchaConfigOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public function getOptions() {
1717
$this->newOption('recaptcha.enabled', 'bool', false)
1818
->setOptions(
1919
array(
20-
pht("Disable Recaptcha"),
2120
pht("Enable Recaptcha"),
21+
pht("Disable Recaptcha"),
2222
))
2323
->setSummary(pht('Enable captchas with Recaptcha.'))
2424
->setDescription(

‎src/applications/config/option/PhabricatorSecurityConfigOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function getOptions() {
7575
"\$_SERVER['HTTPS'] to the correct value."))
7676
->setOptions(
7777
array(
78-
pht('Allow HTTP'),
7978
pht('Force HTTPS'),
79+
pht('Allow HTTP'),
8080
)),
8181
$this->newOption(
8282
'phabricator.csrf-key',

0 commit comments

Comments
 (0)