From 010092a1dffa22a131124ecc9261da40de30ca98 Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Thu, 7 Aug 2003 15:11:46 +0000 Subject: [PATCH] added copyright and gpl notice removed owl prefix from table aliases --- lib/foldermanagement/Folder.inc | 73 +++++++++++++++++++++++++++++++++++++++++++------------------------------ lib/foldermanagement/FolderCollaboration.inc | 54 ++++++++++++++++++++++++++++++++++-------------------- lib/foldermanagement/FolderDocTypeLink.inc | 41 +++++++++++++++++++++++++++++------------ lib/foldermanagement/FolderUserRole.inc | 50 +++++++++++++++++++++++++++++++++----------------- lib/foldermanagement/PhysicalFolderManagement.inc | 37 +++++++++++++++++++++++++------------ lib/groups/Group.inc | 54 +++++++++++++++++++++++++++++++++++------------------- lib/groups/GroupFolderApprovalLink.inc | 47 +++++++++++++++++++++++++++++++---------------- lib/groups/GroupFolderLink.inc | 40 +++++++++++++++++++++++++++------------- lib/groups/GroupUnitLink.inc | 53 ++++++++++++++++++++++++++++++++++------------------- lib/groups/GroupUserLink.inc | 55 +++++++++++++++++++++++++++++++++++-------------------- 10 files changed, 326 insertions(+), 178 deletions(-) diff --git a/lib/foldermanagement/Folder.inc b/lib/foldermanagement/Folder.inc index a4132d0..1ee39c5 100644 --- a/lib/foldermanagement/Folder.inc +++ b/lib/foldermanagement/Folder.inc @@ -1,16 +1,29 @@ fileSystemRoot/lib/foldermanagement/PhysicalFolderManagement.inc"); class Folder { @@ -203,7 +216,7 @@ class Folder { //if the folder is not the root folder if ($iFolderID != 0) { $sql = $default->db; - $sql->query("SELECT parent_id FROM $default->owl_folders_table WHERE ID = $iFolderID"); + $sql->query("SELECT parent_id FROM $default->folders_table WHERE ID = $iFolderID"); $sql->next_record(); return $this->generateParentFolderIDS($sql->f("parent_id")) . ",$iFolderID"; } @@ -221,7 +234,7 @@ class Folder { //if the folder is not the root folder if ($iFolderID != 0) { $sql = $default->db; - $sql->query("SELECT name, parent_id FROM $default->owl_folders_table WHERE ID = $iFolderID"); + $sql->query("SELECT name, parent_id FROM $default->folders_table WHERE ID = $iFolderID"); $sql->next_record(); return $this->generateFullFolderPath($sql->f("parent_id")) . "/" . stripslashes($sql->f("name")); } @@ -242,7 +255,7 @@ class Folder { $this->sParentFolderIDs = $this->generateParentFolderIDS($this->iParentID); $this->sParentFolderIDs = substr($this->sParentFolderIDs, 1, strlen($this->sParentFolderIDs)); $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_folders_table . " (name, description, parent_id, creator_id, unit_id, is_public, full_path, parent_folder_ids) " . + $result = $sql->query("INSERT INTO " . $default->folders_table . " (name, description, parent_id, creator_id, unit_id, is_public, full_path, parent_folder_ids) " . "VALUES ('" . addslashes($this->sName) . "', '" . addslashes($this->sDescription) . "', $this->iParentID, $this->iCreatorID, $this->iUnitID, " . ($this->bIsPublic ? 1 : 0) . ",'" . addslashes($this->sFullPath) . "','" . addslashes($this->sParentFolderIDs) . "')"); if ($result) { $this->iId = $sql->insert_id(); @@ -266,7 +279,7 @@ class Folder { $sOldPath; if ($this->iId >= 0) { $sql = $default->db; - $sQuery = "UPDATE " . $default->owl_folders_table . " SET " . + $sQuery = "UPDATE " . $default->folders_table . " SET " . "name = '" . addslashes($this->sName) . "', " . "description = '" . addslashes($this->sDescription) . "', " . "parent_id = $this->iParentID, " . @@ -308,7 +321,7 @@ class Folder { function updateChildPaths($iID, $sql) { global $default; //get the direct children - $sql->query("SELECT id from $default->owl_folders_table WHERE parent_id = $iID"); + $sql->query("SELECT id from $default->folders_table WHERE parent_id = $iID"); while ($sql->next_record()) { //force an update, this will cause this child's children to be updated $oFolder = Folder::get($sql->f("id")); @@ -328,7 +341,7 @@ class Folder { function getChildren($iFolderID, $aChildren = array()) { global $default; $sql = $default->db; - $sql->query("SELECT id from $default->owl_folders_table WHERE parent_id = $iFolderID"); + $sql->query("SELECT id from $default->folders_table WHERE parent_id = $iFolderID"); while ($sql->next_record()) { $aChildren[count($aChildren)] = $sql->f("id"); Folder::getChildren($sql->f("id"), & $aChildren); @@ -344,7 +357,7 @@ class Folder { function getDocumentIDs($iFolderID) { global $default; $sql = $default->db; - $sql->query("SELECT id from $default->owl_documents_table WHERE folder_id = $iFolderID"); + $sql->query("SELECT id from $default->documents_table WHERE folder_id = $iFolderID"); while ($sql->next_record()) { $sChildString .= $sql->f("id") . ","; } @@ -360,7 +373,7 @@ class Folder { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM " . $default->owl_folders_table . " WHERE id = " . $this->iId); + $result = $sql->query("DELETE FROM " . $default->folders_table . " WHERE id = " . $this->iId); if ($result) { $this->iId = -1; return true; @@ -386,7 +399,7 @@ class Folder { function get($iFolderID) { global $default, $lang_err_object_not_exist; $sql = $default->db; - $sql->query("SELECT * FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); + $sql->query("SELECT * FROM " . $default->folders_table . " WHERE id = " . $iFolderID); if ($sql->next_record()) { $oFolder = & new Folder(stripslashes($sql->f("name")), stripslashes($sql->f("description")), $sql->f("parent_id"), $sql->f("creator_id"), $sql->f("unit_id"), $sql->f("is_public")); $oFolder->iId = $iFolderID; @@ -404,7 +417,7 @@ class Folder { function exists() { global $default; $sql = $default->db; - $sql->query("SELECT id FROM $default->owl_folders_table WHERE name='" . $this->sName . "' " . + $sql->query("SELECT id FROM $default->folders_table WHERE name='" . $this->sName . "' " . "AND description = '" . $this->sDescription . "' AND parent_id=$this->iParentID"); if ($sql->next_record()) { return true; @@ -427,7 +440,7 @@ class Folder { settype($aFolderArray, "array"); $sql = $default->db; // TODO: join on sys_deleted - $result = $sql->query("SELECT * FROM " . $default->owl_folders_table . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->folders_table . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { @@ -537,7 +550,7 @@ class Folder { if ($iFolderID != 0) { global $default; $sql = $default->db; - $sql->query("SELECT parent_id FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); + $sql->query("SELECT parent_id FROM " . $default->folders_table . " WHERE id = " . $iFolderID); $sql->next_record(); return $sql->f("parent_id"); } @@ -556,7 +569,7 @@ class Folder { global $default, $lang_err_database; if (Folder::folderExistsID($iFolderID)) { $sql = $default->db; - $sql->query("SELECT document_type_id FROM " . $default->owl_folder_doctypes_table . " WHERE folder_id = " . $iFolderID); + $sql->query("SELECT document_type_id FROM " . $default->folder_doctypes_table . " WHERE folder_id = " . $iFolderID); if ($sql->next_record()) { return $sql->f("document_type_id"); } @@ -580,7 +593,7 @@ class Folder { $sName = addslashes($sName); global $default, $lang_err_folder_exist; $sql = $default->db; - $sql->query("SELECT * FROM " . $default->owl_folders_table . " WHERE name = '" . $sName . "' AND parent_id = " . $iParentID); + $sql->query("SELECT * FROM " . $default->folders_table . " WHERE name = '" . $sName . "' AND parent_id = " . $iParentID); if ($sql->next_record()) { return true; } @@ -598,7 +611,7 @@ class Folder { function folderExistsID($iFolderID) { global $default, $lang_err_folder_exist; $sql = $default->db; - $sql->query("SELECT * FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); + $sql->query("SELECT * FROM " . $default->folders_table . " WHERE id = " . $iFolderID); if ($sql->next_record()) { return true; } @@ -616,7 +629,7 @@ class Folder { function getFolderName($iFolderID) { global $default, $lang_err_database; $sql = $default->db; - $sql->query("SELECT name FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); + $sql->query("SELECT name FROM " . $default->folders_table . " WHERE id = " . $iFolderID); if ($sql->next_record()) { return stripslashes($sql->f("name")); } @@ -634,7 +647,7 @@ class Folder { function getFolderID($sFolderName) { global $default, $lang_err_database; $sql = $default->db; - $sql->query("SELECT id FROM " . $default->owl_folders_table . " WHERE name = '" . addslashes($sFolderName) . "'"); + $sql->query("SELECT id FROM " . $default->folders_table . " WHERE name = '" . addslashes($sFolderName) . "'"); if ($sql->next_record()) { return $sql->f("id"); } @@ -650,7 +663,7 @@ class Folder { function folderIsLinkedToDocType($iFolderID, $iDocTypeID) { global $default; $sql = $default->db; - $sql->query("SELECT id FROM $default->owl_folder_doctypes_table WHERE document_type_id = $iDocTypeID and folder_id = $iFolderID"); + $sql->query("SELECT id FROM $default->folder_doctypes_table WHERE document_type_id = $iDocTypeID and folder_id = $iFolderID"); if ($sql->next_record()) { return true; } @@ -666,7 +679,7 @@ class Folder { */ function folderIsUnitRootFolder($iFolderID) { global $default; - $sQuery ="SELECT F.id FROM $default->owl_folders_table AS F INNER JOIN $default->owl_units_table AS U ON F.name LIKE U.name WHERE F.id = $iFolderID"; + $sQuery ="SELECT F.id FROM $default->folders_table AS F INNER JOIN $default->units_table AS U ON F.name LIKE U.name WHERE F.id = $iFolderID"; $sql = $default->db; $sql->query($sQuery); diff --git a/lib/foldermanagement/FolderCollaboration.inc b/lib/foldermanagement/FolderCollaboration.inc index 12d0938..33a4111 100644 --- a/lib/foldermanagement/FolderCollaboration.inc +++ b/lib/foldermanagement/FolderCollaboration.inc @@ -1,16 +1,30 @@ iId < 0) { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_groups_folders_approval_table . " (folder_id, group_id, precedence, role_id, user_id) VALUES ($this->iFolderID, $this->iGroupID, $this->iSequenceNumber, $this->iRoleID, $this->iUserID)"); + $result = $sql->query("INSERT INTO " . $default->groups_folders_approval_table . " (folder_id, group_id, precedence, role_id, user_id) VALUES ($this->iFolderID, $this->iGroupID, $this->iSequenceNumber, $this->iRoleID, $this->iUserID)"); if ($result) { $this->iId = $sql->insert_id(); return true; @@ -99,7 +113,7 @@ class FolderCollaboration { $_SESSION["errorMessage"] = $lang_err_database; return false; } - $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->owl_groups_folders_approval_table"; + $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->groups_folders_approval_table"; return false; } @@ -114,7 +128,7 @@ class FolderCollaboration { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - $result = $sql->query("UPDATE " . $default->owl_groups_folders_approval_table . " SET group_id = $this->iGroupID, folder_id = $this->iFolderID, precedence = $this->iSequenceNumber, role_id = $this->iRoleID, user_id = $this->iUserID WHERE id = $this->iId"); + $result = $sql->query("UPDATE " . $default->groups_folders_approval_table . " SET group_id = $this->iGroupID, folder_id = $this->iFolderID, precedence = $this->iSequenceNumber, role_id = $this->iRoleID, user_id = $this->iUserID WHERE id = $this->iId"); if ($result) { return true; } @@ -136,7 +150,7 @@ class FolderCollaboration { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_groups_folders_approval_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->groups_folders_approval_table WHERE id = $this->iId"); if ($result) { return true; } @@ -156,8 +170,8 @@ class FolderCollaboration { function hasDocumentInProcess() { global $default; $sQuery = "SELECT FURL.id " . - "FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN documents AS D ON GFAL.folder_id = D.folder_id " . - "INNER JOIN $default->owl_folders_user_roles_table AS FURL ON FURL.document_id = D.id " . + "FROM $default->groups_folders_approval_table AS GFAL INNER JOIN documents AS D ON GFAL.folder_id = D.folder_id " . + "INNER JOIN $default->folders_user_roles_table AS FURL ON FURL.document_id = D.id " . "WHERE GFAL.id = " . $this->iId . " " . "AND FURL.active != 0"; $sql = $default->db; @@ -177,14 +191,14 @@ class FolderCollaboration { function & get($iFolderCollaborationID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_groups_folders_approval_table WHERE id = $iFolderCollaborationID"); + $result = $sql->query("SELECT * FROM $default->groups_folders_approval_table WHERE id = $iFolderCollaborationID"); if ($result) { if ($sql->next_record()) { $oFolderCollaboration = & new FolderCollaboration($sql->f("folder_id"), $sql->f("group_id"), $sql->f("precedence"), $sql->f("role_id"), $sql->f("user_id")); $oFolderCollaboration->iId = $iFolderCollaborationID; return $oFolderCollaboration; } - $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iFolderCollaborationID . " table = $default->owl_groups_folders_approval_table"; + $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iFolderCollaborationID . " table = $default->groups_folders_approval_table"; return false; } $_SESSION["errorMessage"] = $lang_err_database; @@ -204,7 +218,7 @@ class FolderCollaboration { $aFolderCollaborationArray; settype($aFolderCollaborationArray, "array"); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_groups_folders_approval_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->groups_folders_approval_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { diff --git a/lib/foldermanagement/FolderDocTypeLink.inc b/lib/foldermanagement/FolderDocTypeLink.inc index 65252e1..c1812f1 100644 --- a/lib/foldermanagement/FolderDocTypeLink.inc +++ b/lib/foldermanagement/FolderDocTypeLink.inc @@ -1,12 +1,29 @@ iId < 0) { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_folder_doctypes_table . " (folder_id, document_type_id) " . + $result = $sql->query("INSERT INTO " . $default->folder_doctypes_table . " (folder_id, document_type_id) " . "VALUES ($this->iFolderID, $this->iDocumentTypeID)"); if ($result) { $this->iId = $sql->insert_id(); @@ -59,7 +76,7 @@ class FolderDocTypeLink { $sOldPath = $default->documentRoot . "/" . $this->sFullPath . "/" . $this->sName; } $sql = $default->db; - $sQuery = "UPDATE " . $default->owl_folder_doctypes_table . " SET " . + $sQuery = "UPDATE " . $default->folder_doctypes_table . " SET " . "folder_id = $this->iFolderID, " . "document_type_id = $this->iDocumentTypeID " . "WHERE id = " . $this->iId; @@ -82,7 +99,7 @@ class FolderDocTypeLink { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM " . $default->owl_folder_doctypes_table . " WHERE id = " . $this->iId); + $result = $sql->query("DELETE FROM " . $default->folder_doctypes_table . " WHERE id = " . $this->iId); if ($result) { $this->iId = -1; return true; @@ -108,7 +125,7 @@ class FolderDocTypeLink { function get($iFolderDocTypeLinkID) { global $default, $lang_err_object_not_exist; $sql = $default->db; - $sql->query("SELECT * FROM " . $default->owl_folder_doctypes_table . " WHERE id = " . $iFolderDocTypeLinkID); + $sql->query("SELECT * FROM " . $default->folder_doctypes_table . " WHERE id = " . $iFolderDocTypeLinkID); if ($sql->next_record()) { $oFolderDocTypeLink = & new FolderDocTypeLink($sql->f("folder_id"), $sql->f("document_type_id")); $oFolderDocTypeLink->iId = $iFolderDocTypeLinkID; @@ -132,7 +149,7 @@ class FolderDocTypeLink { settype($aFolderDocTypeLinkArray, "array"); $sql = $default->db; // TODO: join on sys_deleted - $result = $sql->query("SELECT * FROM " . $default->owl_folder_doctypes_table . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->folder_doctypes_table . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { diff --git a/lib/foldermanagement/FolderUserRole.inc b/lib/foldermanagement/FolderUserRole.inc index 1b259f2..d3764e1 100644 --- a/lib/foldermanagement/FolderUserRole.inc +++ b/lib/foldermanagement/FolderUserRole.inc @@ -1,14 +1,30 @@ iId < 0) { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_folders_user_roles_table . " (user_id, document_id, group_folder_approval_id, datetime, done, active, dependant_documents_created) VALUES ($this->iUserID, $this->iDocumentID, $this->iGroupFolderApprovalID, '$this->dDateTime', " . ($this->bDone ? "1" : "0") . ", " . ($this->bActive ? "1" : "0") . ", " . (($this->bDependantDocumentsCreated) ? "1" : "0") . ")"); + $result = $sql->query("INSERT INTO " . $default->folders_user_roles_table . " (user_id, document_id, group_folder_approval_id, datetime, done, active, dependant_documents_created) VALUES ($this->iUserID, $this->iDocumentID, $this->iGroupFolderApprovalID, '$this->dDateTime', " . ($this->bDone ? "1" : "0") . ", " . ($this->bActive ? "1" : "0") . ", " . (($this->bDependantDocumentsCreated) ? "1" : "0") . ")"); if ($result) { $this->iId = $sql->insert_id(); return true; @@ -126,8 +142,8 @@ class FolderUserRole { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - //echo "UPDATE " . $default->owl_folders_user_roles_table . " SET user_id = $this->iUserID, document_id = $this->iDocumentID, group_folder_approval_id = $this->iGroupFolderApprovalID, datetime = '$this->dDateTime', done = " . ($this->bDone ? "1" : "0") . ", active = " . ($this->bActive ? "1" : "0") . ", dependant_documents_created = " . ($this->bDependantDocumentsCreated ? "1" : "0") . " WHERE id = $this->iId"; - $result = $sql->query("UPDATE " . $default->owl_folders_user_roles_table . " SET user_id = $this->iUserID, document_id = $this->iDocumentID, group_folder_approval_id = $this->iGroupFolderApprovalID, datetime = '$this->dDateTime', done = " . ($this->bDone ? "1" : "0") . ", active = " . ($this->bActive ? "1" : "0") . ", dependant_documents_created = " . ($this->bDependantDocumentsCreated ? "1" : "0") . " WHERE id = $this->iId"); + //echo "UPDATE " . $default->folders_user_roles_table . " SET user_id = $this->iUserID, document_id = $this->iDocumentID, group_folder_approval_id = $this->iGroupFolderApprovalID, datetime = '$this->dDateTime', done = " . ($this->bDone ? "1" : "0") . ", active = " . ($this->bActive ? "1" : "0") . ", dependant_documents_created = " . ($this->bDependantDocumentsCreated ? "1" : "0") . " WHERE id = $this->iId"; + $result = $sql->query("UPDATE " . $default->folders_user_roles_table . " SET user_id = $this->iUserID, document_id = $this->iDocumentID, group_folder_approval_id = $this->iGroupFolderApprovalID, datetime = '$this->dDateTime', done = " . ($this->bDone ? "1" : "0") . ", active = " . ($this->bActive ? "1" : "0") . ", dependant_documents_created = " . ($this->bDependantDocumentsCreated ? "1" : "0") . " WHERE id = $this->iId"); if ($result) { return true; } @@ -149,7 +165,7 @@ class FolderUserRole { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_folders_user_roles_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->folders_user_roles_table WHERE id = $this->iId"); if ($result) { return true; } @@ -171,7 +187,7 @@ class FolderUserRole { function & get($iFolderUserRoleID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_folders_user_roles_table WHERE id = $iFolderUserRoleID"); + $result = $sql->query("SELECT * FROM $default->folders_user_roles_table WHERE id = $iFolderUserRoleID"); if ($result) { if ($sql->next_record()) { $oFolderUserRole = & new FolderUserRole($sql->f("user_id"), $sql->f("document_id"), $sql->f("group_folder_approval_id"), $sql->f("done"), $sql->f("active"), $sql->f("dependant_documents_created")); @@ -180,7 +196,7 @@ class FolderUserRole { return $oFolderUserRole; } - $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iFolderUserRoleID . " table = $default->owl_folders_user_roles_table"; + $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iFolderUserRoleID . " table = $default->folders_user_roles_table"; return false; } $_SESSION["errorMessage"] = $lang_err_database; @@ -200,7 +216,7 @@ class FolderUserRole { $aFolderUserRoleArray; settype($aFolderUserRoleArray, "array"); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_folders_user_roles_table . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->folders_user_roles_table . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { @@ -217,7 +233,7 @@ class FolderUserRole { function & getFromFolderCollaboration($iFolderCollaborationID, $iDocumentID) { global $default, $lang_err_database; $sql = $default->db; - $sql->query("SELECT id FROM $default->owl_folders_user_roles_table WHERE group_folder_approval_id = $iFolderCollaborationID AND document_id = $iDocumentID"); + $sql->query("SELECT id FROM $default->folders_user_roles_table WHERE group_folder_approval_id = $iFolderCollaborationID AND document_id = $iDocumentID"); if ($sql->next_record()) { return FolderUserRole::get($sql->f("id")); } diff --git a/lib/foldermanagement/PhysicalFolderManagement.inc b/lib/foldermanagement/PhysicalFolderManagement.inc index 4aba047..bcf07d9 100644 --- a/lib/foldermanagement/PhysicalFolderManagement.inc +++ b/lib/foldermanagement/PhysicalFolderManagement.inc @@ -1,17 +1,30 @@ db; - $sql->query("SELECT id FROM $default->owl_users_groups_table WHERE group_id = $this->iId"); + $sql->query("SELECT id FROM $default->users_groups_table WHERE group_id = $this->iId"); $rows = $sql->num_rows(); if ($rows > 0) { return true; @@ -82,7 +98,7 @@ class Group { global $default; $sql = $default->db; - $query = "SELECT id FROM $default->owl_groups_units_table WHERE group_id = $this->iId"; + $query = "SELECT id FROM $default->groups_units_table WHERE group_id = $this->iId"; $sql->query($query); $rows = $sql->num_rows(); if ($rows > 0){ @@ -104,7 +120,7 @@ class Group { if ($this->iId < 0) { //check to see if name exsits $sql = $default->db; - $query = "SELECT name FROM ". $default->owl_groups_table ." WHERE name = '" . $this->sName . "'"; + $query = "SELECT name FROM ". $default->groups_table ." WHERE name = '" . $this->sName . "'"; $sql->query($query); $rows = $sql->num_rows(); if ($rows > 0) { @@ -113,7 +129,7 @@ class Group { return false; } else { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_groups_table . " (name, is_sys_admin, is_unit_admin) VALUES ('" . addslashes($this->sName) . "', " . ($this->bIsSysAdmin ? 1 : 0) . ", " . ($this->bIsUnitAdmin ? 1 : 0) . ")"); + $result = $sql->query("INSERT INTO " . $default->groups_table . " (name, is_sys_admin, is_unit_admin) VALUES ('" . addslashes($this->sName) . "', " . ($this->bIsSysAdmin ? 1 : 0) . ", " . ($this->bIsUnitAdmin ? 1 : 0) . ")"); if ($result) { $this->iId = $sql->insert_id(); return true; @@ -137,7 +153,7 @@ class Group { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - $result = $sql->query("UPDATE " . $default->owl_groups_table . " SET name = '" . addslashes($this->sName) . "', is_sys_admin = " . ($this->bIsSysAdmin ? 1 : 0) . ", is_unit_admin = " . ($this->bIsUnitAdmin ? 1 : 0) . " WHERE id = $this->iId"); + $result = $sql->query("UPDATE " . $default->groups_table . " SET name = '" . addslashes($this->sName) . "', is_sys_admin = " . ($this->bIsSysAdmin ? 1 : 0) . ", is_unit_admin = " . ($this->bIsUnitAdmin ? 1 : 0) . " WHERE id = $this->iId"); if ($result) { return true; } @@ -159,7 +175,7 @@ class Group { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_groups_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->groups_table WHERE id = $this->iId"); return $result; } $_SESSION["errorMessage"] = $lang_err_object_key; @@ -177,14 +193,14 @@ class Group { function & get($iGroupID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_groups_table WHERE id = $iGroupID"); + $result = $sql->query("SELECT * FROM $default->groups_table WHERE id = $iGroupID"); if ($result) { if ($sql->next_record()) { $oGroup = & new Group(stripslashes($sql->f("name")), $sql->f("is_unit_admin"), $sql->f("is_sys_admin")); $oGroup->iId = $iGroupID; return $oGroup; } - $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iGroupID . " table = $default->owl_groups_table"; + $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iGroupID . " table = $default->groups_table"; return false; } $_SESSION["errorMessage"] = $lang_err_database; @@ -204,7 +220,7 @@ class Group { $aGroupArray; settype($aGroupArray, "array"); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_groups_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->groups_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { @@ -229,7 +245,7 @@ class Group { */ function getGroupName($id) { global $default; - $sName = lookupField("$default->owl_groups_table", "name", "id", $id ); + $sName = lookupField("$default->groups_table", "name", "id", $id ); return $sName; } } @@ -247,7 +263,7 @@ class Group { { global $default; - $name = lookupField("$default->owl_groups_table", "name", "id", $id ); + $name = lookupField("$default->groups_table", "name", "id", $id ); $this->sName= $name; } diff --git a/lib/groups/GroupFolderApprovalLink.inc b/lib/groups/GroupFolderApprovalLink.inc index 9dd8b70..25e22db 100644 --- a/lib/groups/GroupFolderApprovalLink.inc +++ b/lib/groups/GroupFolderApprovalLink.inc @@ -1,16 +1,31 @@ iId < 0) { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_groups_folders_approval_table . " (folder_id, group_id, precedence, role_id) VALUES ($this->iFolderID, $this->iGroupID, $this->iPrecedence, $this->iRoleID)"); + $result = $sql->query("INSERT INTO " . $default->groups_folders_approval_table . " (folder_id, group_id, precedence, role_id) VALUES ($this->iFolderID, $this->iGroupID, $this->iPrecedence, $this->iRoleID)"); if ($result) { $this->iId = $sql->insert_id(); return true; @@ -157,7 +172,7 @@ class GroupFolderApprovalLink { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - $result = $sql->query("UPDATE " . $default->owl_groups_folders_approval_table . " SET folder_id = $this->iFolderID, group_id = $this->iGroupID, precedence = $this->iPrecedence, role_id = $this->iRoleID WHERE id = $this->iId"); + $result = $sql->query("UPDATE " . $default->groups_folders_approval_table . " SET folder_id = $this->iFolderID, group_id = $this->iGroupID, precedence = $this->iPrecedence, role_id = $this->iRoleID WHERE id = $this->iId"); if ($result) { return true; } @@ -179,7 +194,7 @@ class GroupFolderApprovalLink { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_groups_folders_approval_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->groups_folders_approval_table WHERE id = $this->iId"); if ($result) { return true; } @@ -201,7 +216,7 @@ class GroupFolderApprovalLink { function & get($iGroupFolderLinkID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_groups_folders_approval_table WHERE id = $iGroupFolderLinkID"); + $result = $sql->query("SELECT * FROM $default->groups_folders_approval_table WHERE id = $iGroupFolderLinkID"); if ($result) { if ($sql->next_record()) { $oGroupFolderApprovalLink = & new GroupFolderApprovalLink($sql->f("folder_id"), $sql->f("group_id"), $sql->f("precedence"), $sql->f("role_id"), $sql->f("datetime")); @@ -228,7 +243,7 @@ class GroupFolderApprovalLink { $aGroupFolderApprovalLinkArray; settype($aGroupFolderApprovalLinkArray, "array"); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_groups_folders_approval_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->groups_folders_approval_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { diff --git a/lib/groups/GroupFolderLink.inc b/lib/groups/GroupFolderLink.inc index f10d739..b82276d 100644 --- a/lib/groups/GroupFolderLink.inc +++ b/lib/groups/GroupFolderLink.inc @@ -3,14 +3,28 @@ * $Id$ * * Represents the group_folders_link table in the db used to represent - * folder access + * folder access. * - * Licensed under the GNU GPL. For full terms see the file COPYING. + * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * @version $Revision$ + * 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 , Jam Warehouse (Pty) Ltd, South Africa - * @package lib.foldermanagement - */ + * @package lib.groups + */ class GroupFolderLink { /** primary key of current object */ @@ -80,7 +94,7 @@ class GroupFolderLink { //if the object hasn't been created if ($this->iId < 0) { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_groups_folders_table . " (folder_id, group_id, can_read, can_write) VALUES ($this->iFolderID, $this->iGroupID, " . ($this->bCanRead ? 1 : 0) . ", " . ($this->bCanWrite ? 1 : 0) . ")"); + $result = $sql->query("INSERT INTO " . $default->groups_folders_table . " (folder_id, group_id, can_read, can_write) VALUES ($this->iFolderID, $this->iGroupID, " . ($this->bCanRead ? 1 : 0) . ", " . ($this->bCanWrite ? 1 : 0) . ")"); if ($result) { $this->iId = $sql->insert_id(); return true; @@ -88,7 +102,7 @@ class GroupFolderLink { $_SESSION["errorMessage"] = $lang_err_database; return false; } - $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->owl_groups_folders_table"; + $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->groups_folders_table"; return false; } @@ -103,7 +117,7 @@ class GroupFolderLink { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - $result = $sql->query("UPDATE $default->owl_groups_folders_table SET group_id = $this->iGroupID, folder_id = $this->iFolderID, can_read = " . ($this->bCanRead ? 1 : 0) .", can_write = " . ($this->bCanWrite ? 1 : 0) . " WHERE id = $this->iId"); + $result = $sql->query("UPDATE $default->groups_folders_table SET group_id = $this->iGroupID, folder_id = $this->iFolderID, can_read = " . ($this->bCanRead ? 1 : 0) .", can_write = " . ($this->bCanWrite ? 1 : 0) . " WHERE id = $this->iId"); if ($result) { return true; } @@ -125,7 +139,7 @@ class GroupFolderLink { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_groups_folders_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->groups_folders_table WHERE id = $this->iId"); if ($result) { return true; } @@ -141,7 +155,7 @@ class GroupFolderLink { function exists() { global $default; $sql = $default->db; - if ($sql->query("SELECT count(*) AS count FROM $default->owl_groups_folders_table WHERE folder_id = $this->iFolderID AND group_id = $this->iGroupID")) { + if ($sql->query("SELECT count(*) AS count FROM $default->groups_folders_table WHERE folder_id = $this->iFolderID AND group_id = $this->iGroupID")) { $sql->next_record(); return ($sql->f("count") > 0) ? true : false; } else { @@ -160,14 +174,14 @@ class GroupFolderLink { function & get($iGroupFolderID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_groups_folders_table WHERE id = $iGroupFolderID"); + $result = $sql->query("SELECT * FROM $default->groups_folders_table WHERE id = $iGroupFolderID"); if ($result) { if ($sql->next_record()) { $oGroupFolderLink = & new GroupFolderLink($sql->f("folder_id"), $sql->f("group_id"), $sql->f("can_read"), $sql->f("can_write")); $oGroupFolderLink->iId = $iGroupFolderID; return $oGroupFolderLink; } - $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iFolderAccessID . " table = $default->owl_groups_folders_table"; + $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iFolderAccessID . " table = $default->groups_folders_table"; return false; } $_SESSION["errorMessage"] = $lang_err_database; @@ -186,7 +200,7 @@ class GroupFolderLink { global $default, $lang_err_database; $oGroupFolderLinkArray = array(); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_groups_folders_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->groups_folders_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { while ($sql->next_record()) { $oGroupFolderLinkArray[] = & GroupFolderLink::get($sql->f("id")); diff --git a/lib/groups/GroupUnitLink.inc b/lib/groups/GroupUnitLink.inc index aca958e..c283721 100644 --- a/lib/groups/GroupUnitLink.inc +++ b/lib/groups/GroupUnitLink.inc @@ -1,14 +1,29 @@ iId < 0) { $sql = $default->db; - $query = "SELECT unit_id, group_id FROM ". $default->owl_groups_units_table ." WHERE unit_id = '" . $this->iUnitID . "' and group_id = '". $this->iGroupID ."'"; + $query = "SELECT unit_id, group_id FROM ". $default->groups_units_table ." WHERE unit_id = '" . $this->iUnitID . "' and group_id = '". $this->iGroupID ."'"; $sql->query($query); $rows = $sql->num_rows($sql); @@ -100,7 +115,7 @@ class GroupUnitLink { else { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_groups_units_table . " (group_id, unit_id) VALUES ($this->iGroupID, $this->iUnitID)"); + $result = $sql->query("INSERT INTO " . $default->groups_units_table . " (group_id, unit_id) VALUES ($this->iGroupID, $this->iUnitID)"); if ($result) { $this->iId = $sql->insert_id(); @@ -110,7 +125,7 @@ class GroupUnitLink { return false; } } - $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->owl_groups_units_table"; + $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->groups_units_table"; return false; } @@ -125,7 +140,7 @@ class GroupUnitLink { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - $result = $sql->query("UPDATE " . $default->owl_groups_units_table . " SET group_id = $this->iGroupID, unit_id = $this->iUnitID WHERE id = $this->iId"); + $result = $sql->query("UPDATE " . $default->groups_units_table . " SET group_id = $this->iGroupID, unit_id = $this->iUnitID WHERE id = $this->iId"); if ($result) { return true; } @@ -147,7 +162,7 @@ class GroupUnitLink { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_groups_units_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->groups_units_table WHERE id = $this->iId"); if ($result) { return true; } @@ -169,14 +184,14 @@ class GroupUnitLink { function & get($iGroupUnitLinkID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_groups_units_table WHERE id = $iGroupUnitLinkID"); + $result = $sql->query("SELECT * FROM $default->groups_units_table WHERE id = $iGroupUnitLinkID"); if ($result) { if ($sql->next_record()) { $oGroupUnitLink = & new GroupUnitLink($sql->f("group_id"), $sql->f("unit_id")); $oGroupUnitLink->iId = $iGroupUnitLinkID; return $oGroupUnitLink; } - $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iGroupUnitLinkID . " table = $default->owl_groups_units_table"; + $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iGroupUnitLinkID . " table = $default->groups_units_table"; return false; } $_SESSION["errorMessage"] = $lang_err_database; @@ -196,7 +211,7 @@ class GroupUnitLink { $aGroupUnitLink; settype($aGroupUnitLink, "array"); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_groups_units_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->groups_units_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { @@ -225,7 +240,7 @@ class GroupUnitLink { { global $default; - $value = lookupField("$default->owl_groups_units_table", "unit_id", "group_id", $groupId ); + $value = lookupField("$default->groups_units_table", "unit_id", "group_id", $groupId ); return $value; @@ -245,7 +260,7 @@ class GroupUnitLink { { global $default; - $id = lookupID($default->owl_groups_units_table, "group_id", $groupId); + $id = lookupID($default->groups_units_table, "group_id", $groupId); $this->iId= $id; } diff --git a/lib/groups/GroupUserLink.inc b/lib/groups/GroupUserLink.inc index d957dce..dd8bc8c 100644 --- a/lib/groups/GroupUserLink.inc +++ b/lib/groups/GroupUserLink.inc @@ -1,14 +1,29 @@ iId < 0) { $sql = $default->db; - $query = "SELECT user_id, group_id FROM ". $default->owl_users_groups_table ." WHERE user_id = '" . $this->iUserID . "' and group_id = '". $this->iGroupID ."'"; + $query = "SELECT user_id, group_id FROM ". $default->users_groups_table ." WHERE user_id = '" . $this->iUserID . "' and group_id = '". $this->iGroupID ."'"; $sql->query($query); $rows = $sql->num_rows($sql); @@ -100,7 +115,7 @@ class GroupUserLink { else { $sql = $default->db; - $result = $sql->query("INSERT INTO " . $default->owl_users_groups_table . " (group_id, user_id) VALUES ($this->iGroupID, $this->iUserID)"); + $result = $sql->query("INSERT INTO " . $default->users_groups_table . " (group_id, user_id) VALUES ($this->iGroupID, $this->iUserID)"); if ($result) { $this->iId = $sql->insert_id(); return true; @@ -109,7 +124,7 @@ class GroupUserLink { return false; } } - $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->owl_users_groups_table"; + $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->users_groups_table"; return false; } @@ -124,7 +139,7 @@ class GroupUserLink { //only update if the object has been stored if ($this->iId > 0) { $sql = $default->db; - $result = $sql->query("UPDATE " . $default->owl_users_groups_table . " SET group_id = $this->iGroupID, user_id = $this->iUserID WHERE id = $this->iId"); + $result = $sql->query("UPDATE " . $default->users_groups_table . " SET group_id = $this->iGroupID, user_id = $this->iUserID WHERE id = $this->iId"); if ($result) { return true; } @@ -146,7 +161,7 @@ class GroupUserLink { //only delete the object if it exists in the database if ($this->iId >= 0) { $sql = $default->db; - $result = $sql->query("DELETE FROM $default->owl_users_groups_table WHERE id = $this->iId"); + $result = $sql->query("DELETE FROM $default->users_groups_table WHERE id = $this->iId"); if ($result) { return true; } @@ -168,14 +183,14 @@ class GroupUserLink { function & get($iGroupUserLinkID) { global $default; $sql = $default->db; - $result = $sql->query("SELECT * FROM $default->owl_users_groups_table WHERE id = $iGroupUserLinkID"); + $result = $sql->query("SELECT * FROM $default->users_groups_table WHERE id = $iGroupUserLinkID"); if ($result) { if ($sql->next_record()) { $oGroupUserLink = & new GroupUserLink($sql->f("group_id"), $sql->f("user_id")); $oGroupUserLink->iId = $iGroupUserLinkID; return $oGroupUserLink; } - $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iGroupUserLinkID . " table = $default->owl_users_groups_table"; + $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iGroupUserLinkID . " table = $default->users_groups_table"; return false; } $_SESSION["errorMessage"] = $lang_err_database; @@ -195,7 +210,7 @@ class GroupUserLink { $aGroupUserLink; settype($aGroupUserLink, "array"); $sql = $default->db; - $result = $sql->query("SELECT * FROM " . $default->owl_users_groups_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); + $result = $sql->query("SELECT * FROM " . $default->users_groups_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; while ($sql->next_record()) { @@ -214,7 +229,7 @@ class GroupUserLink { $aGroupUserLink; settype($aGroupUserLink, "array"); $sql = $default->db; - $result = $sql->query("SELECT group_id FROM " . $default->owl_users_groups_table . " Where user_id = ". $iUserID); + $result = $sql->query("SELECT group_id FROM " . $default->users_groups_table . " Where user_id = ". $iUserID); if ($result) { $iCount = 0; while ($sql->next_record()) { @@ -240,7 +255,7 @@ class GroupUserLink { { global $default; - $value = lookupField("$default->owl_users_groups_table", "group_id", "user_id", $iUserID ); + $value = lookupField("$default->users_groups_table", "group_id", "user_id", $iUserID ); return $value; @@ -260,7 +275,7 @@ class GroupUserLink { { global $default; $sql = $default->db; - $result = $sql->query("SELECT id FROM $default->owl_users_groups_table WHERE user_id = $iUserId and group_id = $iGroupId"); + $result = $sql->query("SELECT id FROM $default->users_groups_table WHERE user_id = $iUserId and group_id = $iGroupId"); if ($result) { if ($sql->next_record()) { $id = $sql->f("id"); -- libgit2 0.21.4