Commit 581aae08 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Model/Users: Remove superfluous "check_if_" prefix from check functions

parent 6cee1e20

lib/Travelynx/Controller/Account.pm

+3 −3
Original line number Diff line number Diff line
@@ -100,12 +100,12 @@ sub register { 
		return;

	}



	if ( $self->users->check_if_user_name_exists( name => $user ) ) {

	if ( $self->users->user_name_exists( name => $user ) ) {

		$self->render( 'register', invalid => 'user_collision' );

		return;

	}



	if ( $self->users->check_if_mail_is_blacklisted( email => $email ) ) {

	if ( $self->users->mail_is_blacklisted( email => $email ) ) {

		$self->render( 'register', invalid => 'mail_blacklisted' );

		return;

	}
@@ -505,7 +505,7 @@ sub change_name { 
       # is not possible. However, to minimize the number of failed SQL

       # queries, we first do a select check here and only attempt an update

       # if it succeeded.

		if ( $self->users->check_if_user_name_exists( name => $new_name ) ) {

		if ( $self->users->user_name_exists( name => $new_name ) ) {

			$self->render( 'change_name', invalid => 'user_collision' );

			return;

		}

lib/Travelynx/Model/Users.pm

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ sub set_password_hash { 
	$db->update( 'users', { password => $password }, { id => $uid } );

}



sub check_if_user_name_exists {

sub user_name_exists {

	my ( $self, %opt ) = @_;

	my $db        = $opt{db} // $self->{pg}->db;

	my $user_name = $opt{name};
@@ -381,7 +381,7 @@ sub check_if_user_name_exists { 
	return 0;

}



sub check_if_mail_is_blacklisted {

sub mail_is_blacklisted {

	my ( $self, %opt ) = @_;

	my $db   = $opt{db} // $self->{pg}->db;

	my $mail = $opt{email};