diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index de4ecc7ea..c98f5f68c 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,5 +1,6 @@ 6.5.0 - Added content prototypes. + - Updated TinyMCE to 1.43. - Fixed a bug in the Collaboration post where the post end date was set to the start date. - fix [ 1157202 ] users can add themselves to Admins group @@ -8,6 +9,10 @@ - fix [ 1158117 ] Help Index Unavailable from RWG - fix [ 1157453 ] Error on Edit Template / Save and Cancel - fix [ 1157434 ] [CVS 6.5]edit question controls have incorrect URL in Survey + - fix [ 1157418 ] "Display the title?" not shown in Layout tab + - fix [ 1157210 ] users added notification e-mail doesn't show correct url + - Fixed a bug that wouldn't allow the HTTP Proxy wobject to rewrite the URLs + of SSL enabled sites. - Using the International Macro in Help to simplify management and translation. diff --git a/docs/upgrades/upgrade_6.4.0-6.5.0.pl b/docs/upgrades/upgrade_6.4.0-6.5.0.pl new file mode 100644 index 000000000..b878316c3 --- /dev/null +++ b/docs/upgrades/upgrade_6.4.0-6.5.0.pl @@ -0,0 +1,41 @@ +#!/usr/bin/perl + +use lib "../../lib"; +use FileHandle; +use File::Path; +use File::Copy; +use Getopt::Long; +use strict; +use WebGUI::Group; +use WebGUI::HTML; +use WebGUI::Id; +use WebGUI::Session; +use WebGUI::SQL; +use WebGUI::URL; + + +my $configFile; +my $quiet; + +GetOptions( + 'configFile=s'=>\$configFile, + 'quiet'=>\$quiet +); + +WebGUI::Session::open("../..",$configFile); + +#-------------------------------------------- +print "\tUpdating config file.\n" unless ($quiet); +my $pathToConfig = '../../etc/'.$configFile; +my $conf = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $pathToConfig); +my $macros = $conf->get("macros"); +$macros->{"International"} = "International"; +$conf->set("macros"=>$macros); +$conf->write; + + + + +WebGUI::Session::close(); + + diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm b/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm index a46ef4b48..27e3b8b22 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm @@ -130,7 +130,7 @@ sub start { } else { $val = URI::URL::url($val)->abs($self->{Url},1); # make absolute } - if ($val->scheme eq "http") { + if ($val->scheme eq "http" || $val->scheme eq "https") { if ($self->{rewriteUrls} && lc($tag) ne "iframe") { if (lc($tag) eq "form" && lc($_) eq "action") { # Found FORM ACTION $self->{FormActionIsDefined}=1; diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 0e0531ab9..45f334d83 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -166,11 +166,13 @@ sub createAccount { $vars->{'create.message'} = $_[0] if ($_[0]); my $storage = WebGUI::Storage::Image->createTemp; my ($filename, $challenge) = $storage->addFileFromCaptcha; - $vars->{'create.form.captcha'} = WebGUI::Form::text({"name"=>"authWebGUI.captcha", size=>6, maxlength=>6}) - .WebGUI::Form::hidden({name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))}) - .''; - $vars->{'create.form.captcha.label'} = WebGUI::International::get("captcha label","AuthWebGUI"); $vars->{useCaptcha} = $session{setting}{webguiUseCaptcha}; + if ($vars->{useCaptcha}) { + $vars->{'create.form.captcha'} = WebGUI::Form::text({"name"=>"authWebGUI.captcha", size=>6, maxlength=>6}) + .WebGUI::Form::hidden({name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))}) + .''; + $vars->{'create.form.captcha.label'} = WebGUI::International::get("captcha label","AuthWebGUI"); + } $vars->{'create.form.username'} = WebGUI::Form::text({"name"=>"authWebGUI.username","value"=>$session{form}{"authWebGUI.username"}}); $vars->{'create.form.username.label'} = WebGUI::International::get(50); $vars->{'create.form.password'} = WebGUI::Form::password({"name"=>"authWebGUI.identifier","value"=>$session{form}{"authWebGUI.identifier"}}); diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm index bedd2da0b..bfa90de48 100644 --- a/lib/WebGUI/HTMLForm.pm +++ b/lib/WebGUI/HTMLForm.pm @@ -213,7 +213,7 @@ sub _tableFormRow { unless ($_[0]->{_noTable}) { my $class = $_[0]->{_class}; $class = qq| class="$class" | if($class); - return '
"+html+"
<\/p>","");html=tinyMCE.regexpReplace(html,"
<\/p>\r\n
\s*(
\s*)?","
");html=tinyMCE.regexpReplace(html,"<\/p>\s*(<\/p>\s*)?","
" + html + "