Fix previous commit

[plack-app-gruntmaster.git] / lib / Plack / App / Gruntmaster.pm

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 14e79871b5e2e8e32c9ccce9fbe79bb841b59002..1d8fc325e032d885fff24f672a0dd0274d829287 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -152,8 +152,14 @@ sub dispatch_request{
 
                sub (/us/)                                        { response us => 'Users', {us => db->user_list} },
                sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_) },
-               sub (/log/ + ?:contest~&:owner~&:page~&:problem~) { response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest}} },
-               sub (/pb/  + ?:owner~&:contest~)                  { response pb => 'Problems', {%{db->problem_list(%_)}, maybe contest => $_{contest}} },
+               sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~) {
+                       forbid $_{private};
+                       response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest}}
+               },
+               sub (/pb/  + ?:owner~&:contest~&:private~)                  {
+                       forbid $_{private};
+                       response pb => 'Problems', {%{db->problem_list(%_)}, maybe contest => $_{contest}}
+               },
 
                sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
                sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}) },
@@ -199,16 +205,17 @@ sub dispatch_request{
                        reply 'Password changed successfully';
                },
 
-               sub (/action/submit + %:problem=&:contest~&:prog_format=&:source_code~ + *:prog~) {
+               sub (/action/submit + %:problem=&:contest~&:prog_format=&:source_code~ + *prog~) {
+                       my (undef, undef, $prog) = @_;
                        forbid !remote_user;
                        return reply 'This contest has finished' if contest && contest->is_finished;
                        return reply 'This contest has not yet started' if !admin && contest && contest->is_pending;
-                       return reply 'Maximum source size is 10KB' if ($_{prog} ? $_{prog}->size : length $_{source_code}) > 10 * 1024;
+                       return reply 'Maximum source size is 10KB' if ($prog ? $prog->size : length $_{source_code}) > 10 * 1024;
                        return reply 'You must wait 30 seconds between jobs' if !admin && time <= remote_user->lastjob + 30;
                        remote_user->update({lastjob => time});
 
-                       my $prog = $_{prog} ? read_file $_{prog}->path : $_{source_code};
-                       unlink $_{prog}->path if $_{prog};
+                       my $source = $prog ? read_file $prog->path : $_{source_code};
+                       unlink $prog->path if $prog;
                        db->jobs->create({
                                maybe contest => $_{contest},
                                maybe private => problem->private,
@@ -216,7 +223,7 @@ sub dispatch_request{
                                extension => FORMAT_EXTENSION->{$_{prog_format}},
                                format => $_{prog_format},
                                problem => $_{problem},
-                               source => $prog,
+                               source => $source,
                                owner => remote_user->id,
                        });