various miscellaneous stuff

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 /

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") {

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)

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 "";
 }