Try to fix access to problems

diff --git a/app.psgi b/app.psgi
index b6ba34f63580e2586cb3f6cab6431383f4e0160b..6834f2b45fe9a6e64d6a9b108a2dcf62deee3baa 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -43,11 +43,18 @@ sub is_problem_private {
        $prv
 }
 
+sub is_problem_in_contest {
+       my ($pb, $ct) = @_;
+       return 1 if $db->contest_problems->find($ct, $pb);
+       return 1 unless defined $ct || $db->contest_problems->count({problem => $pb});
+       ''
+}
+
 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->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->contest($db->job($1)->contest)->stop > time);
        ''
 }