X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=efcedf54a23e74f79fae336dfa64733b020df16d;hb=ebca729db7cdee3b542db9cb9f2508f701941c10;hp=9775b960c10d729d96c7984f5661dcf8f6e99073;hpb=4f3b70b7d2366e68014ca2eec7d4c051f3418031;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 9775b96..efcedf5 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -112,7 +112,7 @@ sub dispatch_request{
 
 		sub (/src/:job) {
 			return NOT_FOUND if !job;
-			forbid job->private || job->problem->private || job->contest && job->contest->private;
+			forbid job->private || job->problem->private || job->contest && job->contest->is_running;
 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => CONTENT_TYPES->{job->format});
 			[200, \@headers, [job->source]]
 		},
@@ -144,7 +144,10 @@ sub dispatch_request{
 		sub (/st/:contest) {
 			response st => 'Standings', {
 				st => [ contest->standings ],
-				problems => [map { $_->problem } contest->contest_problems],
+				problems => [
+					map { [$_->id, $_->name] }
+					sort { $a->value <=> $b->value }
+					map { $_->problem } contest->contest_problems],
 			}, 10
 		},
 
@@ -179,7 +182,11 @@ sub dispatch_request{
 			$_{contest} = $contest;
 			return NOT_FOUND if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
 			forbid problem->is_private;
-			response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id);
+			if (contest && contest->is_running) {
+				forbid !remote_user;
+				$privacy = 'private';
+			}
+			response pb_entry => problem->name, {%{db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id)}, maybe contest => $_{contest}};
 		},
 		sub (/sol/:problem) {
 			forbid !problem->is_in_archive;
@@ -217,6 +224,7 @@ sub dispatch_request{
 			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 'This problem does not belong to this contest' if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
 			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});
@@ -225,7 +233,7 @@ sub dispatch_request{
 			unlink $prog->path if $prog;
 			my $newjob = db->jobs->create({
 				maybe contest => $_{contest},
-				maybe private => problem->private,
+				maybe private => problem->private && !$_{contest},
 				date => time,
 				extension => FORMAT_EXTENSION->{$_{prog_format}},
 				format => $_{prog_format},