WebGUI 3.6.2 release

docs/previousVersion.sql

@@ -2999,5 +2999,6 @@ CREATE TABLE widget (
 
 INSERT INTO widget VALUES (-1,4,'SiteMap',0,'Page Not Found',1,'The page you were looking for could not be found on this system. Perhaps it has been deleted or renamed. The following list is a site map of this site. If you don\'t find what you\'re looking for on the site map, you can always start from the <a href=\"^/;\">Home Page</a>.',1,1001744792,3,1016077239,3,'A');
 
+insert into international values (438,'WebGUI','English','Your Name');
 
-insert into webguiVersion values ('3.6.0','intitial install',unix_timestamp());
+insert into webguiVersion values ('3.6.1','intitial install',unix_timestamp());

lib/WebGUI.pm

@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "3.6.1";
+our $VERSION = "3.6.2";
 
 #-------------------------------------------------------------------
 # WebGUI is Copyright 2001-2002 Plain Black Software.

lib/WebGUI/Discussion.pm

@@ -23,6 +23,7 @@ use WebGUI::URL;
 #-------------------------------------------------------------------
 sub _deleteReplyTree {
         my ($sth, %data, $messageId);
+	tie %data, 'Tie::CPHash';
         $sth = WebGUI::SQL->read("select messageId from discussion where pid=$_[0] order by messageId");
         while (%data = $sth->hash) {
                 _deleteReplyTree($data{messageId});

lib/WebGUI/Form.pm

@@ -150,14 +150,14 @@ sub text {
 #-------------------------------------------------------------------
 sub textArea {
         my ($output, $name, $value, $cols, $rows, $htmlEdit, $wrap);
-        ($name, $value, $cols, $rows, $htmlEdit, $wrap) = @_;
 	$output = '<script language="JavaScript">function fixChars(element) {element.value = element.value.replace(/~V/mg,"-");}</script>';
-        if ($cols eq "") {
+	$name = $_[0];
-                $cols = 50;
+	$value = $_[1];
-        }
+	$value =~ s/\<\/textarea\>/\&lt\;\/textarea\&gt\;/ig;
-        if ($rows eq "") {
+	$cols = $_[2] || 50;
-                $rows = 5;
+        $rows = $_[3] || 5;
-        }
+	$htmlEdit = $_[4];
+	$wrap = $_[5] || "virtual";
 	if ($htmlEdit > 0) {
 		$output .= '<script language="JavaScript"> 
 			var formObj; 
@@ -175,9 +175,6 @@ sub textArea {
 		$output .= '<input type="button" onClick="openEditWindow(this.form.'.$name.')" value="'.
 			WebGUI::International::get(171).'" style="font-size: 8pt;"><br>';
 	}
-        if ($wrap eq "") {
-                $wrap = "virtual";
-        }
         $output .= '<textarea name="'.$name.'" cols="'.$cols.'" rows="'.$rows.'" wrap="'.$wrap.
 		'" onBlur="fixChars(this.form.'.$name.')">'.$value.'</textarea>';
         return $output;

lib/WebGUI/URL.pm

@@ -11,6 +11,7 @@ package WebGUI::URL;
 #-------------------------------------------------------------------
 
 use strict;
+use URI::Escape;
 use WebGUI::Session;
 use WebGUI::Utility;
 
@@ -26,6 +27,11 @@ sub append {
 	return $url;
 }
 
+#-------------------------------------------------------------------
+sub escape {
+	return uri_escape($_[0]);
+}
+
 #-------------------------------------------------------------------
 sub gateway {
         my ($url);
@@ -52,11 +58,17 @@ sub page {
 	return $url;
 }
 
+#-------------------------------------------------------------------
+sub unescape {
+	return uri_unescape($_[0]);
+}
+
 #-------------------------------------------------------------------
 sub urlize {
 	my ($title);
         $title = lc($_[0]);
         $title =~ s/ /_/g;
+	$title =~ s/\.$//g;
         $title =~ s/[^a-z0-9\-\.\_]//g;
         return $title;
 }

lib/WebGUI/Widget/SQLReport.pm

@@ -209,7 +209,7 @@ sub www_editSave {
 #-------------------------------------------------------------------
 sub www_view {
 	my (@row, $i, $p, $ouch, %data, $output, $sth, $dbh, @result, 
-		@template, $temp, $col, $errorMessage);
+		@template, $temp, $col, $errorMessage, $url);
 	tie %data, 'Tie::CPHash';
 	%data = getProperties($namespace,$_[0]);
 	if (%data) {
@@ -269,8 +269,13 @@ sub www_view {
 	                			$output .= $template[2];
         	                       		$output .= WebGUI::International::get(18,$namespace).'<p>';
                 	        	} else {
-                				$p = WebGUI::Paginator->new(WebGUI::URL::page(),
+						$url = WebGUI::URL::page();
-							\@row,$data{paginateAfter});
+						foreach (keys %{$session{form}}) {
+							unless ($_ eq "pn") {
+								$url = WebGUI::URL::append($url, WebGUI::URL::escape($_.'='.$session{form}{$_}));
+							}
+						}
+                				$p = WebGUI::Paginator->new($url,\@row,$data{paginateAfter});
                 				$output .= $p->getPage($session{form}{pn});
     	        	    			$output .= $template[2];
         	        			$output .= $p->getBar($session{form}{pn});

preload.perl

@@ -12,6 +12,7 @@ use CGI (); CGI->compile(':all');
 use CGI::Carp ();
 use DBI ();
 use DBD::mysql ();
+use URI::Escape ();
 use HTML::Parser ();
 use Data::Config ();
 use Date::Calc ();