From cd95b46eeb08918b3bd74fd9d8595d0a02b8bb86 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 19 Aug 2010 10:33:04 +0000
Subject: [PATCH] Add/Update copyrights where applicable. Mark copyright on XML
 as CDATA to aviod any issues that might happen.

---
 etc/inc/wizardapp.inc                         | 29 +++++++++++++++++++
 .../www/wizards/traffic_shaper_wizard.inc     |  3 +-
 .../www/wizards/traffic_shaper_wizard.xml     |  7 +++--
 .../traffic_shaper_wizard_dedicated.inc       |  5 ++--
 .../traffic_shaper_wizard_dedicated.xml       |  8 ++---
 .../traffic_shaper_wizard_multi_all.inc       |  5 ++--
 .../traffic_shaper_wizard_multi_all.xml       |  8 ++---
 .../traffic_shaper_wizard_multi_lan.inc       |  5 ++--
 .../traffic_shaper_wizard_multi_lan.xml       |  8 ++---
 9 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/etc/inc/wizardapp.inc b/etc/inc/wizardapp.inc
index 7746ad543c..bb9a6e4c47 100644
--- a/etc/inc/wizardapp.inc
+++ b/etc/inc/wizardapp.inc
@@ -1,4 +1,33 @@
 <?php
+/*
+        part of pfSense (http://www.pfsense.org/)
+
+        Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
+        Copyright (C) 2006 Scott Ullrich - sullrich@pfsense.com.
+        Copyright (C) 2008-2010 Ermal Luçi
+        All rights reserved.
+
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions are met:
+
+        1. Redistributions of source code must retain the above copyright notice,
+           this list of conditions and the following disclaimer.
+
+        2. Redistributions in binary form must reproduce the above copyright
+           notice, this list of conditions and the following disclaimer in the
+           documentation and/or other materials provided with the distribution.
+
+        THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+        AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+        AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+        POSSIBILITY OF SUCH DAMAGE.
+*/
 
 $gamesplist = array();
 
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index a60a848d75..78344cf0da 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -1,12 +1,11 @@
 <?php
-/* $Id$ */
 /*
         traffic_shaper_wizard.inc
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
         Copyright (C) 2006 Scott Ullrich - sullrich@pfsense.com.
-      	Copyright (C) 2008 Ermal Luçi
+      	Copyright (C) 2008-2010 Ermal Luçi
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index fb08c12602..002ed24a20 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <pfsensewizard>
-	<copyright>
+	<copyright><![CDATA[
+	/*
 		traffic_shaper_wizard.xml
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2005 Bill Marquette - bill.marquette@gmail.com.
-      	Copyright (C) 2008 Ermal Luci
+      	Copyright (C) 2008-2010 Ermal Luci
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
@@ -28,7 +29,7 @@
         CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
-	*/</copyright>
+	*/]]></copyright>
 	<totalsteps>9</totalsteps>
 	<step>
 		<id>1</id>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index b4c786664a..b640c05c61 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -1,12 +1,11 @@
 <?php
-/* $Id$ */
 /*
-        traffic_shaper_wizard.inc
+        traffic_shaper_wizard_dedicated.inc
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
         Copyright (C) 2006 Scott Ullrich - sullrich@pfsense.com.
-       	Copyright (C) 2008 Ermal Luçi
+       	Copyright (C) 2008-2010 Ermal Luçi
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
index 123f05768c..56cd97d911 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <pfsensewizard>
-	<copyright>/* $Id$ */
-
+	<copyright><![CDATA[
+	/*
 	traffic_shaper_wizard_dedicated.xml
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2005 Bill Marquette - bill.marquette@gmail.com.
-	Copyright (C) 2008 Ermal Luci
+	Copyright (C) 2008-2010 Ermal Luci
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
         CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
-	*/</copyright>
+	*/]]></copyright>
 
 	<totalsteps>9</totalsteps>
 	<step>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
index 01257d4d16..7e88216337 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -1,12 +1,11 @@
 <?php
-/* $Id$ */
 /*
-        traffic_shaper_wizard.inc
+        traffic_shaper_wizard_multi_all.inc
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
         Copyright (C) 2006 Scott Ullrich - sullrich@pfsense.com.
-      	Copyright (C) 2008 Ermal Luçi
+      	Copyright (C) 2008-2010 Ermal Luçi
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
index 5a9f1a82d4..2b42d9228a 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <pfsensewizard>
-	<copyright>/* $Id$ */
-
+	<copyright><![CDATA[
+	/*
 	traffic_shaper_wizard_multi_all.xml
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2005 Bill Marquette - bill.marquette@gmail.com.
-	Copyright (C) 2008 Ermal Luci
+	Copyright (C) 2008-2010 Ermal Luci
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
         CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
-	*/</copyright>
+	*/]]></copyright>
 
 	<totalsteps>9</totalsteps>
 	<step>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
index 759ae6196e..9cdbf46434 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -1,12 +1,11 @@
 <?php
-/* $Id$ */
 /*
-        traffic_shaper_wizard.inc
+        traffic_shaper_wizard_multi_lan.inc
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
         Copyright (C) 2006 Scott Ullrich - sullrich@pfsense.com.
-      	Copyright (C) 2008 Ermal Luçi
+      	Copyright (C) 2008-2010 Ermal Luçi
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml
index c766507d21..f97932b894 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <pfsensewizard>
-	<copyright>/* $Id$ */
-
+	<copyright><![CDATA[
+	/*
 	traffic_shaper_wizard_multi_lan.xml
         part of pfSense (http://www.pfsense.org/)
 
         Copyright (C) 2005 Bill Marquette - bill.marquette@gmail.com.
-	Copyright (C) 2008 Ermal Luci
+	Copyright (C) 2008-2010 Ermal Luci
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
         CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
-	*/</copyright>
+	*/]]></copyright>
 
 	<totalsteps>9</totalsteps>
 	<step>