diff --git a/docs/changelog/5.x.x.txt b/docs/changelog/5.x.x.txt index ce6c4b4f1..3495af89c 100644 --- a/docs/changelog/5.x.x.txt +++ b/docs/changelog/5.x.x.txt @@ -25,6 +25,16 @@ - Updated the Dutch translation. (Thanks to ProcoliX.) - Updated the Spanish translation. (Thanks to GIT Consultors.) - Updated the German translation. (Thanks to Andreas Graf.) + - Fixed a bug in SQL macro where it required a leading space in queries. + - Fixed a case-sensitivity bug in email verfication. (Thanks to Steve Simms.) + - Fixed a bug where the user was returned to the wrong page after deleting an + item from the clipboard. (Thanks to Steve Simms.) + - Fixed a bug in WebGUI account creation where welcome emails were sent + regardless of the sendWelcomeMessage setting. (Thanks to Steve Simms.) + - Fixed a bug where templates would not render properly in the mini view on + the page if they contained macros. + - Fixed a bug in the date method of the forms package where the noDate option + did the opposite of what was expected. (Thanks to Ed Van Duinen.) 5.4.4 diff --git a/lib/WebGUI/Authentication/WebGUI.pm b/lib/WebGUI/Authentication/WebGUI.pm index 0efd9c3c0..f4e01476c 100644 --- a/lib/WebGUI/Authentication/WebGUI.pm +++ b/lib/WebGUI/Authentication/WebGUI.pm @@ -73,7 +73,7 @@ sub registrationFormSave { my $authInfo = "\n\n".WebGUI::International::get(50).": ".$session{form}{"authWebGUI.username"}."\n" .WebGUI::International::get(51).": ".$session{form}{'authWebGUI.identifier'}."\n\n"; adminFormSave($_[0]); - WebGUI::MessageLog::addEntry($_[0],"",WebGUI::International::get(870),$session{setting}{welcomeMessage}.$authInfo); + WebGUI::MessageLog::addEntry($_[0],"",WebGUI::International::get(870),$session{setting}{welcomeMessage}.$authInfo) if ($session{setting}{sendWelcomeMessage}); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm index 42484be84..8483b570a 100644 --- a/lib/WebGUI/Form.pm +++ b/lib/WebGUI/Form.pm @@ -350,9 +350,8 @@ By default a date is placed in the "value" field. Set this to "1" to turn off th sub date { my ($subtext, $noDate, $class, $name, $label, $extras, $size, $value); - $value = epochToSet($_[0]->{value}); + $value = epochToSet($_[0]->{value}) unless ($_[0]->{noDate} && $_[0]->{value} eq ''); $size = $_[0]->{size} || 10; - $value = "" if ($_[0]->{noDate}); my $output = _javascriptFile('inputCheck.js'); $output .= text({ name=>$_[0]->{name}, diff --git a/lib/WebGUI/Macro/SQL.pm b/lib/WebGUI/Macro/SQL.pm index 13dcb86a6..b64713d79 100644 --- a/lib/WebGUI/Macro/SQL.pm +++ b/lib/WebGUI/Macro/SQL.pm @@ -20,7 +20,7 @@ sub process { my ($output, @data, $rownum, $temp); my ($statement, $format) = WebGUI::Macro::getParams(shift); $format = '^0;' if ($format eq ""); - if ($statement =~ /^\s+select/i || $statement =~ /^\s+show/i || $statement =~ /^\s+describe/i) { + if ($statement =~ /^\s*select/i || $statement =~ /^\s*show/i || $statement =~ /^\s*describe/i) { my $sth = WebGUI::SQL->unconditionalRead($statement); unless ($sth->errorCode < 1) { return '

SQL Macro Failed: '.$sth->errorMessage.'

'; diff --git a/lib/WebGUI/Operation/Clipboard.pm b/lib/WebGUI/Operation/Clipboard.pm index 31e499cff..363cd29f9 100644 --- a/lib/WebGUI/Operation/Clipboard.pm +++ b/lib/WebGUI/Operation/Clipboard.pm @@ -116,7 +116,7 @@ sub www_deleteClipboardItemConfirm { WebGUI::ErrorHandler::audit("moved page ". $session{form}{pageId} ." from clipboard to trash"); } WebGUI::Session::refreshPageInfo($session{page}{pageId},'op=manageClipboard'); - return ""; + return www_manageClipboard(); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Page.pm b/lib/WebGUI/Page.pm index 6248b0e4c..2877e221e 100644 --- a/lib/WebGUI/Page.pm +++ b/lib/WebGUI/Page.pm @@ -161,6 +161,7 @@ sub drawTemplate { $template =~ s/\n//g; $template =~ s/\r//g; $template =~ s/\'/\\\'/g; + $template = WebGUI::Macro::negate($template); $template =~ s/\.*?\<\/script\>//gi; $template =~ s/\/\/ig; $template =~ s/\/$1/ig; diff --git a/www/extras/emailCheck.js b/www/extras/emailCheck.js index 638d6ba82..6bbcf0baa 100644 --- a/www/extras/emailCheck.js +++ b/www/extras/emailCheck.js @@ -8,7 +8,7 @@ var checkTLD=1; /* The following is the list of known TLDs that an e-mail address must end with. */ -var knownDomsPat=/^(com|net|org|edu|int|mil|gov|arpa|biz|aero|name|coop|info|pro|museum)$/; +var knownDomsPat=/^(com|net|org|edu|int|mil|gov|arpa|biz|aero|name|coop|info|pro|museum)$/i; /* The following pattern is used to check if the entered e-mail address fits the user@domain format. It also is used to separate the username