summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2021-06-13 06:20:21 +0200
committerDaniel Friesel <derf@finalrewind.org>2021-06-13 06:20:21 +0200
commit581aae081dcc75c0fd0520c0b9ae096e4b138681 (patch)
tree2fbfd644a430bd8666033d6c65e9b0fd95dbb3be
parent6cee1e20ef10608ed8f37777cdb24236487377d3 (diff)
Model/Users: Remove superfluous "check_if_" prefix from check functions
-rw-r--r--lib/Travelynx/Controller/Account.pm6
-rw-r--r--lib/Travelynx/Model/Users.pm4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index a821b62..31ba434 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -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;
}
diff --git a/lib/Travelynx/Model/Users.pm b/lib/Travelynx/Model/Users.pm
index 3c64e9d..8bd60f0 100644
--- a/lib/Travelynx/Model/Users.pm
+++ b/lib/Travelynx/Model/Users.pm
@@ -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};