From d4306a0b61dd5737b1d68b36ca86b337febc48a7 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Tue, 25 Mar 2014 19:42:15 +0200 Subject: [PATCH] Fix standings and contest logs --- app.psgi | 5 +++-- lib/Gruntmaster/Page/Generic.pm | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app.psgi b/app.psgi index 8d1d1ec..de07be7 100644 --- a/app.psgi +++ b/app.psgi @@ -15,7 +15,8 @@ use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Refer 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 $word = qr,(\w+),a; +my $number = qr,(\d+),a; my $db = Gruntmaster::Data->connect('dbi:Pg:'); sub debug { @@ -47,7 +48,7 @@ sub admin_required { 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); + 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->contest($db->job($1)->contest)->start > time); '' } diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm index 9e07d4c..efb2721 100644 --- a/lib/Gruntmaster/Page/Generic.pm +++ b/lib/Gruntmaster/Page/Generic.pm @@ -38,6 +38,7 @@ sub list { $rs = $rs->search(undef, {order_by => 'me.id'}) unless $rs->is_ordered; if (my $page = $env->{'gruntmaster.page'}) { my $pages = int ($rs->count / PAGE_SIZE); + $pages = 1 if $pages < 1; $page = $pages if $page == -1; @params{'page', 'pages'} = ($page, $pages); $rs = $rs->search(undef, {offset => ($page - 1) * PAGE_SIZE, ($page == $pages ? () : (rows => PAGE_SIZE))}); -- 2.39.2