diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e36bb94bb..5ad86b0e4 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,13 @@ - fix: New resizable textareas not obeying width/height parameters - fix: InOutBoard not allowing re-editing of new revisions - Added a fatal error should parsing of JSON config file fail + - Fixed a bug with the admin mode subnet feature. + - Fixed a problem with rich media ads not processing macros. + - Fixed a flaw in the new commerce tax system that caused checkouts to fail. + - fix: Bug in "Article with Files" + - fix: SQLReport pagination retains op= parameter + - fix: Invalid MIME type set for images + 7.2.0 - Added server side spellchecker (Martin Kamerbeek / Procolix) diff --git a/lib/WebGUI/AdSpace/Ad.pm b/lib/WebGUI/AdSpace/Ad.pm index a530699be..b4d023a38 100644 --- a/lib/WebGUI/AdSpace/Ad.pm +++ b/lib/WebGUI/AdSpace/Ad.pm @@ -16,6 +16,7 @@ package WebGUI::AdSpace::Ad; use strict; use WebGUI::AdSpace; +use WebGUI::Macro; use WebGUI::Storage::Image; =head1 NAME @@ -259,7 +260,9 @@ sub set { my $storage = WebGUI::Storage::Image->get($self->session, $self->get("storageId")); $self->{_properties}{renderedAd} = '
get("height").'px; margin:0px; overflow:hidden; border:0px;">getId).'" style="position:absolute; padding: 3px; top:0px; left:0px; width:100%; height:100%; z-index:10; display:block; text-decoration:none; vertical-align:top;">'.$self->get(
'; } elsif ($self->get("type") eq "rich") { - $self->{_properties}{renderedAd} = $self->get("richMedia"); + my $ad = $self->get("richMedia"); + WebGUI::Macro::process($self->session, $ad); + $self->{_properties}{renderedAd} = $ad; } $self->session->db->setRow("advertisement","adId",$self->{_properties}); } diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index d8dfad29c..402d811ff 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -2133,20 +2133,6 @@ true. sub isValidRssItem { 1 } -#------------------------------------------------------------------- - -=head2 exportHtml_view ( ) - -View method for static export. This is like www_view, and defaults to -just calling www_view, but this needs to be overridden if www_view -depends on there being an actual HTTP response on the other end. - -=cut - -sub exportHtml_view { - my $self = shift; - $self->www_view(@_); -} 1; diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index 24bb10364..f05fb12b1 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -375,9 +375,6 @@ sub www_edit { sub exportHtml_view { my $self = shift; return $self->session->privilege->noAccess() unless $self->canView; -# if ($self->session->var->get("adminOn")) { -# return $self->session->asset($self->getContainer)->www_view; -# } my $path = $self->getStorageLocation->getPath($self->get('filename')); my $fh = eval { FileHandle->new($path) }; diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index eefd2d68f..3a467d641 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -602,7 +602,7 @@ sub _processQuery { my $url = $self->getUrl('func=view'); foreach ($self->session->form->param) { - unless ($_ eq "pn" || $_ eq "func" || $_ =~ /identifier/i || $_ =~ /password/i) { + unless ($_ eq "pn" || $_ eq "op" || $_ eq "func" || $_ =~ /identifier/i || $_ =~ /password/i) { $url = $self->session->url->append($url, $self->session->url->escape($_) .'='.$self->session->url->escape($self->session->form->process($_))); } diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm index b8b084305..effc00988 100644 --- a/lib/WebGUI/AssetExportHtml.pm +++ b/lib/WebGUI/AssetExportHtml.pm @@ -213,6 +213,7 @@ sub _exportAsHtml { return (1, sprintf($i18n->get('export information'), scalar(@{$assetIds}), ($self->session->datetime->time()-$startTime))); } +#------------------------------------------------------------------- =head2 exportAsHtml Same as www_exportGenerate except without the output. Returns @@ -228,6 +229,21 @@ sub exportAsHtml { #------------------------------------------------------------------- +=head2 exportHtml_view ( ) + +View method for static export. This is like www_view, and defaults to +just calling www_view, but this needs to be overridden if www_view +depends on there being an actual HTTP response on the other end. + +=cut + +sub exportHtml_view { + my $self = shift; + $self->www_view(@_); +} + +#------------------------------------------------------------------- + =head2 www_export Displays the export page administrative interface diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm index 103a0af8b..9f8639620 100644 --- a/lib/WebGUI/Operation/Commerce.pm +++ b/lib/WebGUI/Operation/Commerce.pm @@ -466,7 +466,7 @@ sub www_checkoutSubmit { $salesTaxTotal += $_->{salesTax}; } # Oy, the kludge. - $transaction->addItem(WebGUI::Commerce::Item::Fake->new($session, $salesTaxTotal.',Sales Tax')); + $transaction->addItem(WebGUI::Commerce::Item::Fake->new($session, $salesTaxTotal.',Sales Tax'), 1, $salesTaxTotal); $transaction->shippingCost($shippingCost); $transaction->shippingMethod($shipping->namespace); $transaction->shippingOptions($shipping->getOptions); diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm index 2d0e2bf11..749b4e32b 100644 --- a/lib/WebGUI/User.pm +++ b/lib/WebGUI/User.pm @@ -18,6 +18,7 @@ use strict; use WebGUI::Cache; use WebGUI::Group; use WebGUI::DatabaseLink; +use WebGUI::Utility; =head1 NAME @@ -131,7 +132,7 @@ sub canUseAdminMode { my $pass = 1; my $subnets = $self->session->config->get("adminModeSubnets") || []; if (scalar(@$subnets)) { - $pass = isInSubnet($self->session->env->get("REMOTE_ADDR"), $subnets); + $pass = WebGUI::Utility::isInSubnet($self->session->env->get("REMOTE_ADDR"), $subnets); } return $pass && $self->session->user->isInGroup(12) }