X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FAuth%2FUser.pm;h=a5e8366e5940178fa969144cdae3e712d7501fc5;hb=ab1ec1721c11a109546e162f87488db7dcfb9108;hp=490f188b301db67eafb344bf4f487684c70e5b59;hpb=49c23244b1ba61909b726bb9189665a33027a1af;p=ndwebbie.git

diff --git a/lib/NDWeb/Auth/User.pm b/lib/NDWeb/Auth/User.pm
index 490f188..a5e8366 100644
--- a/lib/NDWeb/Auth/User.pm
+++ b/lib/NDWeb/Auth/User.pm
@@ -3,8 +3,7 @@ package NDWeb::Auth::User;
 use strict;
 use warnings;
 use Data::Dumper;
-use base qw/Catalyst::Authentication::User/;
-use base qw/Class::Accessor::Fast/;
+use base qw/Class::Accessor::Fast Catalyst::Authentication::User/;
 
 BEGIN {
 	__PACKAGE__->mk_accessors(qw//);
@@ -32,7 +31,7 @@ sub load {
 
 	if (exists $authinfo->{id}){
 		$self->{id} = $dbh->selectrow_array(q{
-			SELECT uid FROM users WHERE lower(username) = lower(?)
+			SELECT uid FROM users WHERE username = ?
 		},undef,$authinfo->{id});
 	}elsif (exists $authinfo->{uid}){
 		$self->{id} = $authinfo->{uid};
@@ -43,7 +42,7 @@ sub load {
 	}
 
 	($self->{planet},$self->{username},$self->{css}) = $dbh->selectrow_array(q{
-		SELECT planet,username,css FROM users WHERE uid = ?
+		SELECT pid,username,css FROM users WHERE uid = ?
 		},undef,$self->{id}) or die $dbh->errstr;
 
 	return $self;
@@ -103,10 +102,20 @@ sub from_session {
 sub check_password {
 	my ( $self, $password ) = @_;
 	my $query = $self->{c}->model->prepare(q{
-		SELECT uid FROM users WHERE uid = ? AND password = md5(?)
+		SELECT uid FROM users WHERE uid = $1 AND password = crypt($2,password)
 	});
 	$query->execute($self->id,$password);
-	if ($query->rows == 1){
+
+	if ($query->rows == 0) {
+		$query = $self->{c}->model->prepare(q{
+			UPDATE users SET password = $2
+			WHERE uid = $1 AND password = md5($2)
+			RETURNING uid
+		});
+		$query->execute($self->id,$password);
+	}
+
+	if ($query->rows == 1) {
 		return $self;
 	}
 	return;