X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FSettings.pm;h=16358444618efe089b44f12be74ee43e7ce8edbf;hb=9519c80241167db071e44cbdd1e1843daad6e305;hp=5780c2b92921411655ba2e7b136fdcdcaa780d4b;hpb=23470c3481cbd9e7dfa3bfa5cf05bbb41d098cc6;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Settings.pm b/lib/NDWeb/Controller/Settings.pm
index 5780c2b..1635844 100644
--- a/lib/NDWeb/Controller/Settings.pm
+++ b/lib/NDWeb/Controller/Settings.pm
@@ -43,11 +43,12 @@ sub index :Path :Args(0) {
 	}
 	$c->stash(stylesheets => \@stylesheets);
 
-	my ($birthday,$timezone,$email) = $dbh->selectrow_array(q{
-SELECT birthday,timezone,email FROM users WHERE uid = $1
+	my ($birthday,$timezone,$email,$discord_id) = $dbh->selectrow_array(q{
+SELECT birthday,timezone,email,discord_id FROM users WHERE uid = $1
 		},undef,$c->user->id);
 	$c->stash(birthday => $birthday);
 	$c->stash(email =>  $c->flash->{email} // $email);
+	$c->stash(discord_id =>  $c->flash->{discord_id} // $discord_id);
 
 	my @timezone = split m{/},$timezone,2;
 	$c->stash(timezone => \@timezone);
@@ -112,12 +113,16 @@ sub changePassword : Local {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{UPDATE users SET password = MD5($1)
-		WHERE password = MD5($2) AND uid = $3
+	if (length $c->req->param('pass') < 4) {
+		$c->flash(error => "Your password need to be at least 4 characters");
+	} else {
+		my $query = $dbh->prepare(q{UPDATE users SET password = $1
+			WHERE password = crypt($2,password) AND uid = $3
 		});
-	$query->execute($c->req->param('pass'),$c->req->param('oldpass'),$c->user->id);
+		$query->execute($c->req->param('pass'),$c->req->param('oldpass'),$c->user->id);
 
-	$c->flash(error => "Old password was invalid") unless $query->rows;
+		$c->flash(error => "Old password was invalid") unless $query->rows;
+	}
 
 	$c->res->redirect($c->uri_for(''));
 }
@@ -128,6 +133,16 @@ sub changeEmail : Local {
 
 	my $email = $c->req->param('email');
 
+	if ($email =~ /^s?$/) {
+		my $update = $dbh->prepare(q{
+UPDATE users SET email = NULL WHERE uid = $1;
+			});
+		$update->execute($c->user->id);
+		$c->flash(error => 'email cleared');
+		$c->res->redirect($c->uri_for(''));
+		return,
+	}
+
 	unless (Email::Valid->address($email)){
 		$c->flash(email => $email);
 		$c->flash(error => 'Invalid email address');
@@ -144,7 +159,7 @@ INSERT INTO email_change (uid,email) VALUES ($1,$2) RETURNING id;
 		my ($id) = $insert->fetchrow_array;
 
 		my %mail = (
-			smtp => 'ruin.nu',
+			smtp => 'localhost',
 			To      => $email,
 			From    => 'NewDawn Command <nd@ruin.nu>',
 			'Content-type' => 'text/plain; charset="UTF-8"',
@@ -174,6 +189,39 @@ use the following url to confirm the change:
 	$c->res->redirect($c->uri_for(''));
 }
 
+sub changeDiscordId : Local {
+	my ( $self, $c ) = @_;
+	my $dbh = $c->model;
+
+	my $discord_id = $c->req->param('discord_id');
+
+	if ($discord_id =~ /^\s*$/) {
+		my $update = $dbh->prepare(q{
+UPDATE users SET discord_id = NULL WHERE uid = $1;
+			});
+		$update->execute($c->user->id);
+		$c->flash(error => 'discord id cleared');
+		$c->res->redirect($c->uri_for(''));
+		return,
+	}
+
+	eval{
+		my $update = $dbh->prepare(q{
+UPDATE users SET discord_id = $2 WHERE uid = $1;
+			});
+		$update->execute($c->user->id,$discord_id);
+	};
+	if($@){
+		if($@ =~ /duplicate key value violates unique constraint/){
+			$c->flash(discord_id => $discord_id);
+			$c->flash(error => 'Someone else is using this discord id, duplicate account?');
+		}else{
+			die $@;
+		}
+	}
+	$c->res->redirect($c->uri_for(''));
+}
+
 sub confirmEmail : Local {
 	my ( $self, $c, $id ) = @_;
 	my $dbh = $c->model;