diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
index 2026b75..f801136 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
@@ -1,15 +1,33 @@
 <?php
 /**
-* Business logic page that provides business logic for adding a folder (uses
-* addFolderUI.inc for HTML)
-*
-* The following form variables are expected:
-* o $fFolderID - id of the folder the user is currently in
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 27 January 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * Business logic page that provides business logic for adding a folder (uses
+ * addFolderUI.inc for HTML)
+ *
+ * The following form variables are expected:
+ * o $fFolderID - id of the folder the user is currently in
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 if (checkSession()) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php
index e95976d..7776d92 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php
@@ -1,22 +1,41 @@
 <?php
 /**
-* Business logic for adding a new step in the folder collaboration process
-* Will used addFolderCollaborationUI.inc for presentation information
-*
-* Expected form variables:
-*	o $fFolderID - primary key of folder user is currently editing
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 6 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*
-*/
+ * $Id$
+ *
+ * Business logic for adding a new step in the folder collaboration process
+ * Will used addFolderCollaborationUI.inc for presentation information
+ *
+ * Expected form variables:
+ *	o $fFolderID - primary key of folder user is currently editing
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
+
 require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
 	if (isset($fFolderID)) {
 		//if a folder has been selected
 		include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-		include_once("$default->fileSystemRoot/lib/security/permission.inc");
+		include_once("$default->fileSystemRoot/lib/security/Permission.inc");
         include_once("$default->fileSystemRoot/lib/users/User.inc");
         require_once("$default->fileSystemRoot/presentation/Html.inc");
 		if (Permission::userHasFolderWritePermission($fFolderID)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
index 21ea136..fd8a195 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
@@ -1,26 +1,30 @@
 <?php
 /**
-* Presentation information for adding a new step to the folder collaboration flow
-* Used by addFolderCollaborationBL.php
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
-/*function renderHeading($sHeading) {
-    global $default;
-    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-    $sColor = $default->siteMap->getSectionColour($sSectionName, "th");
-    $sToRender  = "<table border=\"0\" width=\"600\">\n";
-    $sToRender .= "<tr align=\"left\"><th class=\"sectionHeading\" bgcolor=\"$sColor\">$sHeading</th></tr>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "</table>\n";
-    return $sToRender;
-}*/
-
+ * $Id$
+ *
+ * Presentation information for adding a new step to the folder collaboration flow
+ * Used by addFolderCollaborationBL.ph
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) {
 	global $default;
@@ -65,7 +69,7 @@ function getFolderPath($iFolderID) {
 
 function getGroupDropDown($iGroupID, $iFolderID) {
 	global $default;
-	$oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID");
+	$oPatternListBox = & new PatternListBox("$default->groups_table", "name", "id", "fGroupID");
 	$oPatternListBox->setPostBackOnChange(true);
 	$oPatternListBox->setOnChangeAction("setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fFolderID=$iFolderID');");
 	if (isset($iGroupID)) {
@@ -77,10 +81,10 @@ function getGroupDropDown($iGroupID, $iFolderID) {
 	//the groups in their unit
 	/*$oPatternListBox;
     if (Permission::userIsSystemAdministrator()) {
-        $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID");
+        $oPatternListBox = & new PatternListBox("$default->groups_table", "name", "id", "fGroupID");
     } else {
-        $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID", "GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
-        $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table AS GUL ON ST.id = GUL.group_id");
+        $oPatternListBox = & new PatternListBox("$default->groups_table", "name", "id", "fGroupID", "GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
+        $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table AS GUL ON ST.id = GUL.group_id");
     }                                    
 	$oPatternListBox->setEmptyErrorMessage("There are no groups");
 	$oPatternListBox->setIncludeDefaultValue(false);
@@ -98,8 +102,8 @@ function getUserDropDown($iGroupID) {
 		$iGroupID = -1;
 	}
 	
-	$oPatternListBox = & new PatternListBox("$default->owl_users_table", "name", "id", "fUserID", "UGL.group_id = $iGroupID");
-    $oPatternListBox->setFromClause("INNER JOIN $default->owl_users_groups_table AS UGL ON ST.id = UGL.user_id");
+	$oPatternListBox = & new PatternListBox("$default->users_table", "name", "id", "fUserID", "UGL.group_id = $iGroupID");
+    $oPatternListBox->setFromClause("INNER JOIN $default->users_groups_table AS UGL ON ST.id = UGL.user_id");
     
     if ($iGroupID == -1) {         
 		$oPatternListBox->setEmptyErrorMessage("Select a group");
@@ -110,7 +114,7 @@ function getUserDropDown($iGroupID) {
 
 function getRoleDropDown($iRoleID) {
 	global $default;	
-	$oPatternListBox = & new PatternListBox("$default->owl_roles_table", "name", "id", "fRoleID");
+	$oPatternListBox = & new PatternListBox("$default->roles_table", "name", "id", "fRoleID");
 	$oPatternListBox->setEmptyErrorMessage("There are no roles");
 	$oPatternListBox->setIncludeDefaultValue(false);
 	if (isset($iRoleID)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
index 473495e..2f1b4db 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
@@ -1,11 +1,29 @@
 <?php
 /**
-* Business logic for assigning a new document type to a folder
-* 
-* @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
-* @date 27 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * Business logic for assigning a new document type to a folder.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 if (checkSession()) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
index 8c04d0c..2e92315 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
@@ -2,12 +2,27 @@
 /**
  * $Id$
  *
- * Presentation information used by addFolderDocTypeBL.php
+ * Presentation information used by addFolderDocTypeBL.php.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 function getPage($iFolderID, $iDocumentTypeID) {
@@ -40,8 +55,8 @@ function getDocumentTypeDropDown($iDocumentTypeID, $iFolderID) {
 	// cunningly joined query courtesy of R. Cherry Esq.
 	$oPatternListBox = & new PatternListBox(null, null, null, null);
 	$oPatternListBox->setQuery("SELECT DTL.name AS display, DTL.id AS value " .  
-							   "FROM $default->owl_document_types_table AS DTL " .
-							   "LEFT OUTER JOIN $default->owl_folder_doctypes_table AS FDL ON FDL.document_type_id = DTL.id AND FDL.folder_id = $iFolderID " .
+							   "FROM $default->document_types_table AS DTL " .
+							   "LEFT OUTER JOIN $default->folder_doctypes_table AS FDL ON FDL.document_type_id = DTL.id AND FDL.folder_id = $iFolderID " .
 							   "WHERE folder_id IS NULL");
 	$oPatternListBox->setSelectName("fDocumentTypeID");
 	$oPatternListBox->setIncludeDefaultValue(false);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
index 74b588b..041a7ac 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation page that provides HTML for adding a new folder (used by
-* addFolderBL.php)
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 27 January 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*
-*/
+ * $Id$
+ *
+ * Presentation page that provides HTML for adding a new folder (used by addFolderBL.php)
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function renderBrowseAddPage($iFolderID) {
     global $default;
@@ -61,7 +77,7 @@ function getRightSide($iFolderID) {
 
 function getDocumentTypeDropDown() {
 	global $default;
-	$oPatternListBox = & new PatternListBox("$default->owl_document_types_table", "name", "id", "fDocumentTypeID");
+	$oPatternListBox = & new PatternListBox("$default->document_types_table", "name", "id", "fDocumentTypeID");
 	$oPatternListBox->setIncludeDefaultValue(false);
 	return $oPatternListBox->render();
 }
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
index 47d8af7..19660ac 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
@@ -1,22 +1,36 @@
 <?php
 /**
  * $Id$
- *
  * Business logic for adding folder access
  * addFolderAccessUI.inc for presentation information
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- * 
  * Expected form variables:
  *	o $fFolderID - primary key of folder user is currently editing
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
- * @version $Revision$ 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
+
 require_once("../../../../config/dmsDefaults.php");
 include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-include_once("$default->fileSystemRoot/lib/security/permission.inc");
+include_once("$default->fileSystemRoot/lib/security/Permission.inc");
 include_once("$default->fileSystemRoot/lib/users/User.inc");
 include_once("$default->fileSystemRoot/lib/groups/GroupFolderLink.inc");
 include_once("$default->fileSystemRoot/presentation/Html.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php
index b3dc42f..1f60dbd 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php
@@ -1,17 +1,34 @@
 <?php
 /**
-* Document collaboration business logic - contains business logic to set up
-* document approval process
-*
-* Expected form variables:
-*	o fFolderCollaborationID - 
-*	o fForAdd - 
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 28 January 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*
-*/
+ * $Id$
+ *
+ * Document collaboration business logic - contains business logic to set up
+ * document approval process
+ *
+ * Expected form variables:
+ *	o fFolderCollaborationID - 
+ *	o fForAdd - 
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 
@@ -21,7 +38,7 @@ if (checkSession()) {
 	require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
 	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 	require_once("collaborationUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");	
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");	
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
 	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
 	require_once("$default->fileSystemRoot/presentation/Html.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
index e5be9d0..f7e21b6 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation data for collaborationBL.php
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 28 January 2003
-* @package presentation.lookAndFeel.knowledgeTree.documentmanagement
-*
-*/
+ * $Id$
+ *
+ * Presentation data for collaborationBL.php.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function getFolderPath($iFolderID) {
 	global $default;
@@ -18,7 +35,7 @@ function getFolderPath($iFolderID) {
 
 function getGroupDropDown($iFolderCollaborationID, $iFolderID, $iGroupID) {
 	global $default;
-	$oPatternListBox = & new PatternListBox($default->owl_groups_table, "Name", "ID", "fGroupID");
+	$oPatternListBox = & new PatternListBox($default->groups_table, "Name", "ID", "fGroupID");
 	$oPatternListBox->setPostBackOnChange(true);
 	$oPatternListBox->setOnChangeAction("setActionAndSubmit('" . $_SERVER["userID"] . "?fFolderID=$iFolderID&fFolderCollaborationID=$iFolderCollaborationID');");
 	if (isset($iGroupID)) {
@@ -33,8 +50,8 @@ function getUserDropDown($iGroupID, $iUserID) {
 	if (!(isset($iGroupID))) {
 		$iGroupID = -1;
 	}
-	$oPatternListBox = & new PatternListBox($default->owl_users_table, "Name", "ID", "fUserID", "UGL.group_id = $iGroupID");
-	$oPatternListBox->setFromClause("INNER JOIN $default->owl_users_groups_table AS UGL ON UGL.user_id = ST.id");	
+	$oPatternListBox = & new PatternListBox($default->users_table, "Name", "ID", "fUserID", "UGL.group_id = $iGroupID");
+	$oPatternListBox->setFromClause("INNER JOIN $default->users_groups_table AS UGL ON UGL.user_id = ST.id");	
 	if (isset($iUserID)) {
 		$oPatternListBox->setSelectedValue($iUserID);
 	}
@@ -76,7 +93,7 @@ function getEditPage($iFolderCollaborationID, $iFolderID, $iGroupID, $iUserID, $
 
 function getRoleDropDown($iRoleID) {
 	global $default;
-	$oPatternListBox = & new PatternListBox("$default->owl_roles_table", "name", "id", "fRoleID");		
+	$oPatternListBox = & new PatternListBox("$default->roles_table", "name", "id", "fRoleID");		
 	$oPatternListBox->setEmptyErrorMessage("There are no users in this group");		
 	if (isset($iRoleID)) {
 		$oPatternListBox->setSelectedValue($iRoleID);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
index 92fe132..a3053dd 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
@@ -1,17 +1,34 @@
 <?php
-
 /**
-* Business logic for deleting a dependant document
-*
-* Expected variables:
-*	$fFolderCollaborationID: primary key of folder collaboration to check
-*	$fFolderID: folder we are currently editing
-*	$fDependantDocumentTemplateID: primary key of dependant document to be deleted
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 14 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * Business logic for deleting a dependant document
+ *
+ * Expected variables:
+ *	$fFolderCollaborationID: primary key of folder collaboration to check
+ *	$fFolderID: folder we are currently editing
+ *	$fDependantDocumentTemplateID: primary key of dependant document to be deleted
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc
index 9c9a1f4..6dca14a 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc
@@ -1,23 +1,29 @@
 <?php
-
-/** Presentation logic for deleting a dependant document
-*
-* @author Rob Cherry
-* @date 22 May 2002
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement 
-*/
-
-/*function renderHeading($sHeading) {
-    global $default;
-    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-    $sColor = $default->siteMap->getSectionColour($sSectionName, "th");
-    $sToRender  = "<table border=\"0\" width=\"600\">\n";
-    $sToRender .= "<tr align=\"left\"><th class=\"sectionHeading\" bgcolor=\"$sColor\">$sHeading</th></tr>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "</table>\n";
-    return $sToRender;
-}*/
+/**
+ * $Id$
+ *
+ * Presentation logic for deleting a dependant document.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function getPage($iFolderID, $iFolderCollaborationID, $sDocumentTitle, $sUserName, $sTemplateDocument) {
 	global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
index 7fbe936..ac2d72c 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
@@ -1,13 +1,29 @@
 <?php
 /**
+ * $Id$
+ *
  * Business logic concerned with the deletion of a folder.
  * Will use deleteFolderUI.inc for presentation functionality.
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 require_once("../../../../config/dmsDefaults.php");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
index 7a9540c..f9b84b6 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
@@ -1,24 +1,42 @@
 <?php
 /**
-* Business logic for delete a new step from the folder collaboration process
-* Will use deleteFolderCollaborationUI.inc for presentation information
-*
-* Expected form variables:
-* o $fFolderID - primary key of folder user is currently editing
-* o $fFolderCollaborationID - primary key of folder collaboration to delete
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 6 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*
-*/
+ * $Id$
+ *
+ * Business logic for delete a new step from the folder collaboration process
+ * Will use deleteFolderCollaborationUI.inc for presentation information
+ *
+ * Expected form variables:
+ * o $fFolderID - primary key of folder user is currently editing
+ * o $fFolderCollaborationID - primary key of folder collaboration to delete
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
+
 require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     if (isset($fFolderID) && isset($fFolderCollaborationID)) {
         //if a folder has been selected
         include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-        include_once("$default->fileSystemRoot/lib/security/permission.inc");
+        include_once("$default->fileSystemRoot/lib/security/Permission.inc");
         include_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
         include_once("$default->fileSystemRoot/lib/groups/Group.inc");
         include_once("$default->fileSystemRoot/lib/roles/Role.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
index d91e5f6..66beb6f 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
@@ -1,25 +1,30 @@
 <?php
 /**
-* Presentation information for deletion of folder collaboration entry. 
-* Will be used by deleteFolderCollaborationBL.php
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 6 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
-/*function renderHeading($sHeading) {
-    global $default;
-    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-    $sColor = $default->siteMap->getSectionColour($sSectionName, "th");
-    $sToRender  = "<table border=\"0\" width=\"600\">\n";
-    $sToRender .= "<tr align=\"left\"><th class=\"sectionHeading\" bgcolor=\"$sColor\">$sHeading</th></tr>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "</table>\n";
-    return $sToRender;
-}*/
+ * $Id$
+ *
+ * Presentation information for deletion of folder collaboration entry. 
+ * Will be used by deleteFolderCollaborationBL.php.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function getFolderPath($iFolderID) {
 	global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
index bb3e1ed..e7fd910 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
@@ -1,11 +1,29 @@
 <?php
 /**
-* Business logic for removing a document type from a folder
-* 
-* @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
-* @date 27 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * Business logic for removing a document type from a folder.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 if (checkSession()) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
index 6d5d90e..4709430 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
@@ -1,12 +1,29 @@
 <?php
-
 /**
-* Presentation information used by deleteFolderDocTypeUI.inc
-* 
-* @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
-* @date 27 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * Presentation information used by deleteFolderDocTypeUI.inc.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function getPage($iFolderID) {
 	global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
index 2429717..c104759 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
@@ -1,13 +1,28 @@
 <?php
-
 /**
- * Presentation information for deleteFolderBL.php
+ * $Id$
+ *
+ * Presentation information for deleteFolderBL.php.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 function getFolderPath($iFolderID) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
index a4ad61e..3cf30be 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
@@ -5,20 +5,34 @@
  * Business logic for deleting a folder access entry
  * addFolderAccessUI.inc for presentation information
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- * 
  * Expected form variables:
  * o $fFolderID - primary key of folder user is currently editing 
  * o $fGroupFolderLinkID - primary key of group folder link user to delete
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
- * @version $Revision$ 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 require_once("../../../../config/dmsDefaults.php");
 include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-include_once("$default->fileSystemRoot/lib/security/permission.inc");
+include_once("$default->fileSystemRoot/lib/security/Permission.inc");
 include_once("$default->fileSystemRoot/lib/groups/GroupFolderLink.inc");
 include_once("$default->fileSystemRoot/lib/groups/Group.inc");
 include_once("$default->fileSystemRoot/lib/roles/Role.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php
index 25b2641..76d89e0 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php
@@ -7,13 +7,27 @@
  * Expected form variables:
  * o $fFolderID - primary key of folder user is currently browsing
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
- * @date 2 February 2003
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
-
+ 
 require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -21,7 +35,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc");
     require_once("editUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
     require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
index cf4b4e6..9fc23f9 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
@@ -5,20 +5,34 @@
  * Business logic for editing a folder access entry
  * groupFolderLinkUI.inc for presentation information
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- * 
  * Expected form variables:
  * o $fFolderID - primary key of folder user is currently editing 
  * o $fGroupFolderLinkID - primary key of group folder link user to delete
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
- * @version $Revision$ 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 require_once("../../../../config/dmsDefaults.php");
 include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-include_once("$default->fileSystemRoot/lib/security/permission.inc");
+include_once("$default->fileSystemRoot/lib/security/Permission.inc");
 include_once("$default->fileSystemRoot/lib/groups/GroupFolderLink.inc");
 include_once("$default->fileSystemRoot/lib/groups/Group.inc");
 include_once("$default->fileSystemRoot/lib/roles/Role.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
index 9b1fce0..496c0b9 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
@@ -3,13 +3,27 @@ require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
 /**
  * $Id$
  *
- * Presentation information used for folder editing.  Used by editBL.php
+ * Presentation information used for folder editing.  Used by editBL.php.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
- * @date 2 February 2003
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 function getFolderPath($iFolderID) {
@@ -25,7 +39,7 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") {
 	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
 	$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
 	$sQuery = "SELECT F.id, F.name, F.description, F.is_public " .
-			"FROM $default->owl_folders_table AS F " .
+			"FROM $default->folders_table AS F " .
 			"WHERE F.id = $iFolderID";
 			
 			
@@ -57,9 +71,9 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
 	//had to use coalesce and left outer join for user_id because this column was a new addition
 	//and the user_ids for existing documents before this change will be null
 	$sQuery = "SELECT GFAL.id as id, GFAL.folder_id AS folder_id, G.name AS group_name, G.id AS group_id, GFAL.role_id AS role_id, R.name AS role_name, GFAL.precedence AS precedence, COALESCE(U.id, -1) AS user_id, COALESCE(U.name, 'Not Assigned') AS user_name, 'Edit' as edit, 'Delete' as del, 'Dependant docs' as depn " .
-				"FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " .
-				"INNER JOIN $default->owl_groups_table AS G ON G.id = GFAL.group_id " .
-				"LEFT OUTER JOIN $default->owl_users_table AS U ON U.id = GFAL.user_id " .				 
+				"FROM $default->groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " .
+				"INNER JOIN $default->groups_table AS G ON G.id = GFAL.group_id " .
+				"LEFT OUTER JOIN $default->users_table AS U ON U.id = GFAL.user_id " .				 
 				"WHERE GFAL.folder_id = $iFolderID " .
 				"ORDER BY GFAL.precedence, role_name ASC";
 	
@@ -90,7 +104,7 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
 function getFolderDocTypes($iFolderID, $sDivName) {
 	global $default;
 	$sQuery = "SELECT FDL.id, FDL.folder_id, FDL.document_type_id, DTL.name, 'Remove' AS del " .
-				"FROM $default->owl_folder_doctypes_table AS FDL INNER JOIN $default->owl_document_types_table AS DTL ON FDL.document_type_id = DTL.id " .
+				"FROM $default->folder_doctypes_table AS FDL INNER JOIN $default->document_types_table AS DTL ON FDL.document_type_id = DTL.id " .
 				"WHERE FDL.folder_id = $iFolderID " .
 				"ORDER BY DTL.name ASC";
 	
@@ -115,8 +129,8 @@ function getFolderDocTypes($iFolderID, $sDivName) {
 function getFolderGroupAccess($iFolderID, $sDivName) {
 	global $default;
 	$sQuery = "SELECT GFL.id as id, GFL.group_id AS group_id, GFL.folder_id AS folder_id, GFL.can_read AS can_read, GFL.can_write AS can_write, GL.name AS group_name, 'Edit' as edit, 'Delete' as del " .	
-			  "FROM $default->owl_groups_folders_table AS GFL " .
-              "INNER JOIN $default->owl_groups_table AS GL ON GFL.group_id = GL.id " .
+			  "FROM $default->groups_folders_table AS GFL " .
+              "INNER JOIN $default->groups_table AS GL ON GFL.group_id = GL.id " .
 			  "WHERE GFL.folder_id = $iFolderID";
 	
 	$aColumns = array("group_name", "can_read", "can_write", "edit", "del");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
index 15a5400..1f7da02 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
@@ -1,16 +1,28 @@
 <?php
-
 /**
  * $Id$
  *
- * HTML information for folder stuff
+ * Common folder UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * @version $Revision$
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
- * @date 23 January 2003
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 /**
@@ -82,7 +94,7 @@ function renderFolderPath($iFolderID, $sLinkURL, $bDisplayLinks = true) {
 function renderFolderList($fFolderID, $sLinkURL) {
     global $default;
     $sQuery = "SELECT F.id AS id, F.name AS name " .
-              "FROM $default->owl_folders_table AS F " .
+              "FROM $default->folders_table AS F " .
               "WHERE F.parent_id = " . $fFolderID . " " .
               "ORDER BY F.name ASC";
      	
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc
index 9265b9c..674089b 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc
@@ -1,11 +1,29 @@
 <?php
 /**
+ * $Id$
+ *
  * Presentation information for adding folder access
  * Used by addFolderAccessBL.php
  *
- * @version $Revision$ 
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 function getFolderPath($iFolderID) {
@@ -102,10 +120,10 @@ function getAccessCheckBoxes($bReadOnly, $fCanRead = false, $fCanWrite = false) 
 function getGroupDropDown($iGroupID = -1) {
 	global $default;
     if (Permission::userIsSystemAdministrator()) {
-        $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID");
+        $oPatternListBox = & new PatternListBox("$default->groups_table", "name", "id", "fGroupID");
     } else {
-        $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID", "GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
-        $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table AS GUL ON ST.id = GUL.group_id");
+        $oPatternListBox = & new PatternListBox("$default->groups_table", "name", "id", "fGroupID", "GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
+        $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table AS GUL ON ST.id = GUL.group_id");
     }
 	$oPatternListBox->setEmptyErrorMessage("There are no groups");
 	$oPatternListBox->setIncludeDefaultValue(false);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataBL.php
index 7f05b92..d8f4954 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataBL.php
@@ -1,15 +1,28 @@
 <?php
-
 /**
  * $Id$
  *
  * Presentation information used for folder data editing.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
 require_once("../../../../config/dmsDefaults.php");
@@ -18,7 +31,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
     require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
index 58ed518..ddf066a 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
@@ -4,20 +4,33 @@
  *
  * Presentation information used for folder data editing.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ * @package foldermanagement
  */
 
-
 function getFolderData($iFolderID, $sStatusMessage = "") {
 	global $default;
 	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
 	$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
 	$sQuery = "SELECT F.id, F.name, F.description, F.is_public " .
-			"FROM $default->owl_folders_table AS F " .
+			"FROM $default->folders_table AS F " .
 			"WHERE F.id = $iFolderID";
 			
 	$sql = $default->db;
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
index f35b84b..9f50ee7 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
@@ -1,16 +1,33 @@
 <?php
-
 /**
-* Business logic for linking document creation to a folder collaboration step
-*
-* Expected variables:
-*	$fFolderCollaborationID: primary key of folder collaboration to check
-*	$fFolderID: folder we are currently editing
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 14 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * Business logic for linking document creation to a folder collaboration step
+ *
+ * Expected variables:
+ *	$fFolderCollaborationID: primary key of folder collaboration to check
+ *	$fFolderID: folder we are currently editing
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
index f4297bb..7de69f4 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
@@ -1,5 +1,29 @@
 <?php
-
+/**
+ * $Id$
+ *
+ * Dependent documents UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package foldermanagement
+ */
 
 function getFolderPath($iFolderID) {
 	global $default;
@@ -128,7 +152,7 @@ function getAddPage($iFolderCollaborationID, $iFolderID, $iUnitID, $sDocumentTit
 
 function getUserDropDown($iUnitID, $iUserID = null) {
 	global $default;	
-	$oPatternListBox = & new PatternListBox($default->owl_users_table, "Name", "id", "fUserID", "GUL.unit_id = $iUnitID");
+	$oPatternListBox = & new PatternListBox($default->users_table, "Name", "id", "fUserID", "GUL.unit_id = $iUnitID");
 	$sFromClause = "INNER join users_groups_link AS UGL ON UGL.user_id = ST.id " .
 					"INNER JOIN groups_units_link AS GUL ON GUL.group_id = UGL.group_id ";
 	$oPatternListBox->setFromClause($sFromClause);
@@ -142,7 +166,7 @@ function getUserDropDown($iUnitID, $iUserID = null) {
 
 function getUnitDropDown($iFolderCollaborationID, $iFolderID, $iUnitID = null) {
 	global $default;	
-	$oPatternListBox = & new PatternListBox($default->owl_units_table, "Name", "id", "fUnitID");	
+	$oPatternListBox = & new PatternListBox($default->units_table, "Name", "id", "fUnitID");	
 	$oPatternListBox->setPostBackOnChange(true);
 	$oPatternListBox->setOnChangeAction("setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fFolderID=$iFolderID&fFolderCollaborationID=$iFolderCollaborationID&fForAdd=1')");
 	if (isset($iUnitID)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/preferences/editPrefsSuccess.php b/presentation/lookAndFeel/knowledgeTree/preferences/editPrefsSuccess.php
index 4319453..d3eb147 100644
--- a/presentation/lookAndFeel/knowledgeTree/preferences/editPrefsSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/preferences/editPrefsSuccess.php
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information when updating group properties is successful
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit user preferences success page.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package preferences
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 require_once("editUserPrefsUI.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsBL.php b/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsBL.php
index a529590..28d79a0 100644
--- a/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for editing a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit user preferences.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package preferences
+ */
 require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
 	require_once("editUserPrefsUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 	require_once("$default->fileSystemRoot/lib/users/User.inc");
 	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
diff --git a/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc b/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc
index 8298632..2496c31 100644
--- a/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc
@@ -1,19 +1,36 @@
 <?php
 /**
-* Presentation information for renaming a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit user preferences UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package preferences
+ */
 
 function getUserDetailsPage($iUserID) {
 	
 	global $default;
 	$oUser = null;
 
-	$sQuery =  "SELECT * FROM $default->owl_users_table WHERE id = $iUserID";
+	$sQuery =  "SELECT * FROM $default->users_table WHERE id = $iUserID";
 	$aDisplayColumns = array("name","email", "mobile", "email_notification"); 
 	$aStoreColumns = array("name","email", "mobile", "email_notification") ;
 	$aColumnNames = array("Name: ", "Email Address: ", "Mobile Number: ", "Email Notification: ");
@@ -21,7 +38,7 @@ function getUserDetailsPage($iUserID) {
 	$aDatabaseColumnTypes = array(1,1,1,2);
 	
 	// get list of User properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes
-	$oPattern = & new PatternEditableListFromQuery($sQuery, $default->owl_users_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
+	$oPattern = & new PatternEditableListFromQuery($sQuery, $default->users_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
 	$oPattern->setUniqueName("userEdit");
 	$oPattern->setColumnsRequired(array(1,0,0,0));
 
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
index 2a521d6..38c5164 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
@@ -4,10 +4,26 @@
  *
  * Business logic used to perform advanced search.  Advanced search allows
  * users to search by meta data types
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
- * @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
- * @date 26 February 2003
- * @package presentation.knowledgeTree.search
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package search
  */
 
 require_once("../../../../config/dmsDefaults.php");
@@ -18,7 +34,7 @@ if (checkSession()) {
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
 	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 	require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 	require_once("$default->fileSystemRoot/presentation/Html.inc");
 	require_once("advancedSearchUI.inc");
 	require_once("advancedSearchUtil.inc");	
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
index 64e1079..64830cb 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
@@ -4,14 +4,30 @@
  *
  * Presentation logic used by advancedSearchBL.php
  *
- * @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
- * @date 26 February 2003 
- * @package presentation.lookAndFeel.knowledgeTree.search
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package search
  */
 
 function getMetaData($aMetaTagIDs) {
 	global $default;	
-	$sQuery = "SELECT name, id FROM $default->owl_fields_table ORDER BY name ASC";
+	$sQuery = "SELECT name, id FROM $default->document_fields_table ORDER BY name ASC";
 	
 	$sql = $default->db;
 	$sql->query($sQuery);
@@ -83,11 +99,11 @@ function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sStatu
 	global $default;
 					
 	$sQuery = "SELECT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id folder_id, D.id document_id, D.name AS document_name, COUNT(D.id) AS doc_count " .
-			"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_folders_table AS F ON D.folder_id = F.id " .
-			"INNER JOIN $default->owl_document_fields_table AS DFL ON DFL.document_id = D.id " .
-			"INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " . 
+			"FROM $default->documents_table AS D INNER JOIN $default->folders_table AS F ON D.folder_id = F.id " .
+			"INNER JOIN $default->document_fields_link_table AS DFL ON DFL.document_id = D.id " .
+			"INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " . 
 			"INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.ID " .
-			"INNER JOIN $default->owl_status_table AS SL on D.status_id=SL.id " .						
+			"INNER JOIN $default->status_table AS SL on D.status_id=SL.id " .						
 			"WHERE DF.ID IN ($sMetaTagIDs) " .
 			"AND (" . $sSQLSearchString . ") " .
 			"AND SDUL.user_id = " . $_SESSION["userID"] . " " .
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUtil.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUtil.inc
index 9947ed0..e791659 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUtil.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUtil.inc
@@ -3,11 +3,27 @@
  * $Id$
  *
  * Business logic used to perform advanced search.  Advanced search allows
- * users to search by meta data types
+ * users to search by meta data types.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
- * @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
- * @date 26 February 2003
- * @package presentation.knowledgeTree.search
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package search
  */
 
 /**
diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
index 02d48c6..1a0047a 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
@@ -1,17 +1,38 @@
 <?php
 /**
-* Business logic used to perform document searches
-* 
-* Expected form variables
-*	o	fSearchText - text to search on
-*	o	fBrowseType - current browse type
-*	o	fFolderID - folder currently being browsed (if a folder is being browsed)
-*	o	fDocumentID - document currently being browsed (if a document is being browsed)
-*	o	fCategoryName - name of category being browsed (if a category is being browsed)
-*	o	fDocTypeID - name of document type being browsed (if a doc type is being browsed)
-*
-*
-*/
+ * $Id$
+ *
+ * Business logic used to perform document searches
+ * 
+ * Expected form variables
+ *	o	fSearchText - text to search on
+ *	o	fBrowseType - current browse type
+ *	o	fFolderID - folder currently being browsed (if a folder is being browsed)
+ *	o	fDocumentID - document currently being browsed (if a document is being browsed)
+ *	o	fCategoryName - name of category being browsed (if a category is being browsed)
+ *	o	fDocTypeID - name of document type being browsed (if a doc type is being browsed)
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package search
+ */
+
 require_once("../../../../config/dmsDefaults.php");
 if (checkSession()) {	
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
index d737aaf..b05e4c2 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
@@ -2,11 +2,27 @@
 /**
  * $Id$
  *
- * Presentation functionality used to searchDocumentBL.php
+ * Presentation functionality used to searchDocumentBL.php.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  * 
- * @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
- * @date 20 February 2003
- * @package presentation.lookAndFeel.documentmanagement
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package search
  */
 
 function getHeading() {
@@ -21,11 +37,11 @@ function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCate
 	global $default;
 
 	$sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id AS folder_id, D.id AS document_id, D.name AS document_name, ROUND(MATCH(DT.document_text) AGAINST ('" . $sKeywords . "'),3) AS score " . 
-				"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " .
-				"INNER JOIN $default->owl_document_fields_table AS DFL ON DT.document_id=DFL.document_id " .								
-				"INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " .
-				"INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " .
-				"INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " .
+				"FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " .
+				"INNER JOIN $default->document_fields_link_table AS DFL ON DT.document_id=DFL.document_id " .								
+				"INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " .
+				"INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " .
+				"INNER JOIN $default->folders_table AS F on F.ID = D.folder_id " .
 				"INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
 				"WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
 				"AND SDUL.user_id = " . $_SESSION["userID"] . " " .
@@ -56,9 +72,9 @@ function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCate
 function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $iDocTypeID) {
 	global $default;
 	$sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id AS folder_id, D.id AS document_id, D.name AS document_name, ROUND(MATCH(DT.document_text) AGAINST ('" . $sKeywords . "'),3) AS score " . 
-				"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " .								 
-				"INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " .
-				"INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " .
+				"FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " .								 
+				"INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " .
+				"INNER JOIN $default->folders_table AS F on F.ID = D.folder_id " .
 				"INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
 				"WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
 				"AND SDUL.user_id = " . $_SESSION["userID"] . " ";
@@ -89,9 +105,9 @@ function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $i
 function getSeachResultsByFolder($iFolderID, $iStartIndex, $sKeywords) {
 	global $default;
 	$sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id AS folder_id, D.id AS document_id, D.name AS document_name, ROUND(MATCH(DT.document_text) AGAINST ('" . $sKeywords . "'),3) AS score " . 
-				"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " .				
-				"INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " .
-				"INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " .
+				"FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " .				
+				"INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " .
+				"INNER JOIN $default->folders_table AS F on F.ID = D.folder_id " .
 				"INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
 				"WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
 				"AND SDUL.user_id = " . $_SESSION["userID"] . " " .
diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php
index b045166..7c45bcc 100644
--- a/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php
@@ -4,30 +4,37 @@ require_once("../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc");
 require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc");
 require_once("$default->fileSystemRoot/presentation/Html.inc");
-
 /**
  * $Id$
- *  
- * Adds a document or folder subscription for a user.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Adds a document or folder subscription for a user.
  *
- * @version $Revision$
- * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.subscriptions
- */
-
-/*
  * Querystring variables
  * ---------------------
  * fFolderID - the folder to subscribe the current user to (optional)
  * fDocumentID - the document to subscribe the current user to (optional)
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package subscriptions
  */
 
-// -------------------------------
-// page start
-// -------------------------------
-
 /**
  * Checks if the user has read permission on the subscription content
  *
diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php
index 348da71..7e288ee 100644
--- a/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/manageSubscriptionsBL.php
@@ -6,24 +6,33 @@ require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
 require_once("subscriptionUI.inc");
 require_once("$default->fileSystemRoot/presentation/Html.inc");
-
 /**
  * $Id$
- *  
+ *
  * Manages subscriptions- displays all current subscriptions and allows
  * multiple unsubscribes.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.subscriptions
+ * @package subscriptions
  */
 
-// -------------------------------
-// page start
-// -------------------------------
-
 // only if we have a valid session
 if (checkSession()) {
 
diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php
index dcf1226..02939b9 100644
--- a/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/removeSubscriptionBL.php
@@ -6,30 +6,37 @@ require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
 require_once("subscriptionUI.inc");
 require_once("$default->fileSystemRoot/presentation/Html.inc");
-
 /**
  * $Id$
- *  
- * Removes a document or folder subscription for a user.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Removes a document or folder subscription for a user.
  *
- * @version $Revision$
- * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.subscriptions
- */
-
-/*
  * Querystring variables
  * ---------------------
  * fFolderID - the folder to subscribe the current user to (optional)
- * fDocumentID - the document to subscribe the current user to (optional)
+ * fDocumentID - the document to subscribe the current user to (optional) 
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package subscriptions
  */
 
-// -------------------------------
-// page start
-// -------------------------------
-
 // only if we have a valid session
 if (checkSession()) {
     
diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
index e55b63c..a1d7a1e 100644
--- a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
@@ -1,15 +1,28 @@
 <?php
-
 /**
  * $Id$
  *
  * UI for subscription pages.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.subscriptions
+ * @package subscriptions
  */
     
 /**
diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/viewAlertBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/viewAlertBL.php
index 27519e3..9211326 100644
--- a/presentation/lookAndFeel/knowledgeTree/subscriptions/viewAlertBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/viewAlertBL.php
@@ -2,31 +2,38 @@
 
 require_once("../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc");
-
 /**
  * $Id$
- *  
+ *
  * Clears the subscription alert, and forwards to the content that
  * triggered the alert.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
- *
- * @version $Revision$
- * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.subscriptions
- */
-
-/*
  * Querystring variables
  * ---------------------
  * fSubscriptionID - the subscription to view
  * fSubscriptionType - the subscription type (folder,document) to view
+ *  
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package subscriptions
  */
 
-// -------------------------------
-// page start
-// -------------------------------
-
 // only if we have a valid session
 if (checkSession()) {