From 095d0a7dfd46edddeddba28cf21aa1a20baadcdb Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 18 Apr 2006 18:33:53 +0000 Subject: [PATCH] lots of minor changes and bug fixes --- docs/changelog/6.x.x.txt | 6 ++++++ docs/upgrades/upgrade_6.8.8-6.99.0.pl | 9 +++++++++ lib/WebGUI/Auth.pm | 3 --- lib/WebGUI/Operation/FormHelpers.pm | 11 ++++++----- lib/WebGUI/i18n/English/WebGUI.pm | 11 ++++++----- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 3efc88c99..be6df89cb 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -98,6 +98,12 @@ - Help for forms now shows the fields that you should see with your UI level. There is a link to show all fields. - added [ 732011 ] http header cache setting + - added [ 810556 ] larger value field in userSessionScratch table + - added [ 881817 ] allowed characters in username + - added [ 1231386 ] Insert WebGUI Image + - fix [ 1178981 ] IE is in "quirks mode" - multi-column layout templates + break + - fix [ 999590 ] Rating - fix [ 1410577 ] WebGUI::Session not included - fix a bug where a link was provided to become or delete non-existant users. - fix bugs with the in-memory session caching of user and group memberships diff --git a/docs/upgrades/upgrade_6.8.8-6.99.0.pl b/docs/upgrades/upgrade_6.8.8-6.99.0.pl index 62cea98ad..98a80f950 100644 --- a/docs/upgrades/upgrade_6.8.8-6.99.0.pl +++ b/docs/upgrades/upgrade_6.8.8-6.99.0.pl @@ -49,10 +49,17 @@ updateMatrix(); updateFolder(); addRichEditUpload(); updateArticle(); +updateScratch(); installSQLForm(); finish($session); # this line required +#------------------------------------------------- +sub updateScratch { + print "\tIncreasing size of scratch variables.\n"; + $session->db->write("alter table userSessionScratch change value value text"); +} + #------------------------------------------------- sub updateArticle { print "\tAllowing articles to have direct attachments.\n"; @@ -929,6 +936,7 @@ EOT $asset->addRevision({template=>$template}); } +#------------------------------------------------- sub installSQLForm { print "\tInstalling SQLForm tables.\n" unless ($quiet); @@ -1001,6 +1009,7 @@ ENDOFQUERY5 $session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultUnsigned', 'Unsigned integer', '^\\\\d+\$')"); $session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultSigned', 'Signed integer', '^-?\\\\d+\$')"); $session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultFloat', 'Floating point number', '^-?\\\\d+(\\.\\\\d+)?\$')"); + $session->config->addToArray("assets","WebGUI::Asset::Wobject::SQLForm"); } diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 3c5c89d35..d179d0cb2 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -86,9 +86,6 @@ sub _isValidUsername { if ($username eq "") { $error .= '
  • '.$i18n->get(725).'
    • '; } - unless ($username =~ /^[A-Za-z0-9\-\_\.\,\@]+$/) { - $error .= '
  • '.$i18n->get(747).'
    • '; - } $self->error($error); return $error eq ""; } diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm index bb5a313f2..e456a4820 100644 --- a/lib/WebGUI/Operation/FormHelpers.pm +++ b/lib/WebGUI/Operation/FormHelpers.pm @@ -45,14 +45,15 @@ sub www_formAssetTree { } my $output = '

    '.join(" > ", @crumb)."

    \n"; my $children = $base->getLineage(["children"],{returnObjects=>1}); + my $i18n = WebGUI::International->new($session); foreach my $child (@{$children}) { next unless $child->canView; if ($child->get("className") =~ /^$session->form->process("classLimiter")/) { $output .= 'getId.'\';window.opener.document.getElementById(\''. - $session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">(•) '; + $session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">['.$i18n->get("select").'] '; } else { - $output .= "(•) "; + $output .= "[".$i18n->get("select")."] "; } $output .= 'form->process("classLimiter").";formId=" .$session->form->process("formId")).'">'.$child->get("menuTitle").''."
    \n"; @@ -118,7 +119,7 @@ function createLink() { my $children = $base->getLineage(["children"],{returnObjects=>1}); foreach my $child (@{$children}) { next unless $child->canView; - $output .= '(•) '.$child->get("menuTitle").''."
    \n"; + $output .= '['.$i18n->get("select").'] '.$child->get("menuTitle").''."
    \n"; } $session->style->useEmptyStyle("1"); return $output.''; @@ -167,9 +168,9 @@ sub www_richEditImageTree { foreach my $child (@{$children}) { next unless $child->canView; if ($child->get("className") =~ /^WebGUI::Asset::File::Image/) { - push(@output, '(•) '); + push(@output, '['.$i18n->get("select","WebGUI").'] '); } else { - push(@output, "(•) "); + push(@output, "[".$i18n->get("select","WebGUI")."] "); } push(@output, ''.$child->get("menuTitle").''."
    \n"); } diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 9819dcccf..3365ad02c 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -1,6 +1,12 @@ package WebGUI::i18n::English::WebGUI; our $I18N = { + 'select' => { + message => q|Select|, + lastUpdated => 0, + context=>"form helpers" + }, + 'mail return path help' => { message => q|To what email address should undeliverable messages be sent?|, lastUpdated => 0, @@ -1949,11 +1955,6 @@ default WebGUI groups such as Admin or Content Manager.

    |, lastUpdated => 1039587250 }, - '747' => { - message => q|Usernames must contain only alpha-numeric characters, dashes, underscores, periods, commas or @ signs.|, - lastUpdated => 1129431985 - }, - '159' => { message => q|Inbox|, lastUpdated => 1031514049