Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5d6b1bb

Browse files
mantismantis
committedMar 1, 2013
Fix #0011399: Deprecate $g_show_realname and use $g_show_user_realname_threshold instead
1 parent 04d848b commit 5d6b1bb

File tree

8 files changed

+11
-15
lines changed

8 files changed

+11
-15
lines changed
 

‎config_defaults_inc.php

-6
Original file line numberDiff line numberDiff line change
@@ -860,12 +860,6 @@
860860
*/
861861
$MantisConfig->show_version_dates_threshold = NOBODY;
862862

863-
/**
864-
* show users with their real name or not
865-
* @global int $g_show_realname
866-
*/
867-
$MantisConfig->show_realname = OFF;
868-
869863
/**
870864
* leave off for now
871865
* @global int $g_differentiate_duplicates

‎core/filter_api.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3445,7 +3445,7 @@ function print_filter_reporter_id() {
34453445
$t_username = user_get_field( $t_id, 'username' );
34463446
$t_realname = user_get_field( $t_id, 'realname' );
34473447
$t_display_name = string_attribute( $t_username );
3448-
if(( isset( $t_realname ) ) && ( $t_realname > '' ) && ( ON == config_get( 'show_realname' ) ) ) {
3448+
if( ( isset( $t_realname ) ) && ( $t_realname > '' ) && ( access_has_project_level( config_get( 'show_user_realname_threshold' ) ) ) ) {
34493449
$t_display_name = string_attribute( $t_realname );
34503450
}
34513451
echo '<option value="' . $t_id . '" selected="selected">' . $t_display_name . '</option>';

‎core/obsolete.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,6 @@
197197
config_obsolete( 'sort_icon_arr', 'theme');
198198
config_obsolete( 'content_expire', '' );
199199
config_obsolete( 'page_title', 'top_include_page' );
200-
config_obsolete( 'icon_path', 'theme' );
200+
config_obsolete( 'icon_path', 'theme' );
201+
202+
config_obsolete( 'show_realname', 'show_user_realname_threshold' );

‎core/print_api.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ function print_user_option_list( $p_user_id, $p_project_id = null, $p_access = A
281281

282282
$t_display = array();
283283
$t_sort = array();
284-
$t_show_realname = ( ON == config_get( 'show_realname' ) );
284+
$t_show_realname = ( access_has_project_level( config_get( 'show_user_realname_threshold', null, null, $p_project_id ) ) );
285285
$t_sort_by_last_name = ( ON == config_get( 'sort_by_last_name' ) );
286286
foreach( $t_users as $t_user ) {
287287
$t_user_name = string_attribute( $t_user['username'] );

‎core/user_api.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ function user_get_realname( $p_user_id ) {
475475

476476
/**
477477
* return the username or a string "user<id>" if the user does not exist
478-
* if show_realname is set and real name is not empty, return it instead
478+
* if show_user_realname_threshold is set and real name is not empty, return it instead
479479
*
480480
* @param int $p_user_id User ID
481481
* @return string
@@ -487,7 +487,7 @@ function user_get_name( $p_user_id ) {
487487
return _( 'user' ) . (int) $p_user_id;
488488
}
489489

490-
if( ON == config_get( 'show_realname' ) ) {
490+
if( access_has_project_level( config_get( 'show_user_realname_threshold' ) ) ) {
491491
if( is_blank( $t_user->realname ) ) {
492492
return $t_user->username;
493493
} else {
@@ -797,7 +797,7 @@ function user_get_unassigned_by_project_id( $p_project_id = null ) {
797797
$t_display = array();
798798
$t_sort = array();
799799
$t_users = array();
800-
$t_show_realname = ( ON == config_get( 'show_realname' ) );
800+
$t_show_realname = ( access_has_project_level( config_get( 'show_user_realname_threshold', null, null, $p_project_id ), $p_project_id ) );
801801
$t_sort_by_last_name = ( ON == config_get( 'sort_by_last_name' ) );
802802

803803
while( $t_row = db_fetch_array( $t_result ) ) {

‎manage/proj_edit_page.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@
498498
foreach ( $t_users as $t_user ) {
499499
$t_user_name = string_attribute( $t_user['username'] );
500500
$t_sort_name = mb_strtolower( $t_user_name );
501-
if ( ( isset( $t_user['realname'] ) ) && ( $t_user['realname'] > "" ) && ( ON == config_get( 'show_realname' ) ) ){
501+
if ( ( isset( $t_user['realname'] ) ) && ( $t_user['realname'] > "" ) && ( access_has_project_level( config_get( 'show_user_realname_threshold', null, null, $f_project_id ), $f_project_id ) ) {
502502
$t_user_name = string_attribute( $t_user['realname'] ) . " (" . $t_user_name . ")";
503503
if ( ON == config_get( 'sort_by_last_name') ) {
504504
$t_sort_name_bits = explode( ' ', mb_strtolower( $t_user_name ), 2 );

‎plugins/XmlImportExport/ImportXml/Issue.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ private function get_user_id( $p_username, $p_squash_userid = 0 ) {
305305
$t_user_id = user_get_id_by_name( $p_username );
306306
if( $t_user_id === false ) {
307307
// user not found by username -> check real name
308-
// keep in mind that the setting config_get( 'show_realname' ) may differ between import and export system!
308+
// keep in mind that the setting config_get( 'show_user_realname_threshold' ) may differ between import and export system!
309309
$t_user_id = user_get_id_by_realname( $p_username );
310310
if ( $t_user_id === false ) {
311311
//not found

‎project_page.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
$t_access_level_for_dev_team = config_get( 'development_team_threshold' );
113113

114114
$t_users = project_get_all_user_rows( $f_project_id, $t_access_level_for_dev_team );
115-
$t_show_real_names = config_get( 'show_realname' ) == ON;
115+
$t_show_real_names = access_has_project_level( config_get( 'show_user_realname_threshold', null, null, $f_project_id ) );
116116

117117
if ( count( $t_users ) > 0 ) {
118118
echo '<h2>', _( 'Development Team' ), '</h2>';

3 commit comments

Comments
 (3)

dregad commented on Mar 2, 2013

@dregad
dregad
on Mar 2, 2013
Member

I don't think you should do that - please see my comment http://www.mantisbt.org/bugs/view.php?id=11399#c31588

grangeway commented on Mar 2, 2013

@grangeway
grangeway
on Mar 2, 2013
Contributor

dregad commented on Mar 2, 2013

@dregad
dregad
on Mar 2, 2013
Member

Then what about view_user_page.php ?

Take the example of mantisbt.org - we work with usernames everywhere, but as developer you're allowed to see users' realnames in view_user_page.php.

With your change, 2 options

  • threshold = DEVELOPER : developers and above see realnames everywhere in the application (not what we want)
  • threshold = ADMINISTRATOR (or even NOBODY) : nobody can see realnames, except users in their own profile, and administrators in the manage user pages (also not what we want).

In both cases we lose functionality.

Please sign in to comment.