diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index feee3d824..392cbdd5e 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -39,7 +39,8 @@ internal WebGUI database. This exhibited no problems prior to this release because no WebGUI functions actually used those methods before. - bugfix [1073753]. bug in WebGUI::Search (Leendert Bottelberghs). - - Added an e-commerce system. (Martin Kamerbeek) + - Added an e-commerce system. Thanks to Atomic Learning for funding this + feature. 6.2.9 - bugfix [ 1058105 ] input tag has to be closed with / diff --git a/docs/upgrades/upgrade_6.2.9-6.3.0.pl b/docs/upgrades/upgrade_6.2.9-6.3.0.pl index c12dd97db..b297e219f 100644 --- a/docs/upgrades/upgrade_6.2.9-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.9-6.3.0.pl @@ -76,11 +76,11 @@ sub walkTree { $className = 'WebGUI::Asset::Redirect'; } WebGUI::SQL->write("insert into asset (assetId, parentId, lineage, className, state, title, menuTitle, url, startDate, - endDate, synopsis, newWindow, isHidden, ownerUserId, groupIdView, groupIdEdit ) values (".quote($pageId).", + endDate, synopsis, newWindow, isHidden, ownerUserId, groupIdView, groupIdEdit, encryptPage ) values (".quote($pageId).", ".quote($newParentId).", ".quote($pageLineage).", ".quote($className).",'published',".quote($page->{title}).", ".quote($page->{menuTitle}).", ".quote($pageUrl).", ".quote($page->startDate).", ".quote($page->{endDate}).", ".quote($page->{synopsis}).", ".quote($page->{newWindow}).", ".quote($page->{hideFromNavigation}).", ".quote($page->{ownerId}).", - ".quote($page->{groupIdView}).", ".quote($page->{groupIdEdit}).")"); + ".quote($page->{groupIdView}).", ".quote($page->{groupIdEdit}).", ".quote($page->{encryptPage}).")"); if ($page->{redirectURL} ne "") { WebGUI::SQL->write("insert into redirect (assetId, redirectUrl) values (".quote($pageId).",".quote($page->{redirectURL}).")"); } else { @@ -106,10 +106,10 @@ sub walkTree { } $className = 'WebGUI::Asset::Wobject::'.$wobject->{namespace}; WebGUI::SQL->write("insert into asset (assetId, parentId, lineage, className, state, title, menuTitle, url, startDate, - endDate, isHidden, ownerUserId, groupIdView, groupIdEdit) values (".quote($wobjectId).", + endDate, isHidden, ownerUserId, groupIdView, groupIdEdit, encryptPage) values (".quote($wobjectId).", ".quote($pageId).", ".quote($wobjectLineage).", ".quote($className).",'published',".quote($page->{title}).", ".quote($page->{title}).", ".quote($wobjectUrl).", ".quote($wobject->startDate).", ".quote($wobject->{endDate}).", - 1, ".quote($ownerId).", ".quote($groupIdView).", ".quote($groupIdEdit).")"); + 1, ".quote($ownerId).", ".quote($groupIdView).", ".quote($groupIdEdit).", ".quote($page->{encryptPage}).")"); WebGUI::SQL->write("update wobject set assetId=".quote($wobjectId)); WebGUI::SQL->write("update ".$wobject->{namespace}." set assetId=".quote($wobjectId)); if ($namespace eq "Article") { diff --git a/docs/upgrades/upgrade_6.2.9-6.3.0.sql b/docs/upgrades/upgrade_6.2.9-6.3.0.sql index 408a6b566..181ef6be7 100644 --- a/docs/upgrades/upgrade_6.2.9-6.3.0.sql +++ b/docs/upgrades/upgrade_6.2.9-6.3.0.sql @@ -62,6 +62,7 @@ create table asset ( newWindow int not null default 0, isHidden int not null default 0, isSystem int not null default 0, + encryptPage int not null default 0, unique index (lineage asc), unique index (url), index (parentId) diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index 13ee871d6..27eaea33a 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -14,8 +14,13 @@ package WebGUI::Asset::Redirect; =cut +use strict; +use WebGUI::Asset; +use WebGUI::HTTP; use WebGUI::Session; +our @ISA = qw(WebGUI::Asset); + =head1 NAME @@ -124,9 +129,9 @@ sub www_view { my $self = shift; if ($session{var}{adminOn}) { return $self->www_edit; - } else { - } + WebGUI::HTTP::setRedirect($self->get("redirectUrl")); + return ""; } diff --git a/www/extras/adminConsole/adminConsole.gif b/www/extras/adminConsole/adminConsole.gif index 95fae9d3d..5506b5c29 100644 Binary files a/www/extras/adminConsole/adminConsole.gif and b/www/extras/adminConsole/adminConsole.gif differ diff --git a/www/extras/adminConsole/loginHistory.gif b/www/extras/adminConsole/loginHistory.gif index b0f570e10..504cdaacb 100644 Binary files a/www/extras/adminConsole/loginHistory.gif and b/www/extras/adminConsole/loginHistory.gif differ diff --git a/www/extras/adminConsole/navigation.gif b/www/extras/adminConsole/navigation.gif index b0f570e10..77038a252 100644 Binary files a/www/extras/adminConsole/navigation.gif and b/www/extras/adminConsole/navigation.gif differ diff --git a/www/extras/adminConsole/settings.gif b/www/extras/adminConsole/settings.gif index b0f570e10..186b1a5fd 100644 Binary files a/www/extras/adminConsole/settings.gif and b/www/extras/adminConsole/settings.gif differ diff --git a/www/extras/adminConsole/userProfiling.gif b/www/extras/adminConsole/userProfiling.gif index b0f570e10..33687acba 100644 Binary files a/www/extras/adminConsole/userProfiling.gif and b/www/extras/adminConsole/userProfiling.gif differ diff --git a/www/extras/assets/article.gif b/www/extras/assets/article.gif new file mode 100644 index 000000000..16f74defa Binary files /dev/null and b/www/extras/assets/article.gif differ diff --git a/www/extras/assets/calendar.gif b/www/extras/assets/calendar.gif new file mode 100644 index 000000000..b1b68e559 Binary files /dev/null and b/www/extras/assets/calendar.gif differ diff --git a/www/extras/assets/file.gif b/www/extras/assets/file.gif new file mode 100644 index 000000000..6bd6a5a70 Binary files /dev/null and b/www/extras/assets/file.gif differ diff --git a/www/extras/assets/folder.gif b/www/extras/assets/folder.gif new file mode 100644 index 000000000..a48503f4a Binary files /dev/null and b/www/extras/assets/folder.gif differ diff --git a/www/extras/assets/httpProxy.gif b/www/extras/assets/httpProxy.gif new file mode 100644 index 000000000..4bd1727cb Binary files /dev/null and b/www/extras/assets/httpProxy.gif differ diff --git a/www/extras/assets/image.gif b/www/extras/assets/image.gif new file mode 100644 index 000000000..453875e9c Binary files /dev/null and b/www/extras/assets/image.gif differ diff --git a/www/extras/assets/post.gif b/www/extras/assets/post.gif new file mode 100644 index 000000000..6da867745 Binary files /dev/null and b/www/extras/assets/post.gif differ diff --git a/www/extras/assets/product.gif b/www/extras/assets/product.gif new file mode 100644 index 000000000..bcfd5e33d Binary files /dev/null and b/www/extras/assets/product.gif differ diff --git a/www/extras/assets/search.gif b/www/extras/assets/search.gif new file mode 100644 index 000000000..afa7ccdc7 Binary files /dev/null and b/www/extras/assets/search.gif differ diff --git a/www/extras/assets/snippet.gif b/www/extras/assets/snippet.gif new file mode 100644 index 000000000..d391580aa Binary files /dev/null and b/www/extras/assets/snippet.gif differ diff --git a/www/extras/assets/syndicatedContent.gif b/www/extras/assets/syndicatedContent.gif new file mode 100644 index 000000000..52e8c74c0 Binary files /dev/null and b/www/extras/assets/syndicatedContent.gif differ diff --git a/www/extras/assets/web_services.gif b/www/extras/assets/web_services.gif new file mode 100644 index 000000000..91789fc2f Binary files /dev/null and b/www/extras/assets/web_services.gif differ