From 06a70451b9ae0dabd44890265a11820173f74c25 Mon Sep 17 00:00:00 2001
From: michael <michael@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 12 Aug 2003 09:39:05 +0000
Subject: [PATCH] added copyright and gpl notice removed owl prefix from table aliases

---
 presentation/lookAndFeel/knowledgeTree/administration/admin.php                                   | 20 +++++++++++++++++---
 presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc                                 | 25 +++++++++++++++++++++++--
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php                | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupBL.php         | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc         | 48 ++++++++++++++++++++++++++++++++----------------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc                | 38 +++++++++++++++++++++++++++-----------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php               | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php         | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc         | 43 ++++++++++++++++++++++++++++++-------------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc               | 38 +++++++++++++++++++++++++++-----------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php              | 33 +++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc              | 38 +++++++++++++++++++++++++++-----------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php             | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php    | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc    | 38 +++++++++++++++++++++++++++-----------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc             | 34 +++++++++++++++++++++++++---------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php          | 33 +++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php     | 31 ++++++++++++++++++++++++-------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc          | 33 +++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php         | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc         | 28 ++++++++++++++++++++++++++--
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php        | 33 +++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc        | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteBL.php       | 34 ++++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc       | 35 ++++++++++++++++++++++++++---------
 presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsImage.php                        | 22 ++++++++++++++++++----
 presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsItem.php                         | 20 +++++++++++++++++---
 presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php                               | 36 +++++++++++++++++++++++++++---------
 presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc                               | 33 +++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php                           | 37 +++++++++++++++++++++++++++----------
 presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc                           | 32 ++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php      | 23 +++++++++++++++++++----
 presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveDocumentBL.php         | 21 +++++++++++++++++----
 presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc         | 31 ++++++++++++++++++++++---------
 presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/modifyArchiveSettingsBL.php   | 23 +++++++++++++++++++----
 presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/requestDocumentRestoreBL.php  | 21 +++++++++++++++++----
 presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc | 23 ++++++++++++++++++-----
 37 files changed, 895 insertions(+), 281 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/administration/admin.php b/presentation/lookAndFeel/knowledgeTree/administration/admin.php
index 1b62f22..2afc317 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/admin.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/admin.php
@@ -5,13 +5,27 @@ require_once("$default->fileSystemRoot/presentation/Html.inc");
 /**
  * $Id$
  *
- * Displays the administration page.
+ * Displays the administration splash page.
  *
- * 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.administration
+ * @package administration
  */
 
 /**
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc
index dd9c2b3..29c77f6 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc
@@ -1,7 +1,28 @@
 <?php
-
 /**
- * Contains UI methods common to all administration screens
+ * $Id$
+ *
+ * Contains UI methods common to all administration screens.
+ *
+ * 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 administration
  */
  
 function getAddLink($sAddAction, $sAddText) {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
index 54c775d..e9d0ac4 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a user.
+ *
+ * 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.usermanagement
+ */
+ 
 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/users/User.inc");
 require_once("$default->fileSystemRoot/lib/groups/Group.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/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/usermanagement/addUserToGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupBL.php
index 49ef8b4..666de35 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupBL.php
@@ -1,12 +1,30 @@
 <?php
 /**
-* BL information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a user to a group.
+ *
+ * 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.usermanagement
+ */
+ 
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -16,7 +34,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/groups/Group.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/usermanagement/addUserToGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc
index 1b59006..a94c55e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Add a user to a group 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.usermanagement
+ */
 // gets main page
 function getPage($iUserID, $iGroupID) {	
 	global $default;
@@ -111,14 +127,14 @@ function getPageFail($sQueryString) {
 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() && !Permission::userIsSystemAdministrator()) {
-            $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"]));
             
-            $oUnassignedUsersLB = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
-            $oUnassignedUsersLB->setFromClause("LEFT OUTER JOIN $default->owl_users_groups_table UGL ON ST.id=UGL.user_id");
+            $oUnassignedUsersLB = & new PatternListBox($default->users_table, "username", "id", "fUserID");
+            $oUnassignedUsersLB->setFromClause("LEFT OUTER JOIN $default->users_groups_table UGL ON ST.id=UGL.user_id");
             $oUnassignedUsersLB->setWhereClause("ISNULL(UGL.group_id)");
             $oPatternListBox->setAdditionalEntries($oUnassignedUsersLB->getEntries());
         }
@@ -136,14 +152,14 @@ function getGroupDisplay($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", "fGroupID");
+            $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID");
             $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", "fGroupID");
-            $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id");
+            $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID");
+            $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/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
index 8c8a7e7..79f31dd 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Add user 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.usermanagement
+ */
 // display multiple users
 function getSelectUserPage($aResults) {
 	global $default;
@@ -165,14 +181,14 @@ function getGroupListBox() {
 	global $default;
 	if (Permission::userIsSystemAdministrator()) {
 	    // if this is the system administrator, prepend group names with unit name
-	    $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
+	    $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID");
 	    $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", "fGroupID");
-	    $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id");
+	    $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID");
+	    $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/usermanagement/editUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php
index 5158558..fec1315 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for editing a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit user details.
+ *
+ * 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.usermanagement
+ */
+ 
 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("editUserUI.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/administration/usermanagement/editUserGroupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
index 6e446d8..cece23c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.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 user-group mappings.
+ *
+ * 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.usermanagement
+ */
+ 
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -16,7 +34,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/groups/Group.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/usermanagement/editUserGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
index e6459bc..61ba37b 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit a users groups 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.usermanagement
+ */
 
 // get page for removal
 function getPage($iUserID) {
@@ -189,10 +206,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);
@@ -209,14 +226,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/usermanagement/editUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc
index ef6e0b2..a3387b0 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for renaming a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit user 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.usermanagement
+ */
 // if its the manual edit page..then display normally
 function getEditPage($iUserID) {	
 	global $default;
@@ -37,7 +53,7 @@ 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( "username","name","email", "mobile", "email_notification", "max_sessions");
 	$aStoreColumns = array( "username","name","email", "mobile", "email_notification", "max_sessions") ;
 	$aColumnNames = array("Username: ","Name: ", "Email Address: ", "Mobile Number: ", "Email Notification: ", "Max Sessions: ");
@@ -45,7 +61,7 @@ function getUserDetailsPage($iUserID) {
 	$aDatabaseColumnTypes = array(1,1,1,1,2,1,1,1,1);
 	
 	// 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,1,0,0,0,0));
 	
@@ -110,7 +126,7 @@ function getEditPageFail() {
 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");
 		$oPatternListBox->setPostBackOnChange(true);
 		return $oPatternListBox->render();
 	} else {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php
index ac0844f..5a0de10 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List users.
+ *
+ * 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.usermanagement
+ */
 
 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/usermanagement/listUsersUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc
index db6cee8..a4181dc 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc
@@ -1,25 +1,41 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * List users 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.usermanagement
+ */
 function getGroupDisplay($iGroupID) {
 	global $default;
 	if (Permission::userIsSystemAdministrator()) {
 	    // if this is the system administrator, prepend group names with unit name
-	    $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
+	    $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID");
 	    $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", "fGroupID");
-	    $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id");
+	    $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID");
+	    $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id");
 	    $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
 	}
 	$oPatternListBox->setPostBackOnChange(true);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php
index e16af43..99d28c9 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a user.
+ *
+ * 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.usermanagement
+ */
+
 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("removeUserUI.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/lib/groups/Group.inc");
     require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php
index 6f512a6..822911e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php
@@ -1,12 +1,30 @@
 <?php
 /**
-* BL information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove user from a group.
+ *
+ * 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.usermanagement
+ */
+
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -16,7 +34,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/groups/Group.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/usermanagement/removeUserFromGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc
index 035ffaf..d474c6a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Remove user from a group 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.usermanagement
+ */
 // get page for removal
 function getPage($iUserID) {
     global $default;
@@ -174,10 +190,10 @@ function getPageSuccess($fUserID) {
 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);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc
index b7ee9d8..123e354 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc
@@ -1,13 +1,29 @@
 <?php
-
 /**
-* Presentation information for Deleting a User 
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove user 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.usermanagement
+ */
 // gets the delete stuff
 function getDeletePage($iUserID) {
     global $default;
@@ -113,7 +129,7 @@ function getDeleteConfirmedPage($iUserID) {
 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");
         $oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php
index a1c5938..eea61f5 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php
@@ -1,12 +1,29 @@
 <?php
 /**
-* BL information for adding a link
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a website.
+ *
+ * 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.websitemanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -14,7 +31,7 @@ if (checkSession()) {
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 	require_once("addWebsiteUI.inc");
 	require_once("$default->fileSystemRoot/lib/web/WebSite.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/websitemanagement/addWebsiteSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php
index 909c9dd..319044e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.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$
+ *
+ * Add a website 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 administration.websitemanagement
+ */
 
 require_once("../../../../../config/dmsDefaults.php");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc
index a82c8b5..cfd4367 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a website 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.websitemanagement
+ */
 // get add pages
 function getPage() {
 	global $default;
@@ -15,7 +32,7 @@ function getPage() {
 	$aParameterNumbers = array(0,1,2);
 	$aDisplayColumnTypes = array(1,1,3);
 	$aRequired = array(1,1,1);
-	$aDropDownListTableNames = array(2 => "$default->owl_users_table");
+	$aDropDownListTableNames = array(2 => "$default->users_table");
 	$aDropDownListValueColumns = array(2=>'id');
 	$aDropDownListDisplayColumns = array(2=>'username');
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
index 4f568ed..689d99f 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit a website.
+ *
+ * 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.websitemanagement
+ */
+ 
 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("editWebsiteUI.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/lib/web/WebSite.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
index 3f4d855..5f24000 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
@@ -1,5 +1,29 @@
 <?php
-
+/**
+ * $Id$
+ *
+ * Edit website 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.websitemanagement
+ */
 function getEditWebSitePage($oWebSite) {
     global $default;
     
@@ -50,7 +74,7 @@ function getCancelButton($oUser) {
 // then shows a text box with the User's name
 function getUserDisplay($oUser) {
     global $default;
-    $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fWebMasterID");
+    $oPatternListBox = & new PatternListBox($default->users_table, "username", "id", "fWebMasterID");
     if ($oUser) {
 		$oPatternListBox->setSelectedValue($oUser->getID());
     }
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
index ac6e323..eb5d7e6 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List websites.
+ *
+ * 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.websitemanagement
+ */
 
 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/websitemanagement/listWebsitesUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc
index a76241b..c0cf5ea 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc
@@ -1,17 +1,35 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List websites 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.websitemanagement
+ */
+ 
 function getWebsites() {
 	global $default;
 	$sQuery = 	"SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " . 
 				"'Edit', 'Delete' " .
-				"FROM " . $default->owl_web_sites_table . " " .
+				"FROM " . $default->web_sites_table . " " .
 				"ORDER BY web_site_name";
 	
     $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteBL.php
index 3cdceb1..ad49437 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a Link
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a website.
+ *
+ * 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.websitemanagement
+ */
+ 
 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("removeWebsiteUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 	require_once("$default->fileSystemRoot/lib/web/WebSite.inc");
 	require_once("$default->fileSystemRoot/lib/users/User.inc");
 	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc
index be60298..7188e8a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc
@@ -1,13 +1,30 @@
 <?php
-
 /**
-* Presentation information for Deleting a WebSite 
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a website 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.websitemanagement
+ */
+ 
 // gets the delete stuff
 function getDeletePage($iWebSiteID) {
     global $default;
@@ -92,7 +109,7 @@ function getDeleteFailPage() {
 function getWebSiteDisplay($oWebSite) {
     global $default;
     if (!isset($oWebSite)) {
-        $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID");
+        $oPatternListBox = & new PatternListBox($default->web_sites_table, "web_site_name", "id", "fWebSiteID");
         $oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsImage.php b/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsImage.php
index 0770750..56b5d81 100644
--- a/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsImage.php
+++ b/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsImage.php
@@ -5,14 +5,28 @@ require_once("$default->fileSystemRoot/lib/dashboard/DashboardNews.inc");
 
 /**
  * $Id$
- *  
- * Displays a news item image
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Displays a news item image.
+ *
+ * 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.administration.news
+ * @package dashboard.news
  */
  
 if (isset($fNewsID)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsItem.php b/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsItem.php
index d534808..872802c 100644
--- a/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsItem.php
+++ b/presentation/lookAndFeel/knowledgeTree/dashboard/news/displayNewsItem.php
@@ -6,14 +6,28 @@ require_once("$default->uiDirectory/dashboardUI.inc");
 
 /**
  * $Id$
- *  
+ *
  * Displays a news item.
  *
- * 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.administration.news
+ * @package dashboard.news
  */
 
 if (checkSession()) {
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
index 532f958..c0594b5 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
@@ -1,13 +1,31 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 5 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-	require_once("../../../../config/dmsDefaults.php");
+ * $Id$
+ *
+ * Add a comment.
+ *
+ * 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 discussions
+ */
+ 
+require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     
@@ -18,7 +36,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
     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/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
     require_once("$default->fileSystemRoot/lib/discussions/DiscussionThread.inc");   //###
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
index f708a52..eb10305 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
@@ -1,13 +1,30 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 5 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Add a discussion comment 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 discussions
+ */
+ 
 /** 
  *	Submission of comment SUCCESS page   
  *
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
index 9192e78..a03a692 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
@@ -1,14 +1,31 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 8 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
-	require_once("../../../../config/dmsDefaults.php");
+ * $Id$
+ *
+ * View discussions.
+ *
+ * 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 discussions
+ */
+ 
+require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {    
 //    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");    
@@ -17,7 +34,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
     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/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");    
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
index fd4d40f..9557839 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 5 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * View discussion 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 discussions
+ */
 
 function getPageButtons($oThread){
 	global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php
index 5851d91..fde3de6 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php
@@ -1,15 +1,30 @@
 <?php
 /**
  * $Id$
- *  
- * Business logic for setting document archive settings
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Business logic for setting document archive settings.
+ *
+ * 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.documentmanagement
+ * @package documentmanagement.archiving
  */
+
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveDocumentBL.php
index b0a62e5..b081645 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveDocumentBL.php
@@ -12,17 +12,30 @@ require_once("$default->fileSystemRoot/presentation/Html.inc");
 require_once("$default->uiDirectory/documentmanagement/documentUI.inc");
 require_once("$default->uiDirectory/foldermanagement/folderUI.inc");
 require_once("$default->uiDirectory/documentmanagement/archiving/archiveSettingsUI.inc");
-
 /**
  * $Id$
- *  
+ *
  * Business logic for archiving a document.
  *
- * 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.documentmanagement.archiving
+ * @package documentmanagement.archiving
  */
 
 if (checkSession()) {	
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc
index e36dfbe..417d9bc 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc
@@ -1,15 +1,28 @@
 <?php
-
 /**
  * $Id$
- *  
- * This page holds all presentation code for display document archiving settings. 
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * This page holds all presentation code for display document archiving settings.
+ *
+ * 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.administration.news
+ * @package documentmanagement.archiving
  */
 
 /**
@@ -24,7 +37,7 @@ function renderErrorMessage($sErrorMessage) {
 
 function renderDocumentTransactionListBox($iDocumentTransactionID) {
 	global $default;	
-    $oPatternListBox = & new PatternListBox($default->owl_transaction_types_table, "name", "id", "fDocumentTransactionID");
+    $oPatternListBox = & new PatternListBox($default->transaction_types_table, "name", "id", "fDocumentTransactionID");
     $oPatternListBox->setWhereClause("ST.name in ('View','Download')");
     if (isset($iDocumentTransactionID)) {
     	$oPatternListBox->setSelectedValue($iDocumentTransactionID);    	
@@ -34,7 +47,7 @@ function renderDocumentTransactionListBox($iDocumentTransactionID) {
 
 function renderArchivingTypeListBox() {
 	global $default, $fArchivingTypeID;
-    $oPatternListBox = & new PatternListBox($default->owl_archiving_type_lookup_table, "name", "id", "fArchivingTypeID");
+    $oPatternListBox = & new PatternListBox($default->archiving_type_lookup_table, "name", "id", "fArchivingTypeID");
     $oPatternListBox->setPostBackOnChange(true);
     $oPatternListBox->setSelectedValue($fArchivingTypeID);
     return $oPatternListBox->render();		
@@ -42,7 +55,7 @@ function renderArchivingTypeListBox() {
 
 function renderTimeUnitsListBox($iTimeUnitID) {
 	global $default;
-    $oPatternListBox = & new PatternListBox($default->owl_time_unit_lookup_table, "name", "id", "fTimeUnitID");
+    $oPatternListBox = & new PatternListBox($default->time_unit_lookup_table, "name", "id", "fTimeUnitID");
     if (isset($iTimeUnitID)) {
     	$oPatternListBox->setSelectedValue($iTimeUnitID);    	
     }
@@ -134,7 +147,7 @@ function renderArchiveSettingsForm($iDocumentID, $oArchiveSettings, $iArchivingT
 		$iArchivingTypeID = $oArchiveSettings->getArchivingTypeID();
 	}
 	
-	$sArchivingType = lookupName($default->owl_archiving_type_lookup_table, $iArchivingTypeID);
+	$sArchivingType = lookupName($default->archiving_type_lookup_table, $iArchivingTypeID);
 					
 	$sToRender .= "<table border=\"0\">";
 	// TODO: calendar control integration
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/modifyArchiveSettingsBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/modifyArchiveSettingsBL.php
index 91c0559..d3dbea3 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/modifyArchiveSettingsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/modifyArchiveSettingsBL.php
@@ -1,15 +1,30 @@
 <?php
 /**
  * $Id$
- *  
- * Business logic for setting document archive settings
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Business logic for setting document archive settings.
+ *
+ * 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.documentmanagement
+ * @package documentmanagement.archiving
  */
+
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/requestDocumentRestoreBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/requestDocumentRestoreBL.php
index 776b524..668687f 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/requestDocumentRestoreBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/requestDocumentRestoreBL.php
@@ -10,17 +10,30 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
 require_once("restoreArchivedDocumentUI.inc");
 require_once("$default->uiDirectory/documentmanagement/documentUI.inc");
 require_once("$default->fileSystemRoot/presentation/Html.inc");
-
 /**
  * $Id$
- *  
+ *
  * Business logic for requesting the restoration of an archived document.
  *
- * 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.documentmanagement.archiving
+ * @package documentmanagement.archiving
  */
 
 if (checkSession()) {	
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc
index 360c786..6b858d3 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc
@@ -1,15 +1,28 @@
 <?php
-
 /**
  * $Id$
- *  
- * This page holds all presentation code for requesting the restoration of archived documents 
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * This page holds all presentation code for requesting the restoration of archived 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 Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package presentation.lookAndFeel.knowledgeTree.administration.news
+ * @package documentmanagement.archiving
  */
 
 /**
--
libgit2 0.21.4