X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=59e5720c96bd28ce571c8021be6dd972156903a2;hb=ca0c7ea2c90553352245a398f62fcb25c3294c3f;hp=991159bf02bef79973aeeac2f6659c78002ab0c8;hpb=33ea2780d1269378ffd05309d27ada912eff8408;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 991159b..59e5720 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -79,6 +79,7 @@ sub response {
 		$title = 'No title';
 	}
 	$params->{time} = time;
+	$params->{args} = {%_};
 	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 1)}, __PACKAGE__.'::Response'
 }
 
@@ -144,7 +145,10 @@ sub dispatch_request{
 		sub (/st/:contest) {
 			response st => 'Standings', {
 				st => [ contest->standings ],
-				problems => [map { $_->problem } contest->contest_problems],
+				problems => [
+					map { [$_->id, $_->name] }
+					sort { $a->value <=> $b->value }
+					map { $_->problem } contest->contest_problems],
 			}, 10
 		},
 
@@ -161,7 +165,7 @@ sub dispatch_request{
 		sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_) },
 		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~) {
 			forbid $_{private};
-			response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest}}
+			response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest},}
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
@@ -195,13 +199,13 @@ sub dispatch_request{
 	},
 
 	sub (POST) {
-		sub (/action/register + %:username=&:password=&:confirm_password=&:name=&:email=&:phone=&:town=&:university=&:level=) {
+		sub (/action/register + %:username=&:password=&:confirm_password=&:name=&:email=&:phone=&:town=&:university=&:country=&:level=) {
 			return reply 'Parameter too long' if grep { length > 200 } values %_;
 			return reply 'Bad username. Allowed characters are letters, digits and underscores, and the username must be between 2 and 20 characters long.' unless $_{username} =~ USER_REGEX;
 			return reply 'Username already in use' if db->user($_{username});
 			return reply 'The two passwords do not match' unless $_{password} eq $_{confirm_password};
 
-			db->users->create({id => $_{username}, name => $_{name}, email => $_{email}, phone => $_{phone}, town => $_{town}, university => $_{university}, level => $_{level}});
+			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/';