From 65404ed7fbc2296592ce8fcbabb6863f1f069994 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 23 Sep 2004 14:05:32 +0000
Subject: [PATCH] added a warning about passive profiling

---
 docs/changelog/6.x.x.txt              | 10 ++++++++++
 docs/previousVersion.sql              |  2 +-
 docs/upgrades/upgrade_6.2.3-6.2.4.sql |  3 +++
 docs/upgrades/upgrade_6.2.4-6.2.5.sql |  3 +++
 lib/WebGUI.pm                         |  2 +-
 lib/WebGUI/HTTP.pm                    |  2 ++
 lib/WebGUI/Operation/MetaData.pm      |  1 +
 lib/WebGUI/i18n/English/MetaData.pm   |  5 +++++
 8 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 docs/upgrades/upgrade_6.2.3-6.2.4.sql
 create mode 100644 docs/upgrades/upgrade_6.2.4-6.2.5.sql

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 3111bfd56..650bca502 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,3 +1,13 @@
+6.2.5
+ - Added missing upgrade file. This caused no harm to those that upgraded
+   without it.
+ - WebGUI::HTTP::setRedirect now also adds a meta redirect in case the web
+   server does not support 302 redirects, or the content is being cached out
+   to static files.
+ - Added a warning to the Passive Profiling feature that it may be illegal to
+   use that feature in some countries.
+
+
 6.2.4
  - Changed text processor to convert HTML tags into text rather than
    discarding them.
diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql
index d12e81a27..3e936ad55 100644
--- a/docs/previousVersion.sql
+++ b/docs/previousVersion.sql
@@ -3093,7 +3093,7 @@ CREATE TABLE webguiVersion (
 --
 
 
-INSERT INTO webguiVersion VALUES ('6.2.3','initial install',unix_timestamp());
+INSERT INTO webguiVersion VALUES ('6.2.4','initial install',unix_timestamp());
 
 --
 -- Table structure for table `wobject`
diff --git a/docs/upgrades/upgrade_6.2.3-6.2.4.sql b/docs/upgrades/upgrade_6.2.3-6.2.4.sql
new file mode 100644
index 000000000..074be6b97
--- /dev/null
+++ b/docs/upgrades/upgrade_6.2.3-6.2.4.sql
@@ -0,0 +1,3 @@
+insert into webguiVersion values ('6.2.4','upgrade',unix_timestamp());
+
+
diff --git a/docs/upgrades/upgrade_6.2.4-6.2.5.sql b/docs/upgrades/upgrade_6.2.4-6.2.5.sql
new file mode 100644
index 000000000..117732f7a
--- /dev/null
+++ b/docs/upgrades/upgrade_6.2.4-6.2.5.sql
@@ -0,0 +1,3 @@
+insert into webguiVersion values ('6.2.5','upgrade',unix_timestamp());
+
+
diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index ac32066d2..0661bf212 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "6.2.4";
+our $VERSION = "6.2.5";
 our $STATUS = "beta";
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/HTTP.pm b/lib/WebGUI/HTTP.pm
index b114c80ae..64c1cb035 100644
--- a/lib/WebGUI/HTTP.pm
+++ b/lib/WebGUI/HTTP.pm
@@ -18,6 +18,7 @@ package WebGUI::HTTP;
 use strict;
 use WebGUI::International;
 use WebGUI::Session;
+use WebGUI::Style;
 
 =head1 NAME
 
@@ -234,6 +235,7 @@ The URL to redirect to.
 sub setRedirect {
 	$session{http}{location} = shift;
 	setStatus("302", "Redirect");
+	WebGUI::Style::setMeta({"http-equiv"=>"refresh",content=>"0,".$session{http}{location}});
 }
 
 
diff --git a/lib/WebGUI/Operation/MetaData.pm b/lib/WebGUI/Operation/MetaData.pm
index b84d94db5..226c27701 100644
--- a/lib/WebGUI/Operation/MetaData.pm
+++ b/lib/WebGUI/Operation/MetaData.pm
@@ -175,6 +175,7 @@ sub www_manageMetaData {
 		-name=>"passiveProfilingEnabled",
                 -label=>WebGUI::International::get("Enable passive profiling ?", 'MetaData'),
                 -value=>$session{setting}{passiveProfilingEnabled},
+		-extras=>' onChange="alert(\''.WebGUI::International::get("Illegal Warning","MetaData").'\')" '
         );
 
 	$f->submit();
diff --git a/lib/WebGUI/i18n/English/MetaData.pm b/lib/WebGUI/i18n/English/MetaData.pm
index 731f6b7ec..89cc28f68 100644
--- a/lib/WebGUI/i18n/English/MetaData.pm
+++ b/lib/WebGUI/i18n/English/MetaData.pm
@@ -71,6 +71,11 @@ our $I18N = {
 		lastUpdated => 1089039511
 	},
 
+	'Illegal Warning' => {
+		message => q|Enabling this feature is illegal in some countries, like Australia. In addition, some countries require you to add a warning to your site if you use this feature. Consult your local authorities for local laws. Plain Black Corporation is not responsible for your illegal activities, regardless of ignorance or malace.|,
+		lastUpdated => 1089039511
+	},
+
 };
 
 1;