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 12f5e747bebc7452d25060b7a84c739204120b8b..8877ce54cd9774934e364dec26d5e41ba0e24a07 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -2,7 +2,7 @@ package Gruntmaster::Page::Pb::Entry;
 
 use Gruntmaster::Page::Base pb_entry => '<tmpl_var name>';
 
-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) = @_;
@@ -16,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);
@@ -27,6 +27,7 @@ sub _generate{
        $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);
 }
 
 sub vary { 'Authorization' }