Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Merging changes from master back to develop. #272

Merged
merged 3 commits into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 28, 2013
  1. @paczian
  2. @paczian

    fixed login name quoting issue

    paczian authored
  3. @jaredbischof

    Merge pull request #271 from paczian/master

    jaredbischof authored
    registration quoting patch
This page is out of date. Refresh to see the latest.
View
4 src/WebApplication/WebComponent/Register.pm
@@ -212,7 +212,7 @@ sub perform_registration {
}
# check if email address is valid
- unless ($cgi->param('email') =~ /[\d\w\.-]+\@[\d\w\.-]+\.[\w+]/) {
+ unless ($cgi->param('email') =~ /^[\d\w\.-\']+\@[\d\w\.-]+\.[\w+]$/) {
$application->add_message('warning', 'You must enter a valid eMail address.');
return 0;
}
@@ -224,7 +224,7 @@ sub perform_registration {
}
# check if the login is valid
- unless ($cgi->param('login') =~ /[\d\w]+/) {
+ unless ($cgi->param('login') =~ /^[\d\w]+$/) {
$application->add_message('warning', 'Login may only consist of alphanumeric characters.');
return 0;
}
View
2  src/WebApplication/WebPage/AccountManagement.pm
@@ -170,7 +170,7 @@ sub output {
my $i=0;
foreach my $request (@$user_requests) {
my $request_text = $request->{user}->firstname() . " " . $request->{user}->lastname() . " is requesting access to the " . $request->{type} . " " . $request->{group}->name();
- $html .= "<tr><td>$request_text<input type='hidden' name='group_$i' value='" . $request->{group}->name() . "'><input type='hidden' name='type_$i' value='" . $request->{type} . "'><input type='hidden' name='login_$i' value='".$request->{user}->login()."'></td><td><input type='Radio' name='handling_$i' value='accept'></td><td><input type='radio' name='handling_$i' value='reject'></td><td><input type='radio' name='handling_$i' value='defer' checked='checked'></td><td><input type='text' name='reason_$i' value='-'></td></tr>";
+ $html .= "<tr><td>$request_text<input type='hidden' name='group_$i' value='" . $request->{group}->name() . "'><input type='hidden' name='type_$i' value='" . $request->{type} . "'><input type='hidden' name='login_$i' value=\"".$request->{user}->login()."\"></td><td><input type='Radio' name='handling_$i' value='accept'></td><td><input type='radio' name='handling_$i' value='reject'></td><td><input type='radio' name='handling_$i' value='defer' checked='checked'></td><td><input type='text' name='reason_$i' value='-'></td></tr>";
$i++;
}
$html .= "</table><input type='submit' value='submit'>";
Something went wrong with that request. Please try again.