Possible to clear email address

[ndwebbie.git] / lib / NDWeb / Controller / Settings.pm

diff --git a/lib/NDWeb/Controller/Settings.pm b/lib/NDWeb/Controller/Settings.pm
index 3f09a435f8e57979dfa99e37b466432c901900bb..f95a97922373f9853649ad4f3091fb1b117f97d4 100644 (file)
--- a/lib/NDWeb/Controller/Settings.pm
+++ b/lib/NDWeb/Controller/Settings.pm
@@ -112,10 +112,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->res->redirect($c->uri_for(''));
 }
@@ -126,6 +132,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');
@@ -142,7 +158,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"',