fixing bugs

preparing for 6.2.7 bugfix cycle

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

docs/previousVersion.sql

@@ -1934,7 +1934,7 @@ INSERT INTO USS_submission VALUES ('6','Look Great',1076705448,'Admin','3','<img
 
 CREATE TABLE WSClient (
   wobjectId varchar(22) NOT NULL default '',
-  call text NOT NULL,
+  callMethod text,
   uri varchar(255) NOT NULL default '',
   proxy varchar(255) NOT NULL default '',
   preprocessMacros int(11) NOT NULL default '0',
@@ -3093,7 +3093,7 @@ CREATE TABLE webguiVersion (
 --
 
 
-INSERT INTO webguiVersion VALUES ('6.2.5','initial install',unix_timestamp());
+INSERT INTO webguiVersion VALUES ('6.2.6','initial install',unix_timestamp());
 
 --
 -- Table structure for table `wobject`

docs/upgrades/upgrade_6.2.6-6.2.7.sql

@@ -0,0 +1,3 @@
+insert into webguiVersion values ('6.2.7','upgrade',unix_timestamp());
+
+

lib/WebGUI.pm

@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "6.2.6";
+our $VERSION = "6.2.7";
 our $STATUS = "gamma";
 
 #-------------------------------------------------------------------
@@ -34,7 +34,7 @@ sub _generatePage {
 	my $content = shift;
 	if ($session{form}{op} eq "" && $session{setting}{trackPageStatistics} && $session{form}{wid} ne "new") {
 		WebGUI::SQL->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}).", 

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;
 }
 
 #-------------------------------------------------------------------

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;

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 pageId=".quote($session{form}{pageId}) ." "
-                		."and bufferUserId=".$session{user}{userId}
+                		."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 "
+                	."bufferPrevId='2' "
-                	."where parentId=2 ");
+                	."where parentId='2' ");
-        	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 "
+                	."bufferPrevId='2' "
-                	."where pageId=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 "
+                	."bufferPrevId='2' "
-                	."where parentId=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 "
+                	."bufferPrevId='2' "
-                	."where pageId=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) {

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;

lib/WebGUI/i18n/English/WebGUI.pm

@@ -247,7 +247,7 @@ The URL for your company specified in the settings by your Administrator.
 
 <P><B>Not Found Page</B><BR>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. 
 
-<p><b>URL Extension</b><br />Add an extension such as "html", "php", or "asp" to each page URL. <p><b>NOTE:</b> Do NOT include the dot "." in this. So the field should look like "html" not ".html".
+<p><b>URL Extension</b><br />Add an extension such as "html", "php", or "asp" to each new page URL as it is created. <p><b>NOTE:</b> Do NOT include the dot "." in this. So the field should look like "html" not ".html".
 
 <P><B>Favicon</B><BR>An icon that appears on Internet Explorer short cuts such as your "Favorites". To learn more about Favicon <A href="http://msdn.microsoft.com/workshop/author/dhtml/howto/shortcuticon.asp">click here</A>. 
 
@@ -268,7 +268,7 @@ The URL for your company specified in the settings by your Administrator.
 <P><B>Text Box Size</B><BR>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' => {