X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=45f746696087a41c88f558137d7d3ba8a04da040;hb=refs%2Fheads%2Fmindcoding;hp=b6ba34f63580e2586cb3f6cab6431383f4e0160b;hpb=9d4e243effa3f5178fa23bf8b222f1cc666d6388;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index b6ba34f..45f7466 100644
--- a/app.psgi
+++ b/app.psgi
@@ -27,7 +27,7 @@ sub debug {
 sub some_auth_required {
 	my $r = Plack::Request->new($_[0]);
 	return 1 if $_[0]->{'gruntmaster.reqadmin'} || $r->path eq '/action/passwd' || $r->path eq '/submit';
-	return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < $db->contest($1)->stop;
+	return 1 if $r->path =~ m,^/pb/$word, && $_[0]->{'gruntmaster.contest'} && time < $db->contest($_[0]->{'gruntmaster.contest'})->stop;
 	''
 }
 
@@ -43,12 +43,27 @@ 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 '' if $cp->contest->stop >= time;
+	}
+	1
+}
+
 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)->stop > time);
+	return $db->problem($1)->owner->id if m,^/pb/$word, && is_problem_private $1;
+	return $db->problem($1)->owner->id if m,^/pb/$word, && !is_problem_in_contest $1, $env->{'gruntmaster.contest'};
+	return $db->problem($env->{'gruntmaster.problem'}) if $env->{'gruntmaster.problem'} && is_problem_private $env->{'gruntmaster.problem'};
+	return $db->problem($env->{'gruntmaster.problem'}) if $env->{'gruntmaster.problem'} && !is_problem_in_contest $env->{'gruntmaster.problem'}, $env->{'gruntmaster.contest'};
+	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && $db->job($1)->private;
+	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && is_problem_private $db->job($1)->problem->id;
+	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && $db->job($1)->contest && $db->job($1)->contest->stop > time;
 	''
 }