merging 6.6.5 changes

docs/changelog/6.x.x.txt

@@ -41,6 +41,16 @@
    time ago, but the documentation was never updated until now.
 
 
+6.6.5
+ - fix [ 1243131 ] In 6.6.4 you cannot upload anything (ebruni/mwilson)
+ - fix [ 1243392 ] demo.plainblack.com: Cannot manage users in group (mwilson)
+ - fix [ 1240325 ] FilePile doesn't create thumbnail when upload images
+   (mwilson)
+ - fix [ 1240324 ] Folder.pm error evaluating $isImage (ebruni)
+ - fix [ 1240140 ] Database link username in 6.6.3 is wrong (mwilson)
+ - Fixed a bug where HTTP Proxy asset couldn't proxy images properly.
+
+
 6.6.4
  - fix [ 1238539 ] REQUEST_URI broken in WRE
  - fix [ 1227887 ] setScratch("redirectAfterLogin") doesn't save

docs/upgrades/upgrade_6.6.4-6.6.5.pl

@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+use lib "../../lib";
+use Getopt::Long;
+use strict;
+use File::Path;
+
+my $configFile;
+my $quiet;
+
+GetOptions(
+    'configFile=s'=>\$configFile,
+	'quiet'=>\$quiet
+);
+
+
+#--------------------------------------------
+print "\tRemoving old HTML::Template if it exists. Check gotcha.txt for details.\n" unless ($quiet);
+rmtree("../../lib/HTML/Template");
+unlink("../../lib/HTML/Template.pm");
+
+
+

docs/upgrades/upgrade_6.6.4-6.6.5.sql

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

lib/WebGUI/Asset/Wobject/HttpProxy.pm

@@ -78,6 +78,11 @@ sub definition {
 				fieldType=>"text",
                                 defaultValue=>undef
                                 },
+			cookieJarStorageId=>{
+                                noFormPost=>1,
+                                fieldType=>"hidden",
+                                defaultValue=>undef
+                                }
 			}
 		});
         return $class->SUPER::definition($definition);
@@ -302,7 +307,7 @@ sub view {
 		$var{content} = $1 || $var{content};
 		$var{"content.trailing"} = $2;
 	}
-         my $p = WebGUI::Asset::Wobject::HttpProxy::Parse->new($proxiedUrl, $var{content}, $self->getId,$self->get("rewriteUrls"));
+         my $p = WebGUI::Asset::Wobject::HttpProxy::Parse->new($proxiedUrl, $var{content}, $self->getId,$self->get("rewriteUrls"),$self->getUrl);
          $var{content} = $p->filter; # Rewrite content. (let forms/links return to us).
          $p->DESTROY; 
    
@@ -348,5 +353,18 @@ sub www_edit {
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy"));
 }
 
+#-------------------------------------------------------------------
+
+sub www_view {
+        my $self = shift;
+        my $output = $self->view;
+        return WebGUI::Privilege::noAccess() unless $self->canView;
+        # this is s a stop gap. we need to do something here that deals with the real www_view and caching, etc.
+        if (WebGUI::HTTP::getMimeType() ne "text/html") {
+                return $output;
+        } else {
+                return $self->processStyle($output);
+        }
+}
 
 1;

lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm

@@ -20,31 +20,22 @@ use vars qw(@ISA);
 @ISA = qw(HTML::Parser);
 
  
-my %linkElements =            # from HTML::Element.pm
-  (
-   body   => 'background',
-   base   => 'href',
-   a      => 'href',
-   img    => [qw('src' 'lowsrc' 'usemap')], # lowsrc is a Netscape invention
-   form   => 'action',
-   input  => 'src',
-   'link'  => 'href',         # need quoting since link is a perl builtin
-   frame  => 'src',
-   iframe => 'src',
-   applet => 'codebase',
-   area   => 'href',
-   script   => 'src',
-   iframe  => 'src',
-  );
-  
-my %tag_attr;
-for my $tag (keys %linkElements) {
-  my $tagval = $linkElements{$tag};
-  for my $attr (ref $tagval ? @$tagval : $tagval) {
-    $tag_attr{"$tag $attr"}++;
-  }
-}
-
+my %tag_attr = (
+	"body background" => 1,
+	"base href" => 1,
+	"a href" => 1,
+	"img src" => 1,
+	"img lowsrc" => 1,
+	"img usemap" => 1,
+	"form action" => 1,
+	"input src" => 1,
+	"link href" => 1,
+	"frame src" => 1,
+	"applet codebase" => 1,
+	"iframe src" => 1,
+	"area href" => 1,
+	"script src" => 1
+	);
 
 sub new {
   	my $pack = shift;
@@ -53,6 +44,7 @@ sub new {
   	$self->{Content} = shift;
   	$self->{assetId} = shift;
 	$self->{rewriteUrls} = shift;
+	$self->{assetUrl} = shift;
   	$self->{Filtered} ="";
   	$self->{FormAction} = "";
   	$self->{FormActionIsDefined} = 0;
@@ -135,10 +127,10 @@ sub start {
           				if (lc($tag) eq "form" && lc($_) eq "action") {  # Found FORM ACTION
 	    					$self->{FormActionIsDefined}=1;
             					$self->{FormAction} = $val;  # set FormAction to include hidden field later
-            					$val = WebGUI::URL::page;    # Form Action returns to us
+            					$val = $self->{assetUrl};    # Form Action returns to us
           				} else {
 						$val =~ s/\n//g;	# Bugfix 757068
-            					$val = WebGUI::URL::page('proxiedUrl='.WebGUI::URL::escape($val).'&func=view'); # return to us
+            					$val = WebGUI::URL::append($self->{assetUrl},'proxiedUrl='.WebGUI::URL::escape($val).'&func=view'); # return to us
           				}
         			}
       			}

lib/WebGUI/Cache.pm

@@ -72,7 +72,7 @@ sub deleteChunk {
 
 =head2 flush ( )
 
-Flushes the caching system. Must be overloaded.
+Flushes the caching system. Must be overridden.
 
 =cut