8000 Generate the suggested user login from the display name by akirk · Pull Request #395 · akirk/friends · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Generate the suggested user login from the display name #395

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

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Generate the suggested user login from the display name #395

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
10 changes: 10 additions & 0 deletions friends-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ jQuery( function ( $ ) {
return false;
} );

$( document ).on( 'keyup', 'input#display_name', function ( e ) {
const login = $( '#user_login' );
if ( this.value && login.data( 'original' ) === login.val() ) {
const generated_login = this.value.toLowerCase().replace( /[^a-z0-9]+/g, '-' ).replace( /-$/, '' ).replace( /^-/, '' );
login.val( generated_login );
login.data( 'original', generated_login );
}
} );


$( document ).on( 'click', 'a#show-details', function () {
$( '.details' ).toggleClass( 'hidden' ).focus();
return false;
Expand Down
6 changes: 3 additions & 3 deletions includes/class-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,7 @@ public function process_admin_add_friend( $vars ) {
$rest_url = false;

if ( ( isset( $vars['step2'] ) && isset( $vars['feeds'] ) && is_array( $vars['feeds'] ) ) || isset( $vars['step3'] ) ) {
$friend_user_login = str_replace( ' ', '-', sanitize_user( $vars['user_login'] ) );
$friend_user_login = trim( str_replace( ' ', '-', sanitize_user( $vars['user_login'] ) ), '-' );
$friend_display_name = sanitize_text_field( $vars['display_name'] );
if ( ! $friend_user_login ) {
// phpcs:ignore WordPress.WP.I18n.MissingArgDomain
Expand Down Expand Up @@ -1940,14 +1940,14 @@ public function process_admin_add_friend( $vars ) {

$better_user_login = User::get_user_login_from_feeds( $feeds );
if ( $better_user_login ) {
$friend_user_login = $better_user_login;
$friend_user_login = trim( $better_user_login, '-' );
}

$better_display_name = User::get_display_name_from_feeds( $feeds );
if ( $better_display_name ) {
$friend_display_name = $better_display_name;
if ( ! $better_user_login ) {
$friend_user_login = strtolower( str_replace( ' ', '-', sanitize_user( $better_display_name ) ) );
$friend_user_login = trim( strtolower( str_replace( ' ', '-', sanitize_user( $better_display_name ) ) ), '-' );
}
}
if ( get_option( 'friends_enable_wp_friendships' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion includes/class-user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public static function get_user_login_from_feeds( $feeds ) {
public static function get_display_name_from_feeds( $feeds ) {
foreach ( $feeds as $feed ) {
if ( 'self' === $feed['rel'] && ! empty( $feed['title'] ) ) {
$name = preg_replace( '/(\s[–—|-]|[:,])\s.*$/u', '', $feed['title'] );
$name = trim( preg_replace( '/(\s[–—|-]|[:,])\s.*$/u', '', $feed['title'] ) );
return sanitize_text_field( $name );
}
}
Expand Down
8 changes: 4 additions & 4 deletions templates/admin/select-feeds.php
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<table class="form-table">
<tbody>
<tr>
<th scope="row"><label for="user_login"><?php esc_html_e( 'Display Name', 'friends' ); ?></label></th>
<th scope="row"><label for="display_name"><?php esc_html_e( 'Display Name', 'friends' ); ?></label></th>
<td>
<?php if ( ! empty( $args['friends_multisite_display_name'] ) ) : ?>
<?php echo esc_html( $args['friends_multisite_display_name'] ); ?>
<input type="hidden" id="user_login" name="display_name" value="<?php echo esc_attr( $args['friend_display_name'] ); ?>" />
<input type="hidden" id="display_name" name="display_name" value="<?php echo esc_attr( $args['friend_display_name'] ); ?>" />
<?php else : ?>
<input type="text" id="user_login" name="display_name" value="<?php echo esc_attr( $args['friend_display_name'] ); ?>" required placeholder="" class="regular-text" />
<input type="text" id="display_name" name="display_name" value="<?php echo esc_attr( $args['friend_display_name'] ); ?>" required placeholder="" class="regular-text" />
<?php endif; ?>
</td>
</tr>
Expand All @@ -64,7 +64,7 @@
<?php echo esc_html( $args['friends_multisite_user_login'] ); ?>
<input type="hidden" id="user_login" name="user_login" value="<?php echo esc_attr( $args['friends_multisite_user_login'] ); ?>" />
<?php else : ?>
<input type="text" id="user_login" name="user_login" value="<?php echo esc_attr( $args['friend_user_login'] ); ?>" required placeholder="" class="regular-text" />
<input type="text" id="user_login" name="user_login" value="<?php echo esc_attr( $args['friend_user_login'] ); ?>" data-original="<?php echo esc_attr( $args['friend_user_login'] ); ?>" required placeholder="" class="regular-text" />
<?php endif; ?>
</td>
</tr>
Expand Down
Loading
0