X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FHandlers.pm;h=41ccfb45ef5d249539bcda8647ef2f5b21e8f844;hb=69ae93bf8c2c07eefbd4692d7b7b420e49eb7b12;hp=c9a6c70d99c534e1c38d621f693d5477a3bbb4f1;hpb=b746d00261803eb0e9e000225ca89a41fa0a8079;p=gruntmaster-handlers.git

diff --git a/lib/Gruntmaster/Handlers.pm b/lib/Gruntmaster/Handlers.pm
index c9a6c70..41ccfb4 100644
--- a/lib/Gruntmaster/Handlers.pm
+++ b/lib/Gruntmaster/Handlers.pm
@@ -20,7 +20,17 @@ use File::Basename qw/fileparse/;
 use File::Temp qw/tempdir/;
 use File::Copy qw/move/;
 use Gruntmaster::Data qw/contest_start contest_end push_job set_job_inmeta insert_user PUBLISH/;
-use Gruntmaster::Page::Log;
+
+use constant FORMAT_EXTENSION => {
+	C => 'c',
+	CPP => 'cpp',
+	MONO => 'cs',
+	JAVA => 'java',
+	PASCAL => 'pas',
+	PERL => 'pl',
+	PYTHON => 'py',
+	RUBY => 'rb',
+};
 
 sub aputs{
 	my ($r, $str) = @_;
@@ -33,9 +43,13 @@ sub aputs{
 sub submit{
   my $r = shift;
   my $req = Apache2::Request->new($r);
-  my ($problem, $format, $contest, $private) = map {scalar $req->param($_)} 'problem', 'prog_format', 'contest', 'private';
-  my $prog;
-  $req->upload('prog')->slurp($prog);
+  my ($problem, $format, $contest, $private, $prog) = map {scalar $req->param($_)} 'problem', 'prog_format', 'contest', 'private', 'source_code';
+  my $upload = $req->upload('prog');
+  if (defined $upload) {
+	  my $temp;
+	  $upload->slurp($temp);
+	  $prog = $temp if $temp
+  }
   die if defined $contest && $contest !~ /^\w+$/ ;
   die if defined $contest && (time < contest_start $contest || time > contest_end $contest);
 
@@ -46,14 +60,14 @@ sub submit{
 	  defined $private ? (private => $private) : (),
 	  defined $contest ? (contest => $contest, private => 1) : (),
 	  filesize => length $prog,
-	  extension => Gruntmaster::Page::Log::FORMAT_EXTENSION->{$format},
+	  extension => FORMAT_EXTENSION->{$format},
   );
 
   set_job_inmeta $job, {
 	  files => {
 		  prog => {
 			  format => $format,
-			  name => 'prog.' . Gruntmaster::Page::Log::FORMAT_EXTENSION->{$format},
+			  name => 'prog.' . FORMAT_EXTENSION->{$format},
 			  content => $prog,
 		  }
 	  }
@@ -67,16 +81,19 @@ sub submit{
 sub register{
 	my $r = shift;
 	my $req = Apache2::Request->new($r);
-	my ($username, $password, $confirm_password, $name, $email, $town, $university) = map {scalar $req->param($_)} 'username', 'password', 'confirm_password', 'name', 'email', 'town', 'university';
+	my ($username, $password, $confirm_password, $name, $email, $phone, $town, $university, $level) = map { die if length > 200; $_ } map {scalar $req->param($_)} qw/username password confirm_password name email phone town university level/;
 
 	local $Apache2::Authen::Passphrase::rootdir = $r->dir_config('AuthenPassphraseRootdir');
 	return aputs $r, 'Bad username. Allowed characters are letters, digits and underscores, and the username must be between 2 and 20 characters long.' unless $username =~ USER_REGEX;
 	return aputs $r, 'Username already in use' if -e "$Apache2::Authen::Passphrase::rootdir/$username.yml";
 	return aputs $r, 'The two passwords do not match' unless $password eq $confirm_password;
+	return aputs $r, 'All fields are required' if grep { !length } $username, $password, $confirm_password, $name, $email, $phone, $town, $university, $level;
 	pwset $username, $password;
 
-	insert_user $username, name => $name, email => $email, town => $town, university => $university;
+	insert_user $username, name => $name, email => $email, phone => $phone, town => $town, university => $university, level => $level;
 
+	PUBLISH genpage =>  "us/index.html";
+	PUBLISH genpage =>  "us/$username.html";
 	aputs $r, 'Registered successfully';
 }