X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=0c18ec95ba64bd3e19538e00fd0672c45a4a56c1;hb=9b96dbf124020f076010a2e60b0f78c6b9771d3a;hp=d16fb4c591f636aab7607e34d907a6bc2909b32d;hpb=d6e502386c8b708ca786fc6b6a2c3a083f3998ca;p=plack-app-gruntmaster.git

diff --git a/app.psgi b/app.psgi
index d16fb4c..0c18ec9 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;
 	''
 }
 
@@ -57,7 +57,7 @@ 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'} || !is_problem_in_contest $1, $env->{'gruntmaster.contest'};
+	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);
 	''
 }