diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 039f8667d..2bd5275f5 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,3 +1,10 @@ +6.2.7 + - Expanded upon the help for URL extensions. + - Added a workaround to a bug in Time::HiRes on windows. + - bugfix [ 1038289 ] Performance problems with 6.2 + - bugfix [ 1038837 ] Hashing issues (Paul Malabad) + + 6.2.6 - Fixed a GUID bug in the Site Map wobject. - Removed debugging from the events calendar that should have been removed diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index e140537c2..516b51d53 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -1934,7 +1934,7 @@ INSERT INTO USS_submission VALUES ('6','Look Great',1076705448,'Admin','3','write("insert into pageStatistics (dateStamp, userId, username, ipAddress, userAgent, referer, - pageId, pageTitle, wobjectId, wobjectFunction) values (".time().",".$session{user}{userId} + pageId, pageTitle, wobjectId, wobjectFunction) values (".time().",".quote($session{user}{userId}) .",".quote($session{user}{username}).", ".quote($session{env}{REMOTE_ADDR}).", ".quote($session{env}{HTTP_USER_AGENT}).", ".quote($session{env}{HTTP_REFERER}).", ".quote($session{page}{pageId}).", diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm index 9b01d4961..dc5700f62 100644 --- a/lib/WebGUI/DateTime.pm +++ b/lib/WebGUI/DateTime.pm @@ -756,7 +756,8 @@ Returns an epoch date for now. =cut sub time { - return dateToEpoch(&ParseDate("now")); + #return dateToEpoch(&ParseDate("now")); + return time; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Id.pm b/lib/WebGUI/Id.pm index 88d2c0983..ad8a68de0 100644 --- a/lib/WebGUI/Id.pm +++ b/lib/WebGUI/Id.pm @@ -20,7 +20,9 @@ use strict; use Time::HiRes qw( gettimeofday usleep ); use WebGUI::Session; - +BEGIN { + srand; +} =head1 NAME @@ -55,7 +57,7 @@ This function generates a global unique id. sub generate { my($s,$us)=gettimeofday(); - my($v)=sprintf("%06d%10d%06d%255s",$us,$s,$$,$WebGUI::Session::session{config}{defaultSiteName}); + my($v)=sprintf("%09d%06d%10d%06d%255s",rand(999999999),$us,$s,$$,$WebGUI::Session::session{config}{defaultSiteName}); my $id = Digest::MD5::md5_base64($v); $id =~ s/\+/_/g; $id =~ s/\//-/g; diff --git a/lib/WebGUI/Operation/Clipboard.pm b/lib/WebGUI/Operation/Clipboard.pm index 29f2acf76..ab69ca71a 100644 --- a/lib/WebGUI/Operation/Clipboard.pm +++ b/lib/WebGUI/Operation/Clipboard.pm @@ -110,8 +110,8 @@ sub www_deleteClipboardItemConfirm { ."bufferUserId=".quote($session{user}{userId}) .", " ."bufferPrevId=2 " ."where parentId=2 " - ."and pageId=".$session{form}{pageId} ." " - ."and bufferUserId=".$session{user}{userId} + ."and pageId=".quote($session{form}{pageId}) ." " + ."and bufferUserId=".quote($session{user}{userId}) ); } WebGUI::ErrorHandler::audit("moved page ". $session{form}{pageId} ." from clipboard to trash"); @@ -152,29 +152,29 @@ sub www_emptyClipboardConfirm { $allUsers = 0; } if ($allUsers eq "1") { - WebGUI::SQL->write("update page set parentId=3, " + WebGUI::SQL->write("update page set parentId='3', " ."bufferDate=".time().", " ."bufferUserId=".quote($session{user}{userId}) .", " - ."bufferPrevId=2 " - ."where parentId=2 "); - WebGUI::SQL->write("update wobject set pageId=3, " + ."bufferPrevId='2' " + ."where parentId='2' "); + WebGUI::SQL->write("update wobject set pageId='3', " ."bufferDate=".time().", " ."bufferUserId=".quote($session{user}{userId}) .", " - ."bufferPrevId=2 " - ."where pageId=2 "); + ."bufferPrevId='2' " + ."where pageId='2' "); WebGUI::ErrorHandler::audit("emptied clipboard to trash"); } else { - WebGUI::SQL->write("update page set parentId=3, " + WebGUI::SQL->write("update page set parentId='3', " ."bufferDate=".time().", " ."bufferUserId=".quote($session{user}{userId}) .", " - ."bufferPrevId=2 " - ."where parentId=2 " + ."bufferPrevId='2' " + ."where parentId='2' " ."and bufferUserId=".quote($session{user}{userId})); - WebGUI::SQL->write("update wobject set pageId=3, " + WebGUI::SQL->write("update wobject set pageId='3', " ."bufferDate=".time().", " ."bufferUserId=".quote($session{user}{userId}) .", " - ."bufferPrevId=2 " - ."where pageId=2 " + ."bufferPrevId='2' " + ."where pageId='2' " ."and bufferUserId=".quote($session{user}{userId})); WebGUI::ErrorHandler::audit("emptied user clipboard to trash"); } @@ -205,10 +205,10 @@ sub www_manageClipboard { # Generate list of pages in clipboard if ($allUsers) { $sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId " - ."from page where parentId=2 order by bufferDate"); + ."from page where parentId='2' order by bufferDate"); } else { $sth = WebGUI::SQL->read("select pageId,title,urlizedTitle,bufferUserId,bufferDate,bufferPrevId " - ."from page where parentId=2 and bufferUserId=" + ."from page where parentId='2' and bufferUserId=" . quote($session{user}{userId}) . " order by bufferDate"); } while (@data = $sth->array) { @@ -257,10 +257,10 @@ sub www_manageClipboard { # Generate list of wobjects in clipboard if ($allUsers) { $sth = WebGUI::SQL->read("select wobjectId,namespace,title,bufferUserId,bufferDate,bufferPrevId " - . "from wobject where pageId=2 order by bufferDate"); + . "from wobject where pageId='2' order by bufferDate"); } else { $sth = WebGUI::SQL->read("select wobjectId,namespace,title,bufferUserId,bufferDate,bufferPrevId " - . "from wobject where pageId=2 and bufferUserId=" + . "from wobject where pageId='2' and bufferUserId=" . quote($session{user}{userId}) ." order by bufferDate"); } while (@data = $sth->array) { diff --git a/lib/WebGUI/Operation/Package.pm b/lib/WebGUI/Operation/Package.pm index d9ad39c38..a6294c498 100644 --- a/lib/WebGUI/Operation/Package.pm +++ b/lib/WebGUI/Operation/Package.pm @@ -44,9 +44,9 @@ sub _recursePageTree { my ($a, %package, %newParent,$currentPage,$page); tie %newParent, 'Tie::CPHash'; tie %package, 'Tie::CPHash'; - %newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]"); + %newParent = WebGUI::SQL->quickHash("select * from page where pageId=".quote($_[1])); _duplicateWobjects($_[0],$_[1]); - $a = WebGUI::SQL->read("select * from page where parentId=$_[0] order by sequenceNumber"); + $a = WebGUI::SQL->read("select * from page where parentId=".quote($_[0])." order by sequenceNumber"); while (%package = $a->hash) { $currentPage = WebGUI::Page->getPage($_[1]); $page = $currentPage->add; diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index faf410395..076e95087 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -247,7 +247,7 @@ The URL for your company specified in the settings by your Administrator.

Not Found Page
If a page that a user requests is not found in the system, the user can be redirected to the home page or to an error page where they can attempt to find what they were looking for. You decide which is better for your users. -

URL Extension
Add an extension such as "html", "php", or "asp" to each page URL.

NOTE: Do NOT include the dot "." in this. So the field should look like "html" not ".html". +

URL Extension
Add an extension such as "html", "php", or "asp" to each new page URL as it is created.

NOTE: Do NOT include the dot "." in this. So the field should look like "html" not ".html".

Favicon
An icon that appears on Internet Explorer short cuts such as your "Favorites". To learn more about Favicon click here. @@ -268,7 +268,7 @@ The URL for your company specified in the settings by your Administrator.

Text Box Size
Some sites wish to control the size of the forms that WebGUI generates. With this setting you can specify how characters can be displayed at once in text boxes on the site. |, - lastUpdated => 1094410006 + lastUpdated => 1096822339 }, '1021' => {