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) = @_;
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);
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,
}
}
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';
}