diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
index cd73654..21e6484 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
@@ -1,13 +1,29 @@
 <?php
 /**
-* BL information for adding a Link
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit Document CheckOut Status.
+ *
+ * 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 administration.doccheckoutmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -16,8 +32,8 @@ if (checkSession()) {
 	require_once("editDocCheckoutUI.inc");
 	require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");	
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
-	require_once("$default->fileSystemRoot/lib/links/link.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
+	require_once("$default->fileSystemRoot/lib/links/Link.inc");
 	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
 	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
index 35f1508..4c5a625 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
@@ -1,13 +1,30 @@
 <?php
 /**
-* Presentation information for adding a link
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit Document CheckOut Status 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 administration.doccheckoutmanagement
+ */
+ 
 function getEditCheckoutSuccessPage(){
 	global $default;
 	return statusPage("Edit Document Checkout", "Succesfully updated document checkout.", "", "listDocs");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
index 13ac9f7..cd4c623 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
@@ -1,12 +1,29 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List checked out documents.
+ *
+ * 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 Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.doccheckoutmanagement
+ */
 
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
index 3260c7b..e480277 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a document field.
+ *
+ * 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 administration.docfieldmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.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/administration/docfieldmanagement/addDocFieldSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php
index 13ed819..7cf8419 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information when adding a Org is successful
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Succesfull document field addition.
+ *
+ * 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 administration.docfieldmanagement
+ */
 
 require_once("../../../../../config/dmsDefaults.php");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
index d4fca18..724ca6e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
@@ -1,12 +1,30 @@
 <?php
 /**
-* Presentation information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add document field 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 administration.docfieldmanagement
+ */
+
 // get add pages
 function getPage() {
 
@@ -15,7 +33,7 @@ function getPage() {
 	$aParameterNumbers = array(0,1,2,3);
 	$aDisplayColumnTypes = array(1,3,2,2);
 	$aRequired = array(1,1);
-	$aDropDownListTableNames = array(1 => "$default->owl_data_types_table");
+	$aDropDownListTableNames = array(1 => "$default->data_types_table");
 	$aDropDownListValueColumns = array(1=>'name');
 	$aDropDownListDisplayColumns = array(1=>'name');
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
index bef324f..f79a91d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
@@ -1,5 +1,30 @@
 <?php
 /**
+ * $Id$
+ *
+ * Edit document field.
+ *
+ * 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 administration.docfieldmanagement
+ */
+/**
 * BL information for adding a DocField
 *
 * @author Mukhtar Dharsey
@@ -13,7 +38,7 @@ if (checkSession()) {
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
 	require_once("editDocFieldUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 	require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
 	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
index b280580..9c2d89b 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
@@ -1,12 +1,30 @@
 <?php
 /**
-* BL information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit document field lookups.
+ *
+ * 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 administration.docfieldmanagement
+ */
+
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -17,7 +35,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/documentmanagement/MetaData.inc");
     require_once("$default->fileSystemRoot/lib/users/User.inc");
     require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
index a0c81a6..f8cd170 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
@@ -1,13 +1,30 @@
 <?php
 /**
-* Presentation information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit document field lookups 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 administration.docfieldmanagement
+ */
+ 
 function getLookupNotSet() {
     global $default;
 
@@ -67,7 +84,7 @@ function getGroupPage($fDocFieldID) {
            
     $LookupDisplay .= "<b>Current Lookups</b><br>\n";	
 	$sQuery = 	" Select * " .	
-				" From " . $default->owl_document_fields_lookup_tables .
+				" From " . $default->document_fields_lookup_tables .
 				" WHERE document_field_id=" . $fDocFieldID;        
 
  	$aColumns = array("name");
@@ -215,10 +232,10 @@ function getPageSuccess() {
 function getUserDisplay($oUser) {
     global $default;
     if (!isset($oUser)) {
-        $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
+        $oPatternListBox = & new PatternListBox($default->users_table, "username", "id", "fUserID");
         if (Permission::userIsUnitAdministrator()) {
-            $oPatternListBox->setFromClause("INNER JOIN $default->owl_users_groups_table UGL on ST.id=UGL.user_id " .
-                                            "INNER JOIN $default->owl_groups_units_table GUL on UGL.group_id=GUL.group_id");
+            $oPatternListBox->setFromClause("INNER JOIN $default->users_groups_table UGL on ST.id=UGL.user_id " .
+                                            "INNER JOIN $default->groups_units_table GUL on UGL.group_id=GUL.group_id");
             $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
         }
         $oPatternListBox->setPostBackOnChange(true);
@@ -235,14 +252,14 @@ function getOtherGroupDisplay($oGroup) {
 	if (!isset($oGroup)) {
         if (Permission::userIsSystemAdministrator()) {
             // if this is the system administrator, prepend group names with unit name
-            $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fOtherGroupID");
+            $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fOtherGroupID");
             $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " .
                                             "LEFT OUTER JOIN units_lookup UL on GUL.unit_id=UL.id");
             $oPatternListBox->setCompositeDisplayName("DISTINCT COALESCE(CONCAT(CONCAT(UL.name, '-'),ST.name),ST.name)");
         } else if (Permission::userIsUnitAdministrator()) {
             // else if this is a unit administrator, only display the groups in your unit
-            $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fOtherGroupID");
-            $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id");
+            $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fOtherGroupID");
+            $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id");
             $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
         }
         return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
index 0e93f06..260ab01 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit document field 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 administration.docfieldmanagement
+ */
 
 // if its the manual edit page..then display normally
 function getEditPage($iDocFieldID) {
@@ -117,7 +134,7 @@ function getEditPageFail() {
 function getDocFieldDisplay($oDocField) {
     global $default;
     if (!isset($oDocField)) {
-        $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
+        $oPatternListBox = & new PatternListBox($default->document_fields_table, "name", "id", "fDocFieldID");
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();
     } else {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsBL.php
index 3937292..e5a0fad 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for listing Documemnt Fields	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List document fields.
+ *
+ * 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 Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.docfieldmanagement
+ */
 
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/users/User.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/visualpatterns/PatternTableSqlQuery.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");    
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsUI.inc
index b22dbf8..af14f17 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/listDocFieldsUI.inc
@@ -1,19 +1,36 @@
 <?php
 /**
-* Presentation information for listing Documemnt Fields
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * List document fields 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 Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.docfieldmanagement
+ */
+ 
 function getDocumentFields() {
 	global $default;
 	
 	$sQuery = 	"SELECT id as DocFieldID, name as DocFieldName, data_type, is_generic, has_lookup, " . 
 				"'Edit', 'Delete', 'Edit Lookups' " .
-				"FROM " . $default->owl_fields_table . " " .
+				"FROM " . $default->document_fields_table . " " .
 				"ORDER BY name";
 	
     $aColumns = array("DocFieldName", "data_type", "is_generic", "has_lookup","Edit", "Delete", "Edit Lookups" );
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
index f4002eb..848359e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add MetaData Entry.
+ *
+ * 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 administration.docfieldmanagement.metadatamanagement
+ */
 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("addMetaDataUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/MetaData.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
index 12b971d..64f4343 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
@@ -1,5 +1,29 @@
 <?php
-
+/**
+ * $Id$
+ *
+ * Add MetaData Entry 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 administration.docfieldmanagement.metadatamanagement
+ */
 // if its the manual edit page..then display normally
 function getSelectFieldPage($iDocFieldID) {
     global $default;
@@ -147,7 +171,7 @@ function getDocFieldDisplay($oDocField) {
     if (!isset($oDocField)) {
 
         $sWhereClause = " ST.has_lookup = 1" ;
-        $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
+        $oPatternListBox = & new PatternListBox($default->document_fields_table, "name", "id", "fDocFieldID");
         //$oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setWhereClause($sWhereClause);
         $oPatternListBox->setPostBackOnChange(true);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
index 85b9c67..3fb3a48 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit MetaData entry.
+ *
+ * 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 administration.docfieldmanagement.metadatamanagement
+ */
+
 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("editMetaDataUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/MetaData.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
index 16f9c04..0e33cf0 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
@@ -1,5 +1,29 @@
 <?php
-
+/**
+ * $Id$
+ *
+ * Edit MetaData 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 administration.docfieldmanagement.metadatamanagement
+ */
 function getEditMetaDataFailPage($iDocFieldID){
     global $default;
     
@@ -197,7 +221,7 @@ function getDocFieldDisplay($oDocField) {
     if (!isset($oDocField)) {
 
         $sWhereClause = " ST.has_lookup = 1" ;
-        $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
+        $oPatternListBox = & new PatternListBox($default->document_fields_table, "name", "id", "fDocFieldID");
         //$oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setWhereClause($sWhereClause);
         $oPatternListBox->setPostBackOnChange(true);
@@ -216,7 +240,7 @@ function getMetaDataDisplay($oMetaData,$iDocFieldID) {
     if (!isset($oMetaData)) {
 
         $sWhereClause = " ST.document_field_id = " . $iDocFieldID;
-        $oPatternListBox = & new PatternListBox($default->owl_metadata_table, "name", "id", "fMetaDataID");
+        $oPatternListBox = & new PatternListBox($default->metadata_table, "name", "id", "fMetaDataID");
         //$oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setWhereClause($sWhereClause);
         $oPatternListBox->setPostBackOnChange(true);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
index 1a734ac..f32122a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove MetaData entry.
+ *
+ * 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 administration.docfieldmanagement.metadatamanagement
+ */
+
 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("removeMetaDataUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
     require_once("$default->fileSystemRoot/lib/documentmanagement/MetaData.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
@@ -53,4 +71,4 @@ if (checkSession()) {
     $main->setCentralPayload($oPatternCustom);
     $main->render();
 }
-?>
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
index 4d8ba9c..af4fe5f 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
@@ -1,5 +1,30 @@
 <?php
-
+/**
+ * $Id$
+ *
+ * Remove MetaData 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 administration.docfieldmanagement.metadatamanagement
+ */
+ 
 // if its the manual edit page..then display normally
 function getSelectFieldPage($iDocFieldID) {	
 	global $default;
@@ -155,7 +180,7 @@ function getDocFieldDisplay($oDocField) {
 	if (!isset($oDocField)) {
 		
 		$sWhereClause = " ST.has_lookup = 1" ;
-		$oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
+		$oPatternListBox = & new PatternListBox($default->document_fields_table, "name", "id", "fDocFieldID");
 		//$oPatternListBox->setIncludeDefaultValue(true);
 		$oPatternListBox->setWhereClause($sWhereClause);
 		$oPatternListBox->setPostBackOnChange(true);		
@@ -175,7 +200,7 @@ function getMetaDataDisplay($oMetaData,$iDocFieldID) {
 		
 		
 		$sWhereClause = " ST.document_field_id = " . $iDocFieldID;
-		$oPatternListBox = & new PatternListBox($default->owl_metadata_table, "name", "id", "fMetaDataID");
+		$oPatternListBox = & new PatternListBox($default->metadata_table, "name", "id", "fMetaDataID");
 		//$oPatternListBox->setIncludeDefaultValue(true);
 		$oPatternListBox->setWhereClause($sWhereClause);
 		$oPatternListBox->setPostBackOnChange(true);		
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldBL.php
index 2afcb6d..7d247fb 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove document field.
+ *
+ * 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 administration.docfieldmanagement
+ */
+
 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("removeDocFieldUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 	require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
 	require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentType.inc");
 	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc
index 07af671..9b03a9b 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc
@@ -2,11 +2,27 @@
 /**
  * $Id$
  *
- * Presentation information for Deleting a DocField 
+ * Remove document field UI functions.
  *
- * @author Mukhtar Dharsey
- * @date 5 February 2003
- * @package presentation.lookAndFeel.knowledgeTree.
+ * 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 administration.docfieldmanagement
  */
  
 // gets the delete stuff
@@ -88,8 +104,8 @@ function getFieldMappedPage($sDocumentFieldName, $aDocumentTypes) {
 function getDocFieldDisplay($oDocField) {
     global $default;
     if (!isset($oDocField)) {
-        $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
-        $oPatternListBox->setFromClause("LEFT OUTER JOIN $default->owl_document_fields_table DFL ON ST.id=DFL.document_field_id");
+        $oPatternListBox = & new PatternListBox($default->document_fields_table, "name", "id", "fDocFieldID");
+        $oPatternListBox->setFromClause("LEFT OUTER JOIN $default->document_fields_link_table DFL ON ST.id=DFL.document_field_id");
         $oPatternListBox->setWhereClause("ISNULL(DFL.value)");
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();