diff --git a/config/dmsDefaults.php b/config/dmsDefaults.php index 182e4a4..cbc99ea 100644 --- a/config/dmsDefaults.php +++ b/config/dmsDefaults.php @@ -187,13 +187,19 @@ $default->siteMap->addPage("scratchPad", "/tests/scratchPad.php", "Tests", Guest $default->siteMap->addPage("sitemap", "/tests/session/SiteMap.php", "Tests", Guest, "sitemap", false); $default->siteMap->addPage("documentBrowserTest", "/tests/documentmanagement/DocumentBrowser.php", "Tests", Guest, "test the document browser", false); + + // default requires require_once("$default->owl_fs_root/phpmailer/class.phpmailer.php"); require_once("$default->owl_fs_root/lib/session/Session.inc"); require_once("$default->owl_fs_root/lib/session/control.inc"); require_once("$default->owl_fs_root/lib/database/db.inc"); require_once("$default->owl_fs_root/lib/database/lookup.inc"); -require_once("$default->owl_fs_root/lib/dms.inc"); // single db instantiation +$default->db = new Database(); + +// import request variables and setup language +require_once("$default->owl_fs_root/lib/dms.inc"); + ?> diff --git a/lib/DefaultLookup.inc b/lib/DefaultLookup.inc index 07d22f9..1eb692e 100644 --- a/lib/DefaultLookup.inc +++ b/lib/DefaultLookup.inc @@ -68,7 +68,7 @@ class DefaultLookup { global $lang_err_database, $lang_err_object_exists; //don't create the object if it's aready been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO $this->sTableName (name) VALUES ( '". addslashes($this->sName) . "')"); if ($result) { //set the primary key; @@ -92,7 +92,7 @@ class DefaultLookup { global $lang_err_database, $lang_err_object_key; //can only update if the object has been stored if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE $this->sTableName SET name = '" . addslashes($this->sName) . "' WHERE id = $this->iId"); if ($result) { return true; @@ -114,7 +114,7 @@ class DefaultLookup { global $lang_err_database, $lang_err_object_not_exist; //can only delete and object if it has been stored already if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $this->sTableName WHERE id = $this->iId"); if ($result) { //reset the primary key @@ -139,7 +139,7 @@ class DefaultLookup { * @return Lookup lookup object populated with relevant values */ function & get($sTableName, $iId) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $sTableName WHERE id = $iId"); if ($result) { if ($sql->next_record()) { diff --git a/lib/authentication/Authenticator.inc b/lib/authentication/Authenticator.inc index 03e2658..c48aaf9 100644 --- a/lib/authentication/Authenticator.inc +++ b/lib/authentication/Authenticator.inc @@ -39,7 +39,7 @@ class Authenticator { // Check if Maxsessions has been reached // lookup maxsessions $maxSessions = lookupField($default->owl_users_table, "max_sessions", "id", $userID); - $sql = new Owl_DB; + $sql = $default->db; if ($sql->query("SELECT * FROM $default->owl_sessions_table WHERE user_id = '".$userDetails["user_id"]."'")) { if ($sql->num_rows($sql) >= $maxSessions) { // return too many sessions status code diff --git a/lib/authentication/DBAuthenticator.inc b/lib/authentication/DBAuthenticator.inc index b519ab8..af3bd4d 100644 --- a/lib/authentication/DBAuthenticator.inc +++ b/lib/authentication/DBAuthenticator.inc @@ -26,7 +26,7 @@ class DBAuthenticator extends Authenticator { function checkPassword($userName, $password) { global $default; - $sql = new Owl_DB; + $sql = $default->db; $query = "select * from $default->owl_users_table where username = '$userName' and password = '" . md5($password) . "'"; $sql->query($query); $numrows = $sql->num_rows($sql); diff --git a/lib/database/db.inc b/lib/database/db.inc index 3beb347..c5e5a1e 100644 --- a/lib/database/db.inc +++ b/lib/database/db.inc @@ -20,10 +20,10 @@ * @version v 1.1.1.1 2002/12/04 * @author michael */ -class Owl_DB extends DB_Sql { +class Database extends DB_Sql { /** Class name */ - var $classname = "Owl_DB"; + var $classname = "Database"; // BEGIN wes changes -- moved these settings to config/owl.php // Server where the database resides @@ -46,7 +46,7 @@ class Owl_DB extends DB_Sql { var $sLastOrderByClause; /** Default Constructor */ - function Owl_DB() { + function Database() { global $default; $this->Host = $default->owl_db_host; $this->Database = $default->owl_db_name; diff --git a/lib/database/lookup.inc b/lib/database/lookup.inc index 2e89880..a603076 100644 --- a/lib/database/lookup.inc +++ b/lib/database/lookup.inc @@ -34,7 +34,7 @@ function lookupGroupIDs($userID) { global $default; $groupIDs = array(); - $sql = new Owl_DB; + $sql = $default->db; $sql->query("select group_id from $default->owl_users_groups_table where user_id = '$userID'"); while($sql->next_record()) { $groupIDs[] = $sql->f("group_id"); @@ -52,7 +52,7 @@ function lookupGroupIDs($userID) { */ function lookupField($tableName, $selectFieldName, $whereFieldName, $whereFieldValue) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $query = "select $selectFieldName from $tableName where $whereFieldName = '". $whereFieldValue . "'" ; if ($sql->query($query)) { diff --git a/lib/dms.inc b/lib/dms.inc index df2fabc..5b5f59c 100644 --- a/lib/dms.inc +++ b/lib/dms.inc @@ -52,7 +52,7 @@ if(isset($default->owl_lang)) { die("$lang_err_lang_1 $langdir $lang_err_lang_2"); } else { - $sql = new Owl_DB; + $sql = $default->db; $sql->query("select * from $default->owl_sessions_table where id = '" . session_id() . "'"); $sql->next_record(); $numrows = $sql->num_rows($sql); diff --git a/lib/documentmanagement/Document.inc b/lib/documentmanagement/Document.inc index ea7dab8..0f0970a 100644 --- a/lib/documentmanagement/Document.inc +++ b/lib/documentmanagement/Document.inc @@ -201,7 +201,7 @@ class Document { global $default, $lang_err_doc_exist, $lang_err_database; //if the id >= 0, then the object has already been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_documents_table . " (document_type_id, name, filename, size, creator_id, modified, description, mime_id, folder_id, major_version, minor_version, is_checked_out) " . "VALUES (" . $this->iDocumentTypeID . ", '" . addslashes($this->sName) . "', '" . addslashes($this->sFileName) . "', $this->iSize, $this->iCreatorID, '" . getCurrentDateTime() . "', '" . addslashes($this->sDescription) . "', $this->iMimeTypeID, $this->iFolderID, $this->iMajorVersion, $this->iMinorVersion, " . ($this->bIsCheckedOut ? 1 : 0) . ")"); if ($result) { @@ -225,7 +225,7 @@ class Document { function update() { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_documents_table . " SET " . "document_typeid = $this->iDocumentTypeID, " . "file_name = '" . addslashes($this->file_name) . "', " . @@ -259,7 +259,7 @@ class Document { function delete() { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM " . $default->owl_documents_table . " WHERE id = $this->iId"); if ($result) { $this->iId = -1; @@ -283,7 +283,7 @@ class Document { */ function & get($iDocumentID) { global $default, $lang_err_doc_not_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM $default->owl_documents_table WHERE id = $iDocumentID"); if ($sql->next_record()) { $oDocument = & new Document(stripslashes($sql->f("name")), $sql->f("filename"), $sql->f("size"), stripslashes($sql->f("creator_id")), $sql->f("mime_id"), $sql->f("folder_id"), $sql->f("description")); @@ -310,7 +310,7 @@ class Document { function getDocumentFieldsForDocumentType($iDocumentTypeID, $bMandatoryOnly = false) { $aDocumentFieldArray; settype($aDocumentFieldArray,"array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT DF.id AS id, DF.name AS name, DF.data_type AS data_type FROM document_fields AS DF INNER JOIN document_type_fields_link AS DTFL ON DF.id = DTFL.field_id WHERE DTFL.document_type_id = $iDocumentTypeID " . ($bMandatoryOnly ? "AND DFTL.is_mandatory = 1 " : " ") . "ORDER BY DF.name ASC"); if ($result) { $iCount = 0; @@ -338,7 +338,7 @@ class Document { global $default, $lang_err_database; $aDocumentHistory; settype($aDocumentHistory, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_document_transactions_table . " WHERE document_id = $this->iId ORDER BY datetime ASC"); if ($result) { $iCount = 0; @@ -365,7 +365,7 @@ class Document { */ function documentExists($sFileName, $iFolderID) { global $default, $lang_err_doc_not_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM $default->owl_documents_table WHERE name = '" . addslashes($sFileName) . "' AND folder_id = $iFolderID"); if ($sql->next_record()) { return true; diff --git a/lib/documentmanagement/DocumentBrowser.inc b/lib/documentmanagement/DocumentBrowser.inc index 87d040e..c506621 100644 --- a/lib/documentmanagement/DocumentBrowser.inc +++ b/lib/documentmanagement/DocumentBrowser.inc @@ -31,7 +31,7 @@ class DocumentBrowser { // instantiate and initialise $results = array(); - $sql = new Owl_DB(); + $sql = $default->db; // no folder specified, so depending on the users groups, resolve to the right folderID if ($folderID == -1) { @@ -117,7 +117,7 @@ class DocumentBrowser { // TODO: add this to default inserts $categoryField = "Category"; $results = array(); - $sql = new Owl_DB(); + $sql = $default->db; // lookup document_fields id for category $categoryFieldID = lookupID($default->owl_fields_table, "name", "$categoryField"); @@ -174,7 +174,7 @@ class DocumentBrowser { global $default; $results = array(); - $sql = new Owl_DB(); + $sql = $default->db; if ($documentTypeID == -1) { // no category value supplied, so return a list of categories @@ -222,7 +222,7 @@ class DocumentBrowser { */ function checkGroup($requiredGroupName, $groupIDs) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; // lookup the id of $requiredGroupName $requiredGroupID = lookupID($default->owl_groups_table, "name", "$requiredGroupName"); $default->log->debug("DocumentBrowser::checkGroup reqGrpID=$requiredGroupID"); @@ -252,7 +252,7 @@ class DocumentBrowser { global $default; $folders = array(); - $folderSql = new Owl_DB(); + $folderSql = $default->db; // perform folder details query and loop through results if ($folderSql->query($folderQuery)) { // should only be one result @@ -294,7 +294,7 @@ class DocumentBrowser { global $default; $documents = array(); - $sql = new Owl_DB(); + $sql = $default->db; // convert array to a comma separated string $documentIDStr = arrayToCSS($documentIDs); diff --git a/lib/documentmanagement/DocumentField.inc b/lib/documentmanagement/DocumentField.inc index e821d06..f55d610 100644 --- a/lib/documentmanagement/DocumentField.inc +++ b/lib/documentmanagement/DocumentField.inc @@ -93,7 +93,7 @@ class DocumentField { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_fields_table . " (name, data_type) VALUES ('" . addslashes($this->sName) . "', '" . addslashes($this->sDataType) . "')"); if ($result) { $this->iId = $sql->insert_id(); @@ -116,7 +116,7 @@ class DocumentField { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_fields_table . " SET name = '" . addslashes($this->sName) . "', data_type = '" . addslashes($this->sDataType) . "' WHERE id = $this->iId"); if ($result) { return true; @@ -138,7 +138,7 @@ class DocumentField { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_fields_table WHERE id = $this->iId"); if ($result) { return true; @@ -160,7 +160,7 @@ class DocumentField { */ function & get($iDocumentFieldsID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_fields_table WHERE id = $iDocumentFieldsID"); if ($result) { if ($sql->next_record()) { diff --git a/lib/documentmanagement/DocumentFieldLink.inc b/lib/documentmanagement/DocumentFieldLink.inc index 491906b..f517bb1 100644 --- a/lib/documentmanagement/DocumentFieldLink.inc +++ b/lib/documentmanagement/DocumentFieldLink.inc @@ -118,7 +118,7 @@ class DocumentFieldLink { global $default, $lang_err_doc_exist, $lang_err_database; //if the id >= 0, then the object has already been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_document_fields_table . " (document_id, document_field_id, value) " . "VALUES ($this->iDocumentID, $this->iDocumentFieldID, '" . addslashes($this->sValue) . "')"); if ($result) { @@ -142,7 +142,7 @@ class DocumentFieldLink { function update() { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_document_fields_table . " SET " . "document_id = $this->iDocumentID, document_field_id = $this->iDocumentFieldID, value = '" . addslashes($this->sValue) . "'" . "WHERE id = $this->iId"); @@ -166,7 +166,7 @@ class DocumentFieldLink { function delete() { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM " . $default->owl_document_fields_table . " WHERE id = $this->iId"); if ($result) { $this->iId = -1; @@ -190,7 +190,7 @@ class DocumentFieldLink { */ function & get($iDocumentFieldLinkID) { global $default, $lang_err_doc_not_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM " . $default->owl_document_fields_table . " WHERE id = " . $iDocumentFieldLinkID); if ($sql->next_record()) { $oDocumentFieldLink = & new DocumentFieldLink($sql->f("document_id"), $sql->f("document_field_id"), $sql->f("value")); diff --git a/lib/documentmanagement/DocumentTransaction.inc b/lib/documentmanagement/DocumentTransaction.inc index cf2f174..696928b 100644 --- a/lib/documentmanagement/DocumentTransaction.inc +++ b/lib/documentmanagement/DocumentTransaction.inc @@ -81,7 +81,7 @@ class DocumentTransaction { global $default, $lang_err_object_exists; //if the object hasn't been stored yet if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_document_transactions_table . " (document_id, version, user_id, datetime, ip, filename, comment, transaction_id) " . "VALUES ($this->iDocumentID, '" . addslashes($this->sVersion) . "', $this->iUserID, '" . addslashes($this->dDateTime) . "', '" . addslashes($this->sIP) . "', '" . addslashes($this->sFileName) . "', '" . addslashes($this->sComment) . "', $this->iTransactionID)"); if ($result) { diff --git a/lib/documentmanagement/PhysicalDocumentManager.inc b/lib/documentmanagement/PhysicalDocumentManager.inc index 8e84dd9..ff74b10 100644 --- a/lib/documentmanagement/PhysicalDocumentManager.inc +++ b/lib/documentmanagement/PhysicalDocumentManager.inc @@ -158,7 +158,7 @@ class PhysicalDocumentManager { */ function getMimeTypeID($sName) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; //get the mime type if (isset($sName)) { $sql->query("SELECT id FROM " . $default->owl_mime_table . " WHERE mimetypes = '$sName'"); @@ -179,7 +179,7 @@ class PhysicalDocumentManager { */ function getDefaultMimeTypeID() { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT id FROM " . $default->owl_mime_table . " WHERE mimetypes = 'text/plain'"); $sql->next_record(); //get the mime type id @@ -188,7 +188,7 @@ class PhysicalDocumentManager { function getMimeTypeName($iMimeTypeID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT mimetypes FROM " . $default->owl_mime_table . " WHERE id = " . $iMimeTypeID); if ($sql->next_record()) { return $sql->f("mimetypes"); diff --git a/lib/foldermanagement/Folder.inc b/lib/foldermanagement/Folder.inc index 181e109..299dbee 100644 --- a/lib/foldermanagement/Folder.inc +++ b/lib/foldermanagement/Folder.inc @@ -190,7 +190,7 @@ class Folder { global $default, $lang_err_database; $lang_err_object_exists; //if the object has not already been stored if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_folders_table . " (name, description, parent_id, creator_id, document_type_id, unit_id, is_public) " . "VALUES ('" . addslashes($this->sName) . "', '" . addslashes($this->sDescription) . "', $this->iParentID, $this->iCreatorID, $this->iDocumentTypeID, $this->iUnitID, " . ($this->bIsPublic ? 1 : 0) . ")"); if ($result) { @@ -213,7 +213,7 @@ class Folder { global $default, $lang_err_database, $lang_err_object_key; //can only update the object if it has already been stored if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_folders_table . " SET " . "name = '" . addslashes($this->sName) . "', " . "description = '" . addslashes($this->sDescription) . "', " . @@ -241,7 +241,7 @@ class Folder { function delete() { global $default, $lang_err_database, $lang_err_object_key; if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM " . $default->owl_folders_table . " WHERE id = " . $this->iId); if ($result) { $this->iId = -1; @@ -267,7 +267,7 @@ class Folder { */ function get($iFolderID) { global $default, $lang_err_object_not_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM " . $default->owl_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("document_type_id"), $sql->f("unit_id"), $sql->f("is_public")); @@ -346,7 +346,7 @@ class Folder { function getParentFolderID($iFolderID) { if ($iFolderID != 0) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT parent_id FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); $sql->next_record(); return $sql->f("parent_id"); @@ -365,7 +365,7 @@ class Folder { function getFolderDocumentType($iFolderID) { global $default, $lang_err_database; if (Folder::folderExistsID($iFolderID)) { - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT document_type_id FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); if ($sql->next_record()) { return $sql->f("document_type_id"); @@ -389,7 +389,7 @@ class Folder { function folderExistsName($sName, $iParentID) { $sName = addslashes($sName); global $default, $lang_err_folder_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM " . $default->owl_folders_table . " WHERE name = '" . $sName . "' AND parent_id = " . $iParentID); if ($sql->next_record()) { return true; @@ -407,7 +407,7 @@ class Folder { */ function folderExistsID($iFolderID) { global $default, $lang_err_folder_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); if ($sql->next_record()) { return true; @@ -425,7 +425,7 @@ class Folder { */ function getFolderName($iFolderID) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT name FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID); if ($sql->next_record()) { return stripslashes($sql->f("name")); @@ -443,7 +443,7 @@ class Folder { */ function getFolderID($sFolderName) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT id FROM " . $default->owl_folders_table . " WHERE name = '" . addslashes($sFolderName) . "'"); if ($sql->next_record()) { return $sql->f("id"); diff --git a/lib/groups/Group.inc b/lib/groups/Group.inc index 85da182..02e9816 100644 --- a/lib/groups/Group.inc +++ b/lib/groups/Group.inc @@ -36,7 +36,7 @@ class Group { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $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) . ")"); if ($result) { $this->iId = $sql->insert_id(); @@ -59,7 +59,7 @@ class Group { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $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"); if ($result) { return true; @@ -81,7 +81,7 @@ class Group { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_groups_table WHERE id = $this->iId"); if ($result) { return true; @@ -103,7 +103,7 @@ class Group { */ function & get($iGroupID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_groups_table WHERE id = $iGroupID"); if ($result) { if ($sql->next_record()) { @@ -130,7 +130,7 @@ class Group { global $default, $lang_err_database; $aGroupArray; settype($aGroupArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_groups_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/groups/GroupFolderApprovalLink.inc b/lib/groups/GroupFolderApprovalLink.inc index 5148a9e..9dd8b70 100644 --- a/lib/groups/GroupFolderApprovalLink.inc +++ b/lib/groups/GroupFolderApprovalLink.inc @@ -133,7 +133,7 @@ class GroupFolderApprovalLink { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $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)"); if ($result) { $this->iId = $sql->insert_id(); @@ -156,7 +156,7 @@ class GroupFolderApprovalLink { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $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"); if ($result) { return true; @@ -178,7 +178,7 @@ class GroupFolderApprovalLink { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_groups_folders_approval_table WHERE id = $this->iId"); if ($result) { return true; @@ -200,7 +200,7 @@ class GroupFolderApprovalLink { */ function & get($iGroupFolderLinkID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_groups_folders_approval_table WHERE id = $iGroupFolderLinkID"); if ($result) { if ($sql->next_record()) { @@ -227,7 +227,7 @@ class GroupFolderApprovalLink { global $default, $lang_err_database; $aGroupFolderApprovalLinkArray; settype($aGroupFolderApprovalLinkArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_groups_folders_approval_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/groups/GroupUnitLink.inc b/lib/groups/GroupUnitLink.inc index e8d9aba..8031b23 100644 --- a/lib/groups/GroupUnitLink.inc +++ b/lib/groups/GroupUnitLink.inc @@ -85,7 +85,7 @@ class GroupUnitLink { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_groups_units_table . " (group_id, unit_id) VALUES ($this->iGroupID, $this->iUnitID)"); if ($result) { $this->iId = $sql->insert_id(); @@ -108,7 +108,7 @@ class GroupUnitLink { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $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"); if ($result) { return true; @@ -130,7 +130,7 @@ class GroupUnitLink { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_groups_units_table WHERE id = $this->iId"); if ($result) { return true; @@ -152,7 +152,7 @@ class GroupUnitLink { */ function & get($iGroupUnitLinkID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_groups_units_table WHERE id = $iGroupUnitLinkID"); if ($result) { if ($sql->next_record()) { @@ -179,7 +179,7 @@ class GroupUnitLink { global $default, $lang_err_database; $aGroupUnitLink; settype($aGroupUnitLink, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_groups_units_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/groups/GroupUserLink.inc b/lib/groups/GroupUserLink.inc index ae8b0ee..43cd45e 100644 --- a/lib/groups/GroupUserLink.inc +++ b/lib/groups/GroupUserLink.inc @@ -85,7 +85,7 @@ class GroupUserLink { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_users_groups_table . " (group_id, user_id) VALUES ($this->iGroupID, $this->iUserID)"); if ($result) { $this->iId = $sql->insert_id(); @@ -108,7 +108,7 @@ class GroupUserLink { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $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"); if ($result) { return true; @@ -130,7 +130,7 @@ class GroupUserLink { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_users_groups_table WHERE id = $this->iId"); if ($result) { return true; @@ -152,7 +152,7 @@ class GroupUserLink { */ function & get($iGroupUserLinkID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_users_groups_table WHERE id = $iGroupUserLinkID"); if ($result) { if ($sql->next_record()) { @@ -179,7 +179,7 @@ class GroupUserLink { global $default, $lang_err_database; $aGroupUserLink; settype($aGroupUserLink, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_users_groups_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/roles/Role.inc b/lib/roles/Role.inc index bc03aca..abff351 100644 --- a/lib/roles/Role.inc +++ b/lib/roles/Role.inc @@ -46,7 +46,7 @@ class Role { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_roles_table . " (name, can_read, can_write) VALUES ('" . addslashes($this->sName) . "', " . ($this->bCanRead ? 1 : 0) . ", " . ($this->bCanWrite ? 1 : 0) . ")"); if ($result) { $this->iId = $sql->insert_id(); @@ -69,7 +69,7 @@ class Role { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_roles_table . " SET name = '" . addslashes($this->sName) . "', can_read = " . ($this->bCanRead ? 1 : 0) . ", can_write = " . ($this->bCanWrite ? 1 : 0) . " WHERE id = $this->iId"); if ($result) { return true; @@ -91,7 +91,7 @@ class Role { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_roles_table WHERE id = $this->iId"); if ($result) { return true; @@ -113,7 +113,7 @@ class Role { */ function & get($iRoleID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_roles_table WHERE id = $iRoleID"); if ($result) { if ($sql->next_record()) { @@ -140,7 +140,7 @@ class Role { global $default, $lang_err_database; $aRoleArray; settype($aRoleArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_roles_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/roles/RoleFolderLink.inc b/lib/roles/RoleFolderLink.inc index 46a5573..18fe4df 100644 --- a/lib/roles/RoleFolderLink.inc +++ b/lib/roles/RoleFolderLink.inc @@ -159,7 +159,7 @@ class RoleFolderLink { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_folders_user_roles_table . " (user_id, folder_id, role_type_id, datetime, done) VALUES ($this->iUserID, $this->iFolderID, $this->iRoleTypeID, '$this->dDateTime', " . ($this->bDone ? 1 : 0) . ")"); if ($result) { $this->iId = $sql->insert_id(); @@ -182,7 +182,7 @@ class RoleFolderLink { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_folders_user_roles_table . " SET user_id = $this->iUserID, folder_id = $this->iFolderID, role_type_id = $this->iRoleTypeID, datetime = '$this->dDateTime', done = " . ($this->bDone ? 1 : 0) . " WHERE id = $this->iId"); if ($result) { return true; @@ -204,7 +204,7 @@ class RoleFolderLink { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_folders_user_roles_table WHERE id = $this->iId"); if ($result) { return true; @@ -226,7 +226,7 @@ class RoleFolderLink { */ function & get($iRolesFoldersID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_folders_user_roles_table WHERE id = $iRolesFoldersID"); if ($result) { if ($sql->next_record()) { @@ -253,7 +253,7 @@ class RoleFolderLink { global $default, $lang_err_database; $aRolesFoldersLinkArray; settype($aRolesFoldersLinkArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_folders_user_roles_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/security/permission.inc b/lib/security/permission.inc index 472a673..dcdf52e 100644 --- a/lib/security/permission.inc +++ b/lib/security/permission.inc @@ -113,7 +113,7 @@ class Permission { */ function folderIsPublic($iFolderID) { global $default, $lang_err_folder_not_public; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM " . $default->owl_folders_table . " WHERE id = " . $iFolderID . " AND is_public = 1"); if ($sql->next_record()) { return true; @@ -131,7 +131,7 @@ class Permission { */ function userHasGroupWritePermissionForFolder($iFolderID) { global $default, $lang_err_user_folder_write; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT GFL.folder_id " . "FROM groups_folders_link AS GFL INNER JOIN users_groups_link AS UGL ON GFL.group_id = UGL.group_id " . "WHERE UGL.user_id = " . $_SESSION["userID"] . " " . @@ -176,7 +176,7 @@ class Permission { */ function userHasGroupReadPermissionForFolder($iFolderID) { global $default, $lang_err_user_folder_read; - $sql = new Owl_DB(); + $sql = $default->db; //$sql->query("SELECT * FROM " . $default->owl_groups_folders_table = "groups_folders_link" . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND can_read = 1"); $sql->query("SELECT GFL.folder_id " . "FROM groups_folders_link AS GFL INNER JOIN users_groups_link AS UGL ON GFL.group_id = UGL.group_id " . @@ -199,7 +199,7 @@ class Permission { */ function userIsInGroupID($iGroupID) { global $default, $lang_err_user_group; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT id FROM " . $default->owl_groups_users_table . " WHERE id = " . $iGroupID . " AND user_id = " . $_SESSION["userID"]); if ($sql->next_record()) { return true; @@ -217,7 +217,7 @@ class Permission { */ function userIsInGroupName($sGroupName) { global $default, $lang_err_user_group; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT GULT.id FROM " . $default->owl_users_groups_table . " AS GULT INNER JOIN " . $default->owl_groups_table . " AS G ON GULT.group_id = G.ID WHERE G.name = '" . $sGroupName . "' AND user_id = " . $_SESSION["userID"]); if ($sql->next_record()) { return true; @@ -236,7 +236,7 @@ class Permission { */ function userHasWriteRoleForFolder($iFolderID) { global $default, $lang_err_user_role; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * FROM " . $default->owl_folders_user_roles_table . " AS FURL INNER JOIN " . $default->owl_roles_table . " AS R ON FURL.role_type_id = R.id " . "WHERE folder_id = " . $iFolderID . " " . "AND user_id = " . $_SESSION["userID"] . " " . @@ -257,7 +257,7 @@ class Permission { */ function userHasReadRoleForFolder($iFolderID) { global $default, $lang_err_user_role; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT * " . "FROM " . $default->owl_folders_user_roles_table . " AS FURL INNER JOIN " . $default->owl_roles_table . " AS R ON FURL.role_type_id = R.id " . "WHERE folder_id = " . $iFolderID . " " . @@ -279,7 +279,7 @@ class Permission { */ function roleIDExists($iRoleID) { global $default, $lang_err_role_not_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT id FROM " . $default->owl_roles_table . " WHERE id = " . $iRoleID); if ($sql->next_record()) { return true; @@ -297,7 +297,7 @@ class Permission { */ function roleNameExists($sRoleName) { global $default, $lang_err_role_not_exist; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT id FROM " . $default->owl_roles_table . " WHERE name = '" . $sRoleName . "'"); if ($sql->next_record()) { return true; @@ -316,7 +316,7 @@ class Permission { function getRoleID($sRoleName) { global $default, $lang_err_database; if (roleExists($sRoleName)) { - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT id FROM " . $default->owl_roles_table . " WHERE name = '" . $sRoleName . "'"); $sql->next_record(); return $sql->f("id"); @@ -333,7 +333,7 @@ class Permission { */ function userIsSystemAdministrator() { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT UGL.group_id " . "FROM $default->owl_users_groups_table AS UGL INNER JOIN $default->owl_groups_table AS GL ON UGL.group_id = GL.id " . "WHERE UGL.user_id = " . $_SESSION["userID"] . " " . @@ -348,7 +348,7 @@ class Permission { */ function userIsUnitAdministrator() { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT UGL.group_id " . "FROM $default->owl_users_groups_table AS UGL INNER JOIN $default->owl_groups_units_table AS GUL ON GUL.group_id = UGL.group_id " . "INNER JOIN $default->owl_groups_table AS GL ON GL.id = UGL.group_id " . @@ -364,7 +364,7 @@ class Permission { */ function userIsUnitAdministratorForFolder($iFolderID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $sql->query("SELECT UGL.group_id " . "FROM $default->owl_users_groups_table AS UGL INNER JOIN $default->owl_groups_units_table AS GUL ON GUL.group_id = UGL.group_id " . "INNER JOIN $default->owl_groups_table AS GL ON GL.id = UGL.group_id " . @@ -382,7 +382,7 @@ class Permission { */ function userIsGuest() { global $default; - $sql = new Owl_DB(); + $sql = $default->db; // you're a guest user if you're in the Anonymous group $sql->query("SELECT UGL.group_id FROM $default->owl_users_groups_table AS UGL INNER JOIN $default->owl_groups_table AS GL ON GL.id = UGL.group_id diff --git a/lib/session/Session.inc b/lib/session/Session.inc index bb6a0b0..d38c316 100644 --- a/lib/session/Session.inc +++ b/lib/session/Session.inc @@ -35,7 +35,7 @@ class Session { $default->log->debug("Session::create() new session for $userID, from $ip, sessionID=$sessionID"); // insert session information into db - $sql = new Owl_DB; + $sql = $default->db; $query = "INSERT INTO $default->owl_sessions_table (session_id, user_id, lastused, ip) VALUES ('$sessionID', '$userID', '" . date("Y-m-d H:i:s", time()) . "', '$ip')"; $result = $sql->query($query); @@ -54,7 +54,7 @@ class Session { session_start(); // remove the session information from the database - $sql = new Owl_DB; + $sql = $default->db; $query = "DELETE FROM $default->owl_sessions_table WHERE session_id = '" . session_id() . "'"; $sql->query($query); @@ -72,7 +72,7 @@ class Session { global $default; // deletes any sessions for this userID where the default timeout has elapsed. $time = time() - $default->owl_timeout; - $sql = new Owl_DB; + $sql = $default->db; $sql->query("DELETE FROM $default->owl_sessions_table WHERE user_id = '" . $userID . "' AND lastused <= '" . formatDateTime($time) . "'"); } @@ -92,7 +92,7 @@ class Session { $sessionStatus = 0; // this should be an existing session, so check the db - $sql = new Owl_DB; + $sql = $default->db; $sql->query("SELECT * FROM $default->owl_sessions_table WHERE session_id = '$sessionID'"); $numrows = $sql->num_rows($sql); diff --git a/lib/session/SiteMap.inc b/lib/session/SiteMap.inc index a901db2..ee92899 100644 --- a/lib/session/SiteMap.inc +++ b/lib/session/SiteMap.inc @@ -155,7 +155,7 @@ class SiteMap { */ function getSectionLinksUsingDB($sSectionName) { global $default, $lang_err_database, $fFolderID; - $sql = new Owl_DB(); + $sql = $default->db; // lookup sectionID $sectionID = lookupID($default->owl_site_sections_table, "name", $sSectionName); if ($sectionID) { @@ -258,7 +258,7 @@ class SiteMap { */ function getPageUsingDB($action) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; // lookup the page and access_id from the sitemap if ($sql->query("SELECT page, access_id FROM $default->owl_sitemap_table WHERE action='$action'")) { if ($sql->next_record()) { @@ -332,7 +332,7 @@ class SiteMap { */ function getSectionNameUsingDB($sRequiredPage) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; // lookup the page and access_id from the sitemap if ($sql->query("SELECT SSL.name FROM $default->owl_sitemap_table AS S INNER JOIN $default->owl_site_sections_table AS SSL ON S.section_id=SSL.id @@ -394,7 +394,7 @@ class SiteMap { */ function getDefaultActionUsingDB($sSectionName) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; // lookup sectionID $sectionID = lookupID($default->owl_site_sections_table, "name", $sSectionName); if ($sectionID) { @@ -474,7 +474,7 @@ class SiteMap { */ function getActionFromPageUsingDB($sPage) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; // lookup the action for the specified page if ($sql->query("SELECT action FROM $default->owl_sitemap_table WHERE page='$sPage'")) { @@ -532,7 +532,7 @@ class SiteMap { */ function syncWithDB() { global $default; - $sql = new Owl_DB(); + $sql = $default->db; // only if we're using the array if (!$this->bUseDB) { diff --git a/lib/unitmanagement/Unit.inc b/lib/unitmanagement/Unit.inc index 6c92260..11032e3 100644 --- a/lib/unitmanagement/Unit.inc +++ b/lib/unitmanagement/Unit.inc @@ -70,7 +70,7 @@ class Unit { //if the object hasn't been created if ($this->iId < 0) { //check to see if name exsits - $sql = new Owl_DB(); + $sql = $default->db; $query = "SELECT name FROM ". $default->owl_units_table ." WHERE name = '" . $this->sName . "'"; $sql->query($query); $rows = $sql->num_rows($sql); @@ -109,7 +109,7 @@ class Unit { //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_units_table . " SET name = '" . addslashes($this->sName) . "' WHERE id = $this->iId"); if ($result) { @@ -134,7 +134,7 @@ class Unit { //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_units_table WHERE id = $this->iId"); if ($result) { @@ -158,7 +158,7 @@ class Unit { function & get($iUnitID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_units_table WHERE id = $iUnitID"); if ($result) { @@ -207,7 +207,7 @@ class Unit { global $default, $lang_err_database; $aUnitArray; settype($aUnitArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_units_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { diff --git a/lib/users/User.inc b/lib/users/User.inc index 0381865..fbba181 100644 --- a/lib/users/User.inc +++ b/lib/users/User.inc @@ -279,7 +279,7 @@ class User { if ($this->iId < 0) { //check to see if name exsits - $sql = new Owl_DB(); + $sql = $default->db; $query = "SELECT username FROM ". $default->owl_users_table ." WHERE username = '" . $this->sUserName . "'"; $sql->query($query); $rows = $sql->num_rows($sql); @@ -318,7 +318,7 @@ class User { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_users_table . " SET username = '" . addslashes($this->sUserName) . "', name = '" . addslashes($this->sName) . "', " . ($this->bPasswordChanged ? "password = '" . addslashes(md5($this->sPassword)) . "', " : " ") . " quota_max = $this->iQuotaMax, email = '" . addslashes($this->sEmail) . "', mobile = '" . addslashes($this->sMobile) . "', email_notification = " . ($this->bEmailNotification ? 1 : 0) . ", sms_notification = " . ($this->bSmsNotification ? 1 : 0) . ", ldap_dn = '" . addslashes($this->sLdapDn) . "', max_sessions = $this->iMaxSessions, language_id = $this->iLanguageID WHERE id = $this->iId"); if ($result) { return true; @@ -340,7 +340,7 @@ class User { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_users_table WHERE id = $this->iId"); if ($result) { return true; @@ -362,7 +362,7 @@ class User { */ function & get($iUserID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_users_table WHERE id = $iUserID"); if ($result) { if ($sql->next_record()) { @@ -389,7 +389,7 @@ class User { global $default, $lang_err_database; $aUserArray; settype($aUserArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_users_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; @@ -415,7 +415,7 @@ class User { function getUnitID($userID) { global $default, $lang_err_database; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT DISTINCT gul.unit_id FROM $default->owl_users_groups_table ugl " . "INNER JOIN $default->owl_groups_units_table gul ON ugl.group_id = gul.group_id ". "WHERE ugl.user_id=$userID"); diff --git a/lib/visualpatterns/PatternDatabaseTable.inc b/lib/visualpatterns/PatternDatabaseTable.inc index 5bd5e19..67f4c42 100644 --- a/lib/visualpatterns/PatternDatabaseTable.inc +++ b/lib/visualpatterns/PatternDatabaseTable.inc @@ -103,7 +103,9 @@ class PatternDatabaseTable { * * @todo possibly add in image size restraints for link types 2 and 3 */ - function & render() { + function & render() { + global $default; + $sToRender = "\n"; $sToRender .= "\n"; //$i starts at 1 because the $aColumns[0] is the ID column, which @@ -113,7 +115,7 @@ class PatternDatabaseTable { } $sToRender .= "\n"; - $sql = & new Owl_DB(); + $sql = & $default->db; $sql->createSQLQueryWithOffset($this->sTableName, $this->aColumns, $this->iStartIndex, $this->iResultsToDisplay); diff --git a/lib/visualpatterns/PatternEditableListFromQuery.inc b/lib/visualpatterns/PatternEditableListFromQuery.inc index b782d6a..cd4a6a8 100644 --- a/lib/visualpatterns/PatternEditableListFromQuery.inc +++ b/lib/visualpatterns/PatternEditableListFromQuery.inc @@ -79,7 +79,9 @@ class PatternEditableListFromQuery { } function & render() { - $sql = new Owl_DB(); + global $default; + + $sql = $default->db; $sql->query($this->sQuery); if ($sql->next_record()) {; $sToRender = ""; diff --git a/lib/visualpatterns/PatternEditableTableSqlQuery.inc b/lib/visualpatterns/PatternEditableTableSqlQuery.inc index bec2f39..6075df3 100644 --- a/lib/visualpatterns/PatternEditableTableSqlQuery.inc +++ b/lib/visualpatterns/PatternEditableTableSqlQuery.inc @@ -80,6 +80,8 @@ class PatternEditableTableSqlQuery { } function & render() { + global $default; + //$sToRender = "
sWidth>\n"; $sToRender = "
\n"; if (isset($this->sTableCaption)) { @@ -90,7 +92,7 @@ class PatternEditableTableSqlQuery { $sToRender .= "\n"; } } - $sql = new Owl_DB(); + $sql = $default->db; $sql->query($this->sQuery); if ($sql->num_rows() == 0) { $sToRender .= "\n"; diff --git a/lib/visualpatterns/PatternListBox.inc b/lib/visualpatterns/PatternListBox.inc index 2397de1..5fb5d55 100644 --- a/lib/visualpatterns/PatternListBox.inc +++ b/lib/visualpatterns/PatternListBox.inc @@ -54,7 +54,9 @@ class PatternListBox { * */ function & render() { - $sql = new Owl_DB(); + global $default; + + $sql = $default->db; $sQuery = "SELECT DISTINCT $this->sDisplayColumn AS display, $this->sValueColumn AS value FROM $this->sTableName "; if (isset($this->sWhereClause)) { $sQuery .= "WHERE " . $this->sWhereClause . " "; diff --git a/lib/visualpatterns/PatternListFromQuery.inc b/lib/visualpatterns/PatternListFromQuery.inc index aded3cc..026111c 100644 --- a/lib/visualpatterns/PatternListFromQuery.inc +++ b/lib/visualpatterns/PatternListFromQuery.inc @@ -70,7 +70,9 @@ class PatternListFromQuery { } function & render() { - $sql = new Owl_DB(); + global $default; + + $sql = $default->db; $sql->query($this->sQuery); $sToRender = ""; $sToRender .= "
" . $this->aColumnHeaderNames[$i] . "
iTableWidth) ? ", width = $this->iTableWidth" : "") . " >\n"; diff --git a/lib/visualpatterns/PatternMainPage.inc b/lib/visualpatterns/PatternMainPage.inc index 77506bd..d841fec 100644 --- a/lib/visualpatterns/PatternMainPage.inc +++ b/lib/visualpatterns/PatternMainPage.inc @@ -17,6 +17,8 @@ class PatternMainPage { function PatternMainPage() { + global $default; + $this->sFormAction = "$default->owl_root_url/control.php"; } diff --git a/lib/visualpatterns/PatternTableSqlQuery.inc b/lib/visualpatterns/PatternTableSqlQuery.inc index a64e1fe..5cfed44 100644 --- a/lib/visualpatterns/PatternTableSqlQuery.inc +++ b/lib/visualpatterns/PatternTableSqlQuery.inc @@ -84,7 +84,9 @@ class PatternTableSqlQuery { * * @todo possibly add in image size restraints for link types 2 and 3 */ - function & render() { + function & render() { + global $default; + $sToRender = "
\n"; if (isset($this->sTableHeading)) { $sToRender .= "\n"; @@ -94,7 +96,7 @@ class PatternTableSqlQuery { $sToRender .= "\n"; } } - $sql = new Owl_DB(); + $sql = $default->db; $sql->query($this->sQuery); if ($sql->num_rows() == 0) { $sToRender .= "\n"; diff --git a/lib/web/Subscription.inc b/lib/web/Subscription.inc index 4e69550..f64e264 100644 --- a/lib/web/Subscription.inc +++ b/lib/web/Subscription.inc @@ -51,7 +51,7 @@ class Subscription { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_subscriptions_table . " (user_id, document_id) VALUES ($this->iUserID, $this->iDocumentID)"); if ($result) { $this->iId = $sql->insert_id(); @@ -74,7 +74,7 @@ class Subscription { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_subscriptions_table . " SET user_id = $this->iUserID, document_id = $this->iDocumentID WHERE id = $this->iId"); if ($result) { return true; @@ -96,7 +96,7 @@ class Subscription { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_subscriptions_table WHERE id = $this->iId"); if ($result) { return true; @@ -118,7 +118,7 @@ class Subscription { */ function & get($iSubscriptionID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_subscriptions_table WHERE id = $iSubscriptionID"); if ($result) { if ($sql->next_record()) { @@ -145,7 +145,7 @@ class Subscription { global $default, $lang_err_database; $aSubscriptionArray; settype($aSubscriptionArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_subscriptions_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/web/WebDocument.inc b/lib/web/WebDocument.inc index bab92c5..2763fdc 100644 --- a/lib/web/WebDocument.inc +++ b/lib/web/WebDocument.inc @@ -50,7 +50,7 @@ class WebDocument { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_web_documents_table . " (document_id, web_site_id, unit_id, status_id, datetime) VALUES ($this->iDocumentID, $this->iWebSiteID, $this->iUnitID, $this->iStatusID, '$this->dDateTime')"); if ($result) { $this->iId = $sql->insert_id(); @@ -73,7 +73,7 @@ class WebDocument { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_web_documents_table . " SET document_id = $this->iDocumentID, web_site_id = $this->iWebSiteID, unit_id = $this->iUnitID, status_id = $this->iStatusID, datetime = '$this->dDateTime' WHERE id = $this->iId"); if ($result) { return true; @@ -95,7 +95,7 @@ class WebDocument { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_web_documents_table WHERE id = $this->iId"); if ($result) { return true; @@ -117,7 +117,7 @@ class WebDocument { */ function & get($iWebDocumentsID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_web_documents_table WHERE id = $iWebDocumentsID"); if ($result) { if ($sql->next_record()) { @@ -144,7 +144,7 @@ class WebDocument { global $default, $lang_err_database; $aWebDocumentArray; settype($aWebDocumentArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_web_documents_table . (isset($sWhereClause) ? " " . $sWhereClause : "")); if ($result) { $iCount = 0; diff --git a/lib/web/WebSite.inc b/lib/web/WebSite.inc index bdd2895..68d5285 100644 --- a/lib/web/WebSite.inc +++ b/lib/web/WebSite.inc @@ -120,7 +120,7 @@ class WebSite { global $default, $lang_err_database, $lang_err_object_exists; //if the object hasn't been created if ($this->iId < 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("INSERT INTO " . $default->owl_web_sites_table . " (web_site_name, web_site_url, web_master_id) VALUES ('" . addslashes($this->sWebSiteName) . "', '" . addslashes($this->sWebSiteURL) . "', $this->iWebMasterID)"); if ($result) { $this->iId = $sql->insert_id(); @@ -143,7 +143,7 @@ class WebSite { global $default, $lang_err_database, $lang_err_object_key; //only update if the object has been stored if ($this->iId > 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("UPDATE " . $default->owl_web_sites_table . " SET web_site_name = '" . addslashes($this->sWebSiteName) . "', web_site_url = '" . addslashes($this->sWebSiteURL) . "', web_master_id = $this->iWebMasterID WHERE id = $this->iId"); if ($result) { return true; @@ -165,7 +165,7 @@ class WebSite { global $default, $lang_err_database, $lang_err_object_key; //only delete the object if it exists in the database if ($this->iId >= 0) { - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("DELETE FROM $default->owl_web_sites_table WHERE id = $this->iId"); if ($result) { return true; @@ -187,7 +187,7 @@ class WebSite { */ function & get($iWebSiteID) { global $default; - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM $default->owl_web_sites_table WHERE id = $iWebSiteID"); if ($result) { if ($sql->next_record()) { @@ -212,7 +212,7 @@ class WebSite { global $default, $lang_err_database; $aWebSiteArray; settype($aWebSiteArray, "array"); - $sql = new Owl_DB(); + $sql = $default->db; $result = $sql->query("SELECT * FROM " . $default->owl_web_sites_table); if ($result) { $iCount = 0; diff --git a/presentation/lookAndFeel/knowledgeTree/store.php b/presentation/lookAndFeel/knowledgeTree/store.php index 19232b8..2135b82 100644 --- a/presentation/lookAndFeel/knowledgeTree/store.php +++ b/presentation/lookAndFeel/knowledgeTree/store.php @@ -116,7 +116,7 @@ for ($i = 0; $i < count($aKeys); $i++) { break; } //execute the query - $sql = new Owl_DB(); + $sql = $default->db; $sql->query($sQuery); } else { //perform an update @@ -149,7 +149,7 @@ for ($i = 0; $i < count($aKeys); $i++) { } $sQuery .= "WHERE id = $iPrimaryKey"; //execute the query - $sql = new Owl_DB(); + $sql = $default->db; $sql->query($sQuery); }
$this->sTableHeading
" . $this->aColumnHeaderNames[$i] . "