From: Marius Gavrilescu <marius@ieval.ro>
Date: Thu, 10 Apr 2014 15:06:21 +0000 (+0300)
Subject: Make admin_required longer but simpler
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=d16e978882dcdf64314e4fcde02c892c7d974eb5;p=plack-app-gruntmaster.git

Make admin_required longer but simpler
---

diff --git a/app.psgi b/app.psgi
index 4fe0719..590fbd5 100644
--- a/app.psgi
+++ b/app.psgi
@@ -57,8 +57,13 @@ 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;
 	''
 }