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 4cf007edcd1760d3eaf7dea49298ad942d52265f..9f3fc6b54ee051342288849732a59ef7da19d1e1 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -1,13 +1,8 @@
 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 PERL PYTHON/];
+use constant FORMATS => [qw/C CPP JAVA PASCAL PERL PYTHON/];
 
 sub _generate{
        my ($self, $htc, $lang, $env, $contest, $id) = @_;
@@ -21,7 +16,7 @@ sub _generate{
 
        $htc->param(cansubmit => 1);
        if ($contest) {
-               $htc->param(cansubmit => time <= contest_end $contest);
+               $htc->param(cansubmit => (time <= contest_end $contest));
                $htc->param(contest => $contest);
        }
        $htc->param(formats => FORMATS);
@@ -31,6 +26,7 @@ sub _generate{
        $htc->param(author => problem_author $id);
        $htc->param(owner => problem_owner $id);
        $htc->param(statement => problem_statement $id);
+       $htc->param(timelimit => problem_timeout $id);
 }
 
 sub vary { 'Authorization' }