X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=d16fb4c591f636aab7607e34d907a6bc2909b32d;hb=23bde5b8d2d759b66627b42c0a6726fbae76abef;hp=de07be799a9cac8c3e6cc5014ef95ef2b5ce49cc;hpb=d4306a0b61dd5737b1d68b36ca86b337febc48a7;p=plack-app-gruntmaster.git

diff --git a/app.psgi b/app.psgi
index de07be7..d16fb4c 100644
--- a/app.psgi
+++ b/app.psgi
@@ -43,12 +43,22 @@ sub is_problem_private {
 	$prv
 }
 
+sub is_problem_in_contest {
+	my ($pb, $ct) = @_;
+	return 1 if $db->contest_problems->find($ct, $pb);
+	return '' if defined $ct;
+	for my $cp ($db->problem($pb)->contest_problems) {
+		return 1 if $cp->contest->stop >= time;
+	}
+	''
+}
+
 sub admin_required {
 	local $_ = $_[0];
 	my $env = $_[1];
 	return $db->contest($env->{'gruntmaster.contest'})->owner->id if $env->{'gruntmaster.contest'} && $db->contest($env->{'gruntmaster.contest'})->start > time;
-	return $db->problem($1)->owner->id if m,^/pb/$word, && is_problem_private $1 || $env->{'gruntmaster.problem'} && is_problem_private $env->{'gruntmaster.problem'};
-	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && ($db->job($1)->private || is_problem_private $db->job($1)->problem->id || $db->job($1)->contest && $db->contest($db->job($1)->contest)->start > time);
+	return $db->problem($1)->owner->id if m,^/pb/$word, && is_problem_private $1 || $env->{'gruntmaster.problem'} && is_problem_private $env->{'gruntmaster.problem'} || !is_problem_in_contest $1, $env->{'gruntmaster.contest'};
+	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && ($db->job($1)->private || is_problem_private $db->job($1)->problem->id || $db->job($1)->contest && $db->job($1)->contest->stop > time);
 	''
 }