diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 54dbd7c36..3532105fd 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -14,6 +14,7 @@ - fixed: adding payment brings me to / - fixed: Gallery uses too much disk space. Added a way to change an images pixel density. - fixed: splitCSV and joinCSV had issues with complex CSV data + - fixed: Anonymous registration form produces invalid html 7.5.18 - fixed: Collateral Image Manager broken in Firefox 3 diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 927ced021..20ea3205e 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -63,7 +63,7 @@ sub _isDuplicateUsername { my ($otherUser) = $self->session->db->quickArray("select count(*) from users where username=".$self->session->db->quote($username)); return 0 if !$otherUser; my $i18n = WebGUI::International->new($self->session); - $self->error(sprintf($i18n->get(77), $username,$username,$username,$self->session->datetime->epochToHuman($self->session->datetime->time(),"%y"))); + $self->error('
  • '.sprintf($i18n->get(77), $username,$username,$username,$self->session->datetime->epochToHuman($self->session->datetime->time(),"%y")).'
  • '); return 1; } diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index bdfa09fb5..e8b7fe374 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -48,7 +48,7 @@ sub _isValidLDAPUser { $username = $self->session->form->get("authLDAP_ldapId") || $self->session->form->get("username"); $password = $self->session->form->get("authLDAP_identifier") || $self->session->form->get("identifier"); - $uri = URI->new($connection->{ldapUrl}) or $error = $i18n->get(2,'AuthLDAP'); + $uri = URI->new($connection->{ldapUrl}) or $error = '
  • '.$i18n->get(2,'AuthLDAP').'
  • '; if($error ne ""){ $self->error($error); @@ -110,12 +110,12 @@ sub _isValidLDAPUser { } } else { # Unable to bind with proxy user credentials or anonymously for our search - $error = $i18n->get(2,'AuthLDAP'); + $error = '
  • '.$i18n->get(2,'AuthLDAP').'
  • '; $self->session->errorHandler->error("Couldn't bind to LDAP server: ".$connection->{ldapUrl}); } } else { # Could not create our LDAP object - $error = $i18n->get(2,'AuthLDAP'); + $error = '
  • '.$i18n->get(2,'AuthLDAP').'
  • '; $self->session->errorHandler->error("Couldn't create LDAP object: ".$uri->host); } @@ -150,8 +150,8 @@ sub authenticate { my $identifier = $_[1]; my $userData = $self->getParams; - $error .= $i18n->get(12,'AuthLDAP') if ($userData->{ldapUrl} eq ""); - $error .= $i18n->get(11,'AuthLDAP') if ($userData->{connectDN} eq ""); + $error .= '
  • '.$i18n->get(12,'AuthLDAP').'
  • ' if ($userData->{ldapUrl} eq ""); + $error .= '
  • '.$i18n->get(11,'AuthLDAP').'
  • ' if ($userData->{connectDN} eq ""); $self->error($error); if($error ne ""){ @@ -162,7 +162,7 @@ sub authenticate { if($uri = URI->new($userData->{ldapUrl})) { # Create an LDAP object - $ldap = Net::LDAP->new($uri->host, (port=>$uri->port)) or $error .= $i18n->get(2,'AuthLDAP'); + $ldap = Net::LDAP->new($uri->host, (port=>$uri->port)) or $error .= '
  • '.$i18n->get(2,'AuthLDAP').'
  • '; if($error ne ""){ $self->user(WebGUI::User->new($self->session,1)); @@ -174,17 +174,17 @@ sub authenticate { # Authentication failed if ($auth->code == 48 || $auth->code == 49){ - $error .= $i18n->get(68); + $error .= '
  • '.$i18n->get(68).'
  • '; } elsif ($auth->code > 0) { # Some other LDAP error happened - $error .= 'LDAP error "'.$self->ldapStatusCode($auth->code).'" occured.'.$i18n->get(69); + $error .= '
  • LDAP error "'.$self->ldapStatusCode($auth->code).'" occured.'.$i18n->get(69).'
  • '; $self->session->errorHandler->error("LDAP error: ".$self->ldapStatusCode($auth->code)); } $ldap->unbind; } else { - $error .= $i18n->get(13,'AuthLDAP'); + $error .= '
  • '.$i18n->get(13,'AuthLDAP').'
  • '; $self->session->errorHandler->error("Could not process this LDAP URL: ".$userData->{ldapUrl}); } @@ -291,7 +291,7 @@ sub createAccountSave { #Validate profile data. my ($profile, $temp, $warning) = WebGUI::Operation::Profile::validateProfileData($self->session); $error .= $temp; - return $self->createAccount("

    ".$i18n->get(70)."

    ".$error) unless ($error eq ""); + return $self->createAccount("
  • ".$error."") unless ($error eq ""); #If Email address is not unique, a warning is displayed if($warning ne "" && !$self->session->form->process("confirm")){ return $self->createAccount('
  • '.$i18n->get(1078).'
  • ', 1); diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index b6d3f8734..c325baada 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -124,7 +124,7 @@ sub authenticate { } $self->user(WebGUI::User->new($self->session,1)); my $i18n = WebGUI::International->new($self->session); - $self->error($i18n->get(68)); + $self->error('
  • '.$i18n->get(68).'
  • '); return 0; } @@ -143,7 +143,7 @@ sub createAccount { return $self->displayLogin; } my $i18n = WebGUI::International->new($self->session); - $vars->{'create.message'} = $message if ($message); + $vars->{'create.message'} = '' if ($message); $vars->{useCaptcha} = $self->session->setting->get("webguiUseCaptcha"); if ($vars->{useCaptcha}) { use WebGUI::Form::Captcha; @@ -204,7 +204,7 @@ sub createAccountSave { $error = $self->error unless($self->validUsername($username)); if ($setting->get("webguiUseCaptcha")) { unless ($form->process('authWebGUI.captcha', "Captcha")) { - $error .= $i18n->get("captcha failure","AuthWebGUI"); + $error .= '
  • '.$i18n->get("captcha failure","AuthWebGUI").'
  • '; } } $error .= $self->error unless($self->_isValidPassword($password,$passConfirm)); @@ -317,11 +317,11 @@ sub displayLogin { my $self = shift; my $vars; return $self->displayAccount($_[0]) if ($self->userId ne "1"); - my $i18n = WebGUI::International->new($self->session); - $vars->{'login.message'} = $_[0] if ($_[0]); + my $i18n = WebGUI::International->new($self->session); + $vars->{'login.message'} = '' if ($_[0]); $vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery"); - $vars->{'recoverPassword.url'} = $self->session->url->page('op=auth;method=recoverPassword'); - $vars->{'recoverPassword.label'} = $i18n->get(59); + $vars->{'recoverPassword.url'} = $self->session->url->page('op=auth;method=recoverPassword'); + $vars->{'recoverPassword.label'} = $i18n->get(59); return $self->SUPER::displayLogin("login",$vars); } @@ -1127,7 +1127,7 @@ sub resetExpiredPasswordSave { $error .= '
  • '.$i18n->get(12,'AuthWebGUI').'
  • ' if ($self->session->form->process("oldPassword") eq $self->session->form->process("identifier")); $error .= $self->error if(!$self->_isValidPassword($self->session->form->process("identifier"),$self->session->form->process("identifierConfirm"))); - return $self->resetExpiredPassword($u->userId, "

    ".$i18n->get(70)."

    ".$error) if($error ne ""); + return $self->resetExpiredPassword($u->userId, "

    ".$i18n->get(70)."

    ') if ($error); $properties->{identifier} = Digest::MD5::md5_base64($self->session->form->process("identifier")); $properties->{passwordLastUpdated} =$self->session->datetime->time(); @@ -1165,7 +1165,7 @@ sub updateAccount { my $username = $self->session->form->process('authWebGUI.username'); my $password = $self->session->form->process('authWebGUI.identifier'); my $passConfirm = $self->session->form->process('authWebGUI.identifierConfirm'); - my $display = '
  • '.$i18n->get(81).'
  • '; + my $display = ''; my $error = ""; if($self->userId eq '1'){ diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index bcf469adc..ac9435269 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -605,12 +605,11 @@ our $I18N = { }, '77' => { - message => q|
  • That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:
    + message => q|That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:
    %sToo
    %s2
    -%s_%d
    -
  • |, - lastUpdated => 1140292461 +%s_%d
    |, + lastUpdated => 1217216725 }, '444' => {