merging some 5.4.4 changes

docs/changelog/5.x.x.txt

@@ -16,6 +16,24 @@
  - Enhanced HTMLArea editor to include table editing. (Thanks to Irving Carrion.)
 
 
+5.4.4
+ - Updated Finnish translation. (Thanks to Markus Hynna.)
+ - Added Croatian translation. (Thanks to Gordon.)
+ - Updated Portuguese translation. (Thanks to Marcelo Ennes.)
+ - Updated Dutch translation. (Thanks to Leo Noordergraaf, ProcoliX, BNC Distribution, and Hugo Van der Kooij.)
+ - Updated German translation. (Thanks to Andreas Graf.)
+ - Added an association for PPS attachments.
+ - Readded wobject date range check that was accidentally removed.
+ - Fixed a bug that caused incompatibility in the HTML Area image manager with
+   Postgres. (Thanks to Jeremy Malcolm.)
+ - Fixed a leading whitespace bug with the SQL macro. 
+ - Usernames can now be 100 characters long.
+ - Page ordering wasn't always maintained when deploying packages, this is now
+   fixed. (Thanks to Y.H.Khoe.)
+ - Email address didn't validate when it contained a dash (-). (Thanks to
+   Fekke.)
+
+
 5.4.3
  - Fixed a bug where CM's could have deleted the entire collateral manager
    contents if they deleted an item, then hit their back button and deleted it

docs/credits.txt

@@ -39,9 +39,11 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions
 
 Contributing Translators.............AGOFER Ltda.
                                      Natalia Almazova
+                                     BNC Distribution
                                      Joeri de Bruin / ProcoliX
                                      Jose Caneira
                                      Junying Du / WDI
+                                     Marcelo Ennes / FIOCRUZ
                                      Andreas Graf
                                      Emiliano Grilli / Webopen
                                      Ehab Heikal
@@ -53,9 +55,12 @@ Contributing Translators.............AGOFER Ltda.
                                      Andreas Ljunggren
                                      Ricardo Markiewicz
                                      Ryan McCombs
+                                     Leo Noordergraaf
                                      orosor@yahoo.com.tw
                                      Paolo Pigati / Webopen
                                      Michael Ugilt
+                                     University of Zagreb, Croatia
+                                     Hugo Van der Kooij 
                                      Michael Westlund
                                      Zhou Xiaopeng
 

lib/WebGUI.pm

@@ -111,6 +111,7 @@ sub _generatePage {
                         $cmd = "WebGUI::Wobject::".${$wobject}{namespace};
                         $w = eval{$cmd->new($wobject)};
                         WebGUI::ErrorHandler::fatalError("Couldn't instanciate wobject: ${$wobject}{namespace}. Root cause: ".$@) if($@);
+			if ($w->inDateRange) {
                         	$contentHash{"page.position".${$wobject}{templatePosition}} .= '<div class="wobject"><div class="wobject'
 					.${$wobject}{namespace}.'" id="wobjectId'.${$wobject}{wobjectId}.'">';
                                 $contentHash{"page.position".${$wobject}{templatePosition}} .= '<a name="'
@@ -118,6 +119,7 @@ sub _generatePage {
                                 $contentHash{"page.position".${$wobject}{templatePosition}} .= eval{$w->www_view};
                                 WebGUI::ErrorHandler::fatalError("Wobject runtime error: ${$wobject}{namespace}. Root cause: ".$@) if($@);
                                 $contentHash{"page.position".${$wobject}{templatePosition}} .= "</div></div>\n\n";
+			}
 		}
                 $sth->finish;
                 $template = $session{page}{templateId};

lib/WebGUI/Attachment.pm

@@ -269,7 +269,7 @@ sub getIcon {
                 $icon .= "exe.gif";
         } elsif ($extension eq "mdb") {
                 $icon .= "mdb.gif";
-        } elsif ($extension eq "ppt") {
+	} elsif (isIn($extension, qw(ppt pps))) {
                 $icon .= "ppt.gif";
         } elsif (isIn($extension, qw(psd eps ai ps))) {
                 $icon .= "psd.gif";

lib/WebGUI/FormProcessor.pm

@@ -214,7 +214,7 @@ The name of the form variable to retrieve.
 =cut
 
 sub email {
-	if ($session{form}{$_[0]} =~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
+	if ($session{form}{$_[0]} =~ /^([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
 		return $session{form}{$_[0]};
 	}
 	return undef;

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 =~ /^select/i || $statement =~ /^show/i || $statement =~ /^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 '<p><b>SQL Macro Failed:</b> '.$sth->errorMessage.'<p>';

lib/WebGUI/Operation/Collateral.pm

@@ -551,7 +551,7 @@ sub www_htmlArealistCollateral {
 					"closed.gif", $indent, "", $delete);
         }
 	# Extend tree with images in current folder
-	$sth = WebGUI::SQL->read('select collateralId, name, filename from collateral where collateralType = "image" '.
+	$sth = WebGUI::SQL->read("select collateralId, name, filename from collateral where collateralType = 'image' ".
                                  "and collateralFolderId = $folderId");
 	while ($data = $sth->hashRef) {
 		$data->{filename} =~ /\.([^\.]+)$/; # Get extension

lib/WebGUI/Operation/Package.pm

@@ -47,7 +47,7 @@ sub _recursePageTree {
 	%newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]");
 	_duplicateWobjects($_[0],$_[1]);
 	($sequenceNumber) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=$_[1]");
-	$a = WebGUI::SQL->read("select * from page where parentId=$_[0]");
+	$a = WebGUI::SQL->read("select * from page where parentId=$_[0] order by sequenceNumber");
 	while (%package = $a->hash) {
 		$newPageId = getNextId("pageId");
 		$sequenceNumber++;