X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FNewEvent.pm;h=61124536ef2b1c0ddd0f5672f3542c9929551394;hp=3eaa5ddbb5c0a34fd23af2651b94f5a39f3f420d;hb=4e9898a97f5c3c52d1277ed73cb4365b8644870a;hpb=2d6536cab108c937e2af49f7dcf15f2230f44d1a

diff --git a/perl/Sesse/pr0n/NewEvent.pm b/perl/Sesse/pr0n/NewEvent.pm
index 3eaa5dd..6112453 100644
--- a/perl/Sesse/pr0n/NewEvent.pm
+++ b/perl/Sesse/pr0n/NewEvent.pm
@@ -15,33 +15,19 @@ sub handler {
 	}
 
 	Sesse::pr0n::Common::header($r, "Legger til ny hendelse");
-
-	my $ok = 1;
-
+	
 	my $id = $apr->param('id');
-	if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) {
-		$r->print("    <p>Feil: Manglende eller ugyldig ID.</p>\n");
-		$ok = 0;
-	}
-
 	my $date = $apr->param('date');
-	if (!defined($date) || $date =~ /^\s*$/ || $date =~ /[<>&]/ || length($date) > 100) {
-		$r->print("    <p>Feil: Manglende eller ugyldig dato.</p>\n");
-		$ok = 0;
-	}
-	
 	my $desc = $apr->param('desc');
-	if (!defined($desc) || $desc =~ /^\s*$/ || $desc =~ /[<>&]/ || length($desc) > 100) {
-		$r->print("    <p>Feil: Manglende eller ugyldig beskrivelse.</p>\n");
-		$ok = 0;
-	}
+
+	my @errors = Sesse::pr0n::Common::add_new_event($dbh, $id, $date, $desc, $r->get_server_name);
 	
-	if ($ok == 0) {
+	if (scalar @errors > 0) {
+		for my $err (@errors) {
+			$r->print("    <p>Feil: $err</p>\n");
+		}
 		$r->print("    <p>Rett opp i feilene over før du går videre.</p>\n");
 	} else {
-		$dbh->do("INSERT INTO events (id,date,name,vhost) VALUES (?,?,?,?)",
-			undef, $id, $date, $desc, $r->get_server_name)
-			or dberror($r, "Kunne ikke sette inn ny hendelse");
 		$r->print("    <p>Hendelsen '$id' lagt til.</p>");
 	}