Page MenuHomePhabricator
Files F15383251

D9027.id.diff
No OneTemporary
Actions

D9027.id.diff
View Options

diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
--- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php
+++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
@@ -144,8 +144,10 @@
$errors = array();
+ $require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');
+
$e_username = strlen($value_username) ? null : true;
- $e_realname = strlen($value_realname) ? null : true;
+ $e_realname = $require_real_name ? true : null;
$e_email = strlen($value_email) ? null : true;
$e_password = true;
$e_captcha = true;
@@ -224,7 +226,7 @@
if ($can_edit_realname) {
$value_realname = $request->getStr('realName');
- if (!strlen($value_realname)) {
+ if (!strlen($value_realname) && $require_real_name) {
$e_realname = pht('Required');
$errors[] = pht('Real name is required.');
} else {
diff --git a/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php
--- a/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php
+++ b/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php
@@ -177,7 +177,8 @@
$name = $user->getUserName();
break;
case 'real':
- $name = $user->getRealName();
+ $name = strlen($user->getRealName()) ?
+ $user->getRealName() : $user->getUserName();
break;
case 'full':
default:
diff --git a/src/applications/people/config/PhabricatorUserConfigOptions.php b/src/applications/people/config/PhabricatorUserConfigOptions.php
--- a/src/applications/people/config/PhabricatorUserConfigOptions.php
+++ b/src/applications/people/config/PhabricatorUserConfigOptions.php
@@ -36,6 +36,13 @@
->setDescription(pht("Select and reorder user profile fields.")),
$this->newOption('user.custom-field-definitions', 'map', array())
->setDescription(pht("Add new simple fields to user profiles.")),
+ $this->newOption('user.require-real-name', 'bool', true)
+ ->setDescription(pht("Always require real name for user profiles."))
+ ->setBoolOptions(
+ array(
+ pht('Make real names required'),
+ pht('Make real names optional'),
+ )),
);
}
diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php
--- a/src/applications/people/controller/PhabricatorPeopleNewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleNewController.php
@@ -25,9 +25,10 @@
}
$user = new PhabricatorUser();
+ $require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');
$e_username = true;
- $e_realname = true;
+ $e_realname = $require_real_name ? true : null;
$e_email = true;
$errors = array();
@@ -64,7 +65,7 @@
$e_username = null;
}
- if (!strlen($user->getRealName())) {
+ if (!strlen($user->getRealName()) && $require_real_name) {
$errors[] = pht('Real name is required.');
$e_realname = pht('Required');
} else {
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -33,7 +33,7 @@
$picture = $user->loadProfileImageURI();
$header = id(new PHUIHeaderView())
- ->setHeader($user->getUserName().' ('.$user->getRealName().')')
+ ->setHeader($user->getFullName())
->setSubheader($profile->getTitle())
->setImage($picture);
diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
--- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
+++ b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
@@ -41,10 +41,11 @@
foreach ($handles as $phid => $handle) {
$user = $objects[$phid];
+ $realname = $user->getRealName();
+
$handle->setName($user->getUsername());
$handle->setURI('/p/'.$user->getUsername().'/');
- $handle->setFullName(
- $user->getUsername().' ('.$user->getRealName().')');
+ $handle->setFullName($user->getFullName());
$handle->setImageURI($user->loadProfileImageURI());
$handle->setDisabled(!$user->isUserActivated());
if ($user->hasStatus()) {
diff --git a/src/applications/people/search/PhabricatorUserSearchIndexer.php b/src/applications/people/search/PhabricatorUserSearchIndexer.php
--- a/src/applications/people/search/PhabricatorUserSearchIndexer.php
+++ b/src/applications/people/search/PhabricatorUserSearchIndexer.php
@@ -13,7 +13,7 @@
$doc = new PhabricatorSearchAbstractDocument();
$doc->setPHID($user->getPHID());
$doc->setDocumentType(PhabricatorPeoplePHIDTypeUser::TYPECONST);
- $doc->setDocumentTitle($user->getUserName().' ('.$user->getRealName().')');
+ $doc->setDocumentTitle($user->getFullName());
$doc->setDocumentCreated($user->getDateCreated());
$doc->setDocumentModified($user->getDateModified());
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -711,7 +711,11 @@
}
public function getFullName() {
- return $this->getUsername().' ('.$this->getRealName().')';
+ if (strlen($this->getRealName())) {
+ return $this->getUsername().' ('.$this->getRealName().')';
+ } else {
+ return $this->getUsername();
+ }
}
public function __toString() {

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 3:56 PM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7693670
Default Alt Text
D9027.id.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility