From d1c7095ba40f5ff363150a4aa74329a589fc78df Mon Sep 17 00:00:00 2001 From: Al Beano Date: Fri, 2 Sep 2016 23:45:32 +0100 Subject: [PATCH] check if subscription exists --- tormon/e_exists.tt | 2 ++ tormon/tormon.fcgi | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 tormon/e_exists.tt diff --git a/tormon/e_exists.tt b/tormon/e_exists.tt new file mode 100644 index 0000000..b1fd523 --- /dev/null +++ b/tormon/e_exists.tt @@ -0,0 +1,2 @@ +

Error

+The email you entered is already signed up for subscriptions for this fingerprint. Please go back and try again. diff --git a/tormon/tormon.fcgi b/tormon/tormon.fcgi index 3996b16..bd8a842 100755 --- a/tormon/tormon.fcgi +++ b/tormon/tormon.fcgi @@ -66,7 +66,6 @@ while ($request->Accept() <= 0) { case "/" { my $tt = read_file("$Bin/index.tt"); $content = ${ $tmpl->render($tt, {version => $VERSION}) }; - $code = "\n"; # 200 OK } case "/subscribe" { read STDIN, my $buf, $ENV{"CONTENT_LENGTH"}; @@ -92,9 +91,21 @@ while ($request->Accept() <= 0) { last; } + # Check if this email/fp combo is already in db + my $sth = $dbh->prepare("select id from users where email=? and fp=?"); + $sth->bind_param(1, $input{"email"}); + $sth->bind_param(2, $input{"fp"}); + $sth->execute; + my $href = $sth->fetchrow_hashref; + if ($sth->rows != 0) { + $content = read_file("$Bin/e_exists.tt"); + last; + } + $sth->finish; + # Add the email to database my $secret = rand_string(); - my $sth = $dbh->prepare("insert into users (email, confirmed, fp, secret) + $sth = $dbh->prepare("insert into users (email, confirmed, fp, secret) values (?, 0, ?, ?);"); $sth->bind_param(1, $input{"email"}); $sth->bind_param(2, $input{"fp"}); @@ -126,7 +137,6 @@ while ($request->Accept() <= 0) { }); $content = read_file("$Bin/subscribe.tt"); - $code = "\n"; } case (/^\/confirm\?id=([0-9]+)&s=([a-z]{16})$/) { # limit scope or something @@ -155,7 +165,6 @@ while ($request->Accept() <= 0) { $content = read_file("$Bin/confirm.tt"); } - $code = "\n"; } else { my $tt = read_file("$Bin/error.tt"); @@ -171,5 +180,6 @@ while ($request->Accept() <= 0) { content => $content, }, ); + $code = "\n" unless defined $code; print "Content-Type: text/html\n", $code, ${$html}; }