Skip to content

Add option to use new user login as the display name #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaximumRGB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option to use new user login as the display name #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions includes/admin/components/bouncer/wsl.components.bouncer.setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,15 @@ function wsl_component_bouncer_setup_profile_completion()
</select>
</td>
</tr>
<tr>
<td width="200" align="right"><strong><?php _wsl_e("Login as the display name on registration", 'wordpress-social-login') ?> :</strong></td>
<td>
<select name="wsl_settings_bouncer_profile_completion_login_as_the_display_name">
<option <?php if( get_option( 'wsl_settings_bouncer_profile_completion_login_as_the_display_name' ) == 1 ) echo "selected"; ?> value="1"><?php _wsl_e("Yes", 'wordpress-social-login') ?></option>
<option <?php if( get_option( 'wsl_settings_bouncer_profile_completion_login_as_the_display_name' ) == 2 ) echo "selected"; ?> value="2"><?php _wsl_e("No", 'wordpress-social-login') ?></option>
</select>
</td>
</tr>
<tr>
<td width="200" align="right"><strong><?php _wsl_e("Hook extra registration fields", 'wordpress-social-login') ?> :</strong></td>
<td>
Expand Down
9 changes: 8 additions & 1 deletion includes/services/wsl.authentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,14 @@ function wsl_process_login_create_wp_user( $provider, $hybridauth_user_profile,
}
}

$display_name = $hybridauth_user_profile->displayName;
if( get_option( 'wsl_settings_bouncer_profile_completion_login_as_the_display_name' ) == 1 )
{
$display_name = $user_login;
}
else
{
$display_name = $hybridauth_user_profile->displayName;
}

if( empty( $display_name ) )
{
Expand Down
5 changes: 5 additions & 0 deletions includes/settings/wsl.compatibilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ function wsl_update_compatibilities()
update_option( 'wsl_settings_bouncer_profile_completion_change_username', 2 );
}

if( ! get_option( 'wsl_settings_bouncer_profile_completion_login_as_the_display_name' ) )
{
update_option( 'wsl_settings_bouncer_profile_completion_login_as_the_display_name', 2 );
}

if( ! get_option( 'wsl_settings_bouncer_profile_completion_hook_extra_fields' ) )
{
update_option( 'wsl_settings_bouncer_profile_completion_hook_extra_fields', 2 );
Expand Down
1 change: 1 addition & 0 deletions includes/settings/wsl.database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ function wsl_database_uninstall()
delete_option('wsl_settings_bouncer_profile_completion_require_email' );
delete_option('wsl_settings_bouncer_profile_completion_change_email' );
delete_option('wsl_settings_bouncer_profile_completion_change_username' );
delete_option('wsl_settings_bouncer_profile_completion_login_as_the_display_name' );
delete_option('wsl_settings_bouncer_new_users_moderation_level' );
delete_option('wsl_settings_bouncer_new_users_membership_default_role' );
delete_option('wsl_settings_bouncer_new_users_restrict_domain_enabled' );
Expand Down
111 changes: 56 additions & 55 deletions includes/settings/wsl.initialization.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* Check WSL requirements and register WSL settings
* Check WSL requirements and register WSL settings
*/

// Exit if accessed directly
Expand Down Expand Up @@ -57,7 +57,7 @@ function wsl_check_requirements()
);

/** list of WSL admin tabs */
$WORDPRESS_SOCIAL_LOGIN_ADMIN_TABS = ARRAY(
$WORDPRESS_SOCIAL_LOGIN_ADMIN_TABS = ARRAY(
"networks" => array( "label" => _wsl__("Networks" , 'wordpress-social-login') , "visible" => true , "component" => "networks" , "default" => true ),
"login-widget" => array( "label" => _wsl__("Widget" , 'wordpress-social-login') , "visible" => true , "component" => "login-widget" ),
"bouncer" => array( "label" => _wsl__("Bouncer" , 'wordpress-social-login') , "visible" => true , "component" => "bouncer" ),
Expand All @@ -76,7 +76,7 @@ function wsl_check_requirements()
// --------------------------------------------------------------------

/**
* Register a new WSL component
* Register a new WSL component
*/
function wsl_register_component( $component, $label, $description, $version, $author, $author_url, $component_url )
{
Expand All @@ -100,8 +100,8 @@ function wsl_register_component( $component, $label, $description, $version, $au
/**
* Register new WSL admin tab
*/
function wsl_register_admin_tab( $component, $tab, $label, $action, $visible = false, $pull_right = false )
{
function wsl_register_admin_tab( $component, $tab, $label, $action, $visible = false, $pull_right = false )
{
GLOBAL $WORDPRESS_SOCIAL_LOGIN_ADMIN_TABS;

$config = array();
Expand All @@ -121,7 +121,7 @@ function wsl_register_admin_tab( $component, $tab, $label, $action, $visible = f
* Check if a component is enabled
*/
function wsl_is_component_enabled( $component )
{
{
if( get_option( "wsl_components_" . $component . "_enabled" ) == 1 )
{
return true;
Expand All @@ -145,15 +145,15 @@ function wsl_register_components()

foreach( $WORDPRESS_SOCIAL_LOGIN_ADMIN_TABS as $tab => $config )
{
$WORDPRESS_SOCIAL_LOGIN_ADMIN_TABS[ $tab ][ "enabled" ] = false;
$WORDPRESS_SOCIAL_LOGIN_ADMIN_TABS[ $tab ][ "enabled" ] = false;
}

foreach( $WORDPRESS_SOCIAL_LOGIN_COMPONENTS as $component => $config )
{
$WORDPRESS_SOCIAL_LOGIN_COMPONENTS[ $component ][ "enabled" ] = false;

$is_component_enabled = get_option( "wsl_components_" . $component . "_enabled" );

if( $is_component_enabled == 1 )
{
$WORDPRESS_SOCIAL_LOGIN_COMPONENTS[ $component ][ "enabled" ] = true;
Expand Down Expand Up @@ -225,63 +225,64 @@ function wsl_register_setting()
// api key or id ?
if( $require_client_id )
{
register_setting( 'wsl-settings-group', 'wsl_settings_' . $provider_id . '_app_id' );
register_setting( 'wsl-settings-group', 'wsl_settings_' . $provider_id . '_app_id' );
}

if( !$require_client_id || $require_client_id === 'both' )
{
register_setting( 'wsl-settings-group', 'wsl_settings_' . $provider_id . '_app_key' );
register_setting( 'wsl-settings-group', 'wsl_settings_' . $provider_id . '_app_key' );
}

// api secret
register_setting( 'wsl-settings-group', 'wsl_settings_' . $provider_id . '_app_secret' );
}
}

register_setting( 'wsl-settings-group-customize' , 'wsl_settings_connect_with_label' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_social_icon_set' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_users_avatars' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_use_popup' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_widget_display' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_redirect_url' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_force_redirect_url' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_users_notification' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_authentication_widget_css' );

register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_facebook' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_google' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_twitter' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_linkedin' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_live' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_vkontakte' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_registration_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_authentication_enabled' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_accounts_linking_enabled' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_require_email' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_change_username' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_hook_extra_fields' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_moderation_level' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_membership_default_role' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_domain_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_domain_list' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_domain_text_bounce' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_email_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_email_list' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_email_text_bounce' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_profile_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_profile_list' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_profile_text_bounce' );

register_setting( 'wsl-settings-group-buddypress' , 'wsl_settings_buddypress_enable_mapping' );
register_setting( 'wsl-settings-group-buddypress' , 'wsl_settings_buddypress_xprofile_map' );

register_setting( 'wsl-settings-group-debug' , 'wsl_settings_debug_mode_enabled' );
register_setting( 'wsl-settings-group-development' , 'wsl_settings_development_mode_enabled' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_connect_with_label' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_social_icon_set' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_users_avatars' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_use_popup' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_widget_display' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_redirect_url' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_force_redirect_url' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_users_notification' );
register_setting( 'wsl-settings-group-customize' , 'wsl_settings_authentication_widget_css' );

register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_facebook' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_google' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_twitter' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_linkedin' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_live' );
register_setting( 'wsl-settings-group-contacts-import' , 'wsl_settings_contacts_import_vkontakte' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_registration_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_authentication_enabled' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_accounts_linking_enabled' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_require_email' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_change_username' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_login_as_the_display_name' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_profile_completion_hook_extra_fields' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_moderation_level' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_membership_default_role' );

register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_domain_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_domain_list' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_domain_text_bounce' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_email_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_email_list' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_email_text_bounce' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_profile_enabled' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_profile_list' );
register_setting( 'wsl-settings-group-bouncer' , 'wsl_settings_bouncer_new_users_restrict_profile_text_bounce' );

register_setting( 'wsl-settings-group-buddypress' , 'wsl_settings_buddypress_enable_mapping' );
register_setting( 'wsl-settings-group-buddypress' , 'wsl_settings_buddypress_xprofile_map' );

register_setting( 'wsl-settings-group-debug' , 'wsl_settings_debug_mode_enabled' );
register_setting( 'wsl-settings-group-development' , 'wsl_settings_development_mode_enabled' );
}

// --------------------------------------------------------------------