diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 0d583cf76..5bf71bad1 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -65,7 +65,8 @@ details. - Changed warning generated when a languagepack misses the makeUrlCompliant procedure to a fatal error, since this will lead to a false url in the asset - table. + table. (mkamerbeek/Procolix) + - fix [ 1249114 ] unclosed
  • elements in auth modules (mkamerbeek/Procolix) 6.6.5 - fix [ 1243131 ] In 6.6.4 you cannot upload anything (ebruni/mwilson) diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 171d6b910..48592bc96 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -64,7 +64,7 @@ sub _isDuplicateUsername { return 0 if($self->userId ne "1" && $session{user}{username} eq $username); my ($otherUser) = WebGUI::SQL->quickArray("select count(*) from users where username=".quote($username)); return 0 if !$otherUser; - $self->error('
  • '.WebGUI::International::get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"'); + $self->error('
  • '.WebGUI::International::get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"'.'
    • '); return 1; } @@ -84,13 +84,13 @@ sub _isValidUsername { return 1 if($self->userId ne "1" && $session{user}{username} eq $username); if ($username =~ /^\s/ || $username =~ /\s$/) { - $error .= '
  • '.WebGUI::International::get(724); + $error .= '
  • '.WebGUI::International::get(724).'
    • '; } if ($username eq "") { - $error .= '
  • '.WebGUI::International::get(725); + $error .= '
  • '.WebGUI::International::get(725).'
    • '; } unless ($username =~ /^[A-Za-z0-9\-\_\.\,\@]+$/) { - $error .= '
  • '.WebGUI::International::get(747); + $error .= '
  • '.WebGUI::International::get(747).'
    • '; } $self->error($error); return $error eq ""; diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index 72506a3e3..14ad3cd72 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -59,15 +59,15 @@ sub _isValidLDAPUser { $ldap = Net::LDAP->new($uri->host, (port=>$uri->port)) or $error .= WebGUI::International::get(2,'AuthLDAP'); $auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{'authLDAP_identifier'}); if ($auth->code == 48 || $auth->code == 49) { - $error .= '
  • '.WebGUI::International::get(68); + $error .= '
  • '.WebGUI::International::get(68).'
    • '; WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{'authLDAP_ldapId'}); } elsif ($auth->code > 0) { - $error .= '
  • LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. '.WebGUI::International::get(69); + $error .= '
  • LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. '.WebGUI::International::get(69).'
    • '; WebGUI::ErrorHandler::error("LDAP error: ".$ldapStatusCode{$auth->code}); } $ldap->unbind; } else { - $error .= '
  • '.WebGUI::International::get(68); + $error .= '
  • '.WebGUI::International::get(68).'
    • '; WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{'authLDAP_ldapId'}); } } else { @@ -275,7 +275,7 @@ sub createAccountSave { #If Email address is not unique, a warning is displayed if($warning ne "" && !$session{form}{confirm}){ $session{form}{confirm} = 1; - return $self->createAccount('
  • '.WebGUI::International::get(1078)); + return $self->createAccount('
  • '.WebGUI::International::get(1078).'
    • '); } my $properties; diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index f41c8f0f6..a356b9df5 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -44,14 +44,14 @@ sub _isValidPassword { my $error = ""; if ($password ne $confirm) { - $error .= '
  • '.WebGUI::International::get(3,'AuthWebGUI'); + $error .= '
  • '.WebGUI::International::get(3,'AuthWebGUI').'
    • '; } if ($password eq "") { - $error .= '
  • '.WebGUI::International::get(4,'AuthWebGUI'); + $error .= '
  • '.WebGUI::International::get(4,'AuthWebGUI').'
    • '; } if ($self->getSetting("passwordLength") && length($password) < $self->getSetting("passwordLength")){ - $error .= '
  • '.WebGUI::International::get(7,'AuthWebGUI')." ".$self->getSetting("passwordLength"); + $error .= '
  • '.WebGUI::International::get(7,'AuthWebGUI')." ".$self->getSetting("passwordLength").'
    • '; } $self->error($error); @@ -209,7 +209,7 @@ sub createAccountSave { #If Email address is not unique, a warning is displayed if($warning ne "" && !$session{form}{confirm}){ $session{form}{confirm} = 1; - return $self->createAccount('
  • '.WebGUI::International::get(1078)); + return $self->createAccount('
  • '.WebGUI::International::get(1078).'
    • '); } my $properties; @@ -546,8 +546,8 @@ sub recoverPasswordFinish { } $sth->finish(); - return $self->displayLogin('') if($flag); - return $self->recoverPassword(''); + return $self->displayLogin('') if($flag); + return $self->recoverPassword(''); } #------------------------------------------------------------------- @@ -583,8 +583,8 @@ sub resetExpiredPasswordSave { $session{form}{username} = $u->username; $error .= $self->error if(!$self->authenticate($session{form}{oldPassword})); - $error .= '
  • '.WebGUI::International::get(5,'AuthWebGUI') if($session{form}{identifier} eq "password"); - $error .= '
  • '.WebGUI::International::get(12,'AuthWebGUI') if ($session{form}{oldPassword} eq $session{form}{identifier}); + $error .= '
  • '.WebGUI::International::get(5,'AuthWebGUI').'
    • ' if($session{form}{identifier} eq "password"); + $error .= '
  • '.WebGUI::International::get(12,'AuthWebGUI').'
    • ' if ($session{form}{oldPassword} eq $session{form}{identifier}); $error .= $self->error if(!$self->_isValidPassword($session{form}{identifier},$session{form}{identifierConfirm})); return $self->resetExpiredPassword("

    ".WebGUI::International::get(70)."

    ".$error) if($error ne ""); @@ -597,7 +597,7 @@ sub resetExpiredPasswordSave { $msg = $self->login; if($msg eq ""){ - $msg = "
  • ".WebGUI::International::get(17,'AuthWebGUI'); + $msg = "
  • ".WebGUI::International::get(17,'AuthWebGUI').'
    • '; } return $self->displayLogin($msg); } @@ -628,7 +628,7 @@ sub updateAccount { my $username = $session{form}{'authWebGUI.username'}; my $password = $session{form}{'authWebGUI.identifier'}; my $passConfirm = $session{form}{'authWebGUI.identifierConfirm'}; - my $display = '
  • '.WebGUI::International::get(81).'

    '; + my $display = '

  • '.WebGUI::International::get(81).'
    • '; my $error = ""; if($self->userId eq '1'){ diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm index 745f9c4d2..eeabb44c2 100644 --- a/lib/WebGUI/Operation/Profile.pm +++ b/lib/WebGUI/Operation/Profile.pm @@ -116,9 +116,9 @@ sub validateProfileData { while (%field = $a->hash) { $data{$field{fieldName}} = WebGUI::Macro::negate(WebGUI::FormProcessor::process($field{fieldName},$field{dataType}, $field{dataDefault})); if ($field{required} && $data{$field{fieldName}} eq "") { - $error .= '
  • '.(eval $field{fieldLabel}).' '.WebGUI::International::get(451); + $error .= '
  • '.(eval $field{fieldLabel}).' '.WebGUI::International::get(451).'
    • '; }elsif($field{fieldName} eq "email" && isDuplicateEmail($data{$field{fieldName}})){ - $warning .= '
  • '.WebGUI::International::get(1072); + $warning .= '
  • '.WebGUI::International::get(1072).'
    • '; } } $a->finish; diff --git a/lib/WebGUI/Operation/Shared.pm b/lib/WebGUI/Operation/Shared.pm index f7f45e5b7..a37418484 100644 --- a/lib/WebGUI/Operation/Shared.pm +++ b/lib/WebGUI/Operation/Shared.pm @@ -78,9 +78,9 @@ sub menuWrapper { $output .= $_[0]; $output .= ''; foreach $key (keys %{$_[1]}) { - $output .= '
  • '.$_[1]->{$key}.''; + $output .= '
  • '.$_[1]->{$key}.'
    • '; } - $output .= '
  • '.WebGUI::International::get(493).''; + $output .= '
  • '.WebGUI::International::get(493).'
    • '; $output .= ''; return $output; } diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 215f1b533..011197812 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -380,7 +380,7 @@ sub www_editUserSave { @groups = $session{cgi}->param("groupsToDelete"); $u->deleteFromGroups(\@groups); } else { - $error = ''; + $error = ''; } if ($isSecondary) { return _submenu(WebGUI::International::get(978)); diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 7ffc87fb7..b50638325 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -501,6 +501,7 @@ each asset under the tab "Meta" in the asset properties.

    Metadata in combination with passive profiling produces AOI (Areas of Interest) information. You can retrieve the value of a metadata property with the ^AOIRank(); and &#AOIHits(); macros.

    +

  • Show content based upon criteria
    The Wobject Proxy allows you to select content based upon criteria like:

    contenttype = sport AND source != newspaper
    diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm index 979c217e7..45217a6c4 100644 --- a/lib/WebGUI/i18n/English/Asset_Survey.pm +++ b/lib/WebGUI/i18n/English/Asset_Survey.pm @@ -1163,10 +1163,10 @@ is set to "response". 'what next question description' => { message => q|After defining the question, you may supply an answer:

    |,