Merge branch 'master' into mindcoding

[gruntmaster-page.git] / lib / Gruntmaster / Page / Pb / Entry.pm

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index fb78ba5c355116608a11e3079d723aa9ca537834..8877ce54cd9774934e364dec26d5e41ba0e24a07 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -1,11 +1,6 @@
 package Gruntmaster::Page::Pb::Entry;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base pb_entry => '<tmpl_var name>';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant FORMATS => [qw/C CPP JAVA PASCAL PERL PYTHON/];
 
@@ -13,12 +8,12 @@ sub _generate{
        my ($self, $htc, $lang, $env, $contest, $id) = @_;
        debug $env => "language is '$lang', contest is '$contest', id is '$id'";
        my $user = $env->{REMOTE_USER};
-       if ($contest && $user) {
+       if ($contest && $user && time >= contest_start $contest) {
                local $Gruntmaster::Data::contest = $contest;
                mark_open $id, $user;
                debug $env => "Marking problem $id of contest $contest open by $user";
        }
-t 
+
        $htc->param(cansubmit => 1);
        if ($contest) {
                $htc->param(cansubmit => (time <= contest_end $contest));
@@ -30,6 +25,7 @@ t
        $htc->param(name => problem_name $id);
        $htc->param(author => problem_author $id);
        $htc->param(owner => problem_owner $id);
+       $htc->param(owner_name => do{ local $Gruntmaster::Data::contest; user_name $htc->param('owner')} );
        $htc->param(statement => problem_statement $id);
        $htc->param(timelimit => problem_timeout $id);
 }