X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=2c3b2a2c6c619b2f916976ad8b4cebbcbfa8d65e;hb=90f613d3964e01ed8cc18ca07a89ffff87f72f4c;hp=edf19110c3e89f1fca0d39f9db533a83b50bbee2;hpb=3ef3217494bfccc63dbb6b0a163b1e4d1f4ec400;p=plack-app-gruntmaster.git diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm index edf1911..2c3b2a2 100644 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@ -75,7 +75,7 @@ sub job { db->job ($_{job}) } sub user { db->user ($_{user}) } sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] } -sub reply { [200, ['Content-Type' => 'text/plain'], \@_] } +sub reply { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] } sub response { my ($template, $title, $params, $maxage) = @_; unless ($params) { @@ -104,14 +104,14 @@ sub dispatch_request{ return NOT_FOUND unless -e "css/themes/$theme.css"; my $css = read_file "css/themes/$theme.css"; $css .= read_file $_ for ; - my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css'); + my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css; charset=utf-8'); [200, \@headers, [development ? $css : CSS::Minifier::XS::minify $css]] }, sub (/js.js) { my $js; $js .= read_file $_ for ; - my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript'); + my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript; charset=utf-8'); [200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]] }, @@ -124,7 +124,7 @@ sub dispatch_request{ my $private = job->private || job->problem->private || job->contest && job->contest->is_running; forbid !$isowner && $private; my $privacy = $private ? 'private' : 'public'; - my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->format}); + my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->extension}); push @headers, (Vary => 'Authorization') if $private; [200, \@headers, [job->source]] }, @@ -148,9 +148,9 @@ sub dispatch_request{ return $r if ref $r ne 'Plack::App::Gruntmaster::Response'; my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}"); push @hdrs, Vary => 'Authorization' if $privacy eq 'private'; - return [200, ['Content-Type' => 'application/json', @hdrs], [encode_json $r->{params}]] if $format eq 'json'; + return [200, ['Content-Type' => 'application/json; charset=utf-8', @hdrs], [encode_json $r->{params}]] if $format eq 'json'; my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}}; - [200, ['Content-Type' => 'text/html', @hdrs], [encode 'UTF-8', $ret]] + [200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]] }, }, @@ -165,7 +165,7 @@ sub dispatch_request{ }, sub (/ed/:contest) { - forbid contest->is_running; + forbid !contest->is_finished; response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1); }, @@ -213,7 +213,7 @@ sub dispatch_request{ sub (/) { redispatch_to '/index' }, sub (/favicon.ico) { redirect '/static/favicon.ico' }, - sub (/:article) { [200, ['Content-Type' => 'text/html', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] } + sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] } }, sub (POST) { @@ -226,7 +226,6 @@ sub dispatch_request{ db->users->create({id => $_{username}, name => $_{name}, email => $_{email}, phone => $_{phone}, town => $_{town}, university => $_{university}, country => $_{country}, level => $_{level}}); db->user($_{username})->set_passphrase($_{password}); - purge '/us/'; reply 'Registered successfully'; }, @@ -263,7 +262,6 @@ sub dispatch_request{ owner => remote_user->id, }); - purge '/log/'; [303, [Location => '/log/' . $newjob->id], []] },