Merge branch 'master' into mindcoding

Conflicts:
	lib/Gruntmaster/Page/Generic.pm
	lib/Gruntmaster/Page/Pb/Entry.pm
	tmpl/ct_entry.en

diff --combined app.psgi
index a9eb098d7672832589be3158ea37414aa510d1a1,856d82c20baec055ec268114cab49614efaac15e..72558f139fff16a6e2514074d1cbf22d8ebf1ae1
--- 1/app.psgi
--- 2/app.psgi
+++ b/app.psgi
@@@ -1,5 -1,6 +1,6 @@@
  #!/usr/bin/perl -w
  use v5.14;
+ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
  
  use Apache2::Authen::Passphrase qw/pwcheck/;
  use Apache2::AuthzCaps qw/hascaps/;
@@@ -11,10 -12,11 +12,11 @@@ use Digest::SHA qw/sha256/
  use Log::Log4perl;
  
  use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
 -use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' www.google-analytics.com; style-src 'self'; img-src 'self'; connect-src 'self',;
 +use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' www.google-analytics.com; style-src 'self'; img-src 'self' www.google-analytics.com; connect-src 'self',;
  
  $Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
  my $word = qr,(\w+),a;
+ my $db = Gruntmaster::Data->connect('dbi:Pg:');
  
  sub debug {
        local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
@@@ -23,21 -25,30 +25,30 @@@
  
  sub some_auth_required {
        my $r = Plack::Request->new($_[0]);
-       return 1 if $_[0]->{'gruntmaster.reqadmin'} || $r->path eq '/action/passwd' || $r->path =~ m,/pb/$word/submit$,;
-       return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < contest_end $1;
-       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;
+       ''
+ }
+ 
+ sub is_problem_private {
+       my $pb = $_[0];
+       return 1 if $db->problem($pb)->private;
+       my $prv = 0;
+       for my $cp ($db->problem($pb)->contest_problems) {
+               $prv = 1;
+               return '' if $cp->contest->start <= time;
+       }
+ 
+       $prv
  }
  
  sub admin_required {
        local $_ = $_[0];
-       return problem_owner $1 if m,^/pb/$word, && problem_private $1;
-       return job_user $1  if m,^/log/(?:job|src)/$word, && job_private $1;
-       return contest_owner $1 if m,^/ct/$word/(?:pb|log), && time < contest_start $1;
-       if (m,^/ct/$word/log/(?:job|src)/$word, && time < contest_end $1){
-               local $Gruntmaster::Data::contest = $1;
-               return job_user $2;
-       }
-       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/)?$word, && ($db->job($1)->private || is_problem_private $db->job($1)->problem->id || $db->job($1)->contest && $db->contest($db->job($1)->contest)->start > time);
+       ''
  }
  
  sub require_admin {
@@@ -46,11 -57,28 +57,28 @@@
                local *__ANON__ = "require_admin_middleware";
                my $env = $_[0];
                my $r = Plack::Request->new($env);
-               $env->{'gruntmaster.reqadmin'} = admin_required $r->path;
+               $env->{'gruntmaster.reqadmin'} = admin_required $r->path, $env;
                $app->($env)
        }
  }
  
+ sub mangle_request {
+       my $app = $_[0];
+       sub {
+               local *__ANON__ = 'mangle_request_middleware';
+               my $env = $_[0];
+               my ($number, $word) = (qr,(\d+),a, qr,(\w+),a);
+               for ($env->{PATH_INFO}) {
+                       $env->{'gruntmaster.page'}    = $1 if s,/page/$number$,/,;
+                       $env->{'gruntmaster.problem'} = $1 if s,^/pb/$word/,/,;
+                       $env->{'gruntmaster.contest'} = $1 if s,^/ct/$word/,/,;
+                       $env->{'gruntmaster.user'}    = $1 if s,^/us/$word/,/,;
+                       $env->{'gruntmaster.page'}  //= -1 if m,^/log/$,;
+               }
+               $app->($env);
+       }
+ }
+ 
  my %authen_cache;
  
  sub authenticate {
@@@ -75,6 -103,7 +103,7 @@@
  
  Log::Log4perl->init('log.conf');
  my $access_logger = Log::Log4perl->get_logger('access');
+ $ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
  
  builder {
        enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
@@@ -84,7 -113,9 +113,9 @@@
        enable_if { $_[0]->{PATH_INFO} =~ qr,^/static/,} Header => set => ['Cache-Control', 'public, max-age=604800'];
        enable 'Static', path => qr,^/static/,;
        enable 'Log4perl', category => 'plack';
+       enable \&mangle_request;
        enable \&require_admin;
        enable_if \&some_auth_required, 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
+       enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
        Plack::App::Gruntmaster->to_app
  }

diff --combined tmpl/pb_entry.en
index bd2ce28bbd59e7b2ba5f13766dee70d603ee33b3,f3d0f7579603123cf8e29590f69644e382f33d94..e7996a0b7d5770bca1a096c9b8183a61d9fe6ef3
--- 1/tmpl/pb_entry.en
--- 2/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@@ -4,15 -4,13 +4,17 @@@
  </div>
  
  <div class="col-md-3">
 +<div id="sidebar"></div>
 +
 +<h3>Problem information</h3>
  <dl>
 +<dt>Time limit:</dt> <dd><tmpl_var timelimit>&nbsp;s</dd>
  <dt>Author</dt> <dd><tmpl_var author></dd>
  <dt>Owner</dt> <dd><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a></dd>
  </dl>
  
+ <a href="/pb/<tmpl_var id>/log/">Job log</a>
+ 
  <tmpl_if cansubmit>
  <h1>Submit solution</h1>
  <form action="<tmpl_var id>/submit" method="POST" enctype="multipart/form-data" role="form">
@@@ -22,8 -20,13 +24,13 @@@
  <div class="form-group"><label for="prog">File:</label><input id="prog" name="prog" type="file"></div>
  <div class="form-group"><label for="source_code">Source code:</label> <textarea class="form-control" id="source_code" name="source_code"></textarea></div>
  <div class="form-group"><label for="prog_format">File format:</label><select id="prog_format" name="prog_format" class="form-control" required>
- <tmpl_loop formats><option value="<tmpl_var _>"><tmpl_var _></option>
- </tmpl_loop></select></div>
+ <option value="C">C</option>
+ <option value="CPP">C++</option>
+ <option value="JAVA">Java</option>
+ <option value="PASCAL">Pascal</option>
+ <option value="PERL">Perl</option>
+ <option value="PYTHON">Python</option>
+ </select></div>
  
  <input type="submit" value="Submit job" class="btn btn-primary">
  </form>