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

diff --git a/app.psgi b/app.psgi
index 0c18ec9..45f7466 100644
--- a/app.psgi
+++ b/app.psgi
@@ -48,17 +48,22 @@ sub is_problem_in_contest {
 	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;
+		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 || !is_problem_in_contest $1, $env->{'gruntmaster.contest'} ) || $env->{'gruntmaster.problem'} && (is_problem_private $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 || is_problem_private $db->job($1)->problem->id || $db->job($1)->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;
 	''
 }