From 6e41c58beb51eecf6af693bc9a0348644f5872c5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 10 Feb 2017 08:04:19 +0100 Subject: [PATCH] add backticks around identifier in sql statements --- SeedDMS_Core/Core/inc.ClassAttribute.php | 52 +++--- SeedDMS_Core/Core/inc.ClassDMS.php | 112 +++++------ SeedDMS_Core/Core/inc.ClassDocument.php | 176 +++++++++--------- .../Core/inc.ClassDocumentCategory.php | 12 +- SeedDMS_Core/Core/inc.ClassFolder.php | 88 ++++----- SeedDMS_Core/Core/inc.ClassGroup.php | 40 ++-- SeedDMS_Core/Core/inc.ClassKeywords.php | 16 +- SeedDMS_Core/Core/inc.ClassObject.php | 18 +- SeedDMS_Core/Core/inc.ClassUser.php | 154 +++++++-------- SeedDMS_Core/Core/inc.ClassWorkflow.php | 64 +++---- 10 files changed, 366 insertions(+), 366 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php index 9a8bad29d..d8842c1f8 100644 --- a/SeedDMS_Core/Core/inc.ClassAttribute.php +++ b/SeedDMS_Core/Core/inc.ClassAttribute.php @@ -207,21 +207,21 @@ class SeedDMS_Core_Attribute { /* {{{ */ switch(get_class($this->_obj)) { case $this->_dms->getClassname('document'): if(trim($value) === '') - $queryStr = "DELETE FROM tblDocumentAttributes WHERE `document` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); + $queryStr = "DELETE FROM `tblDocumentAttributes` WHERE `document` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); else - $queryStr = "UPDATE tblDocumentAttributes SET value = ".$db->qstr($value)." WHERE `document` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); + $queryStr = "UPDATE `tblDocumentAttributes` SET `value` = ".$db->qstr($value)." WHERE `document` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); break; case $this->_dms->getClassname('documentcontent'): if(trim($value) === '') - $queryStr = "DELETE FROM tblDocumentContentAttributes WHERE `content` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); + $queryStr = "DELETE FROM `tblDocumentContentAttributes` WHERE `content` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); else - $queryStr = "UPDATE tblDocumentContentAttributes SET value = ".$db->qstr($value)." WHERE `content` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); + $queryStr = "UPDATE `tblDocumentContentAttributes` SET `value` = ".$db->qstr($value)." WHERE `content` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); break; case $this->_dms->getClassname('folder'): if(trim($value) === '') - $queryStr = "DELETE FROM tblFolderAttributes WHERE `folder` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); + $queryStr = "DELETE FROM `tblFolderAttributes WHERE` `folder` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); else - $queryStr = "UPDATE tblFolderAttributes SET value = ".$db->qstr($value)." WHERE `folder` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); + $queryStr = "UPDATE `tblFolderAttributes` SET `value` = ".$db->qstr($value)." WHERE `folder` = " . $this->_obj->getID() . " AND `attrdef` = " . $this->_attrdef->getId(); break; default: return false; @@ -446,7 +446,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setName($name) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET name =".$db->qstr($name)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `name` =".$db->qstr($name)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -476,7 +476,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setObjType($objtype) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET objtype =".intval($objtype)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `objtype` =".intval($objtype)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -506,7 +506,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setType($type) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET type =".intval($type)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `type` =".intval($type)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -531,7 +531,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setMultipleValues($mv) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET multiple =".intval($mv)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `multiple` =".intval($mv)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -553,7 +553,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setMinValues($minvalues) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET minvalues =".intval($minvalues)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `minvalues` =".intval($minvalues)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -575,7 +575,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setMaxValues($maxvalues) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET maxvalues =".intval($maxvalues)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `maxvalues` =".intval($maxvalues)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -671,7 +671,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET valueset =".$db->qstr($valuesetstr)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `valueset` =".$db->qstr($valuesetstr)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -701,7 +701,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function setRegex($regex) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblAttributeDefinitions SET regex =".$db->qstr($regex)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblAttributeDefinitions` SET `regex` =".$db->qstr($regex)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -721,13 +721,13 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ function isUsed() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentAttributes WHERE attrdef=".$this->_id; + $queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) { - $queryStr = "SELECT * FROM tblFolderAttributes WHERE attrdef=".$this->_id; + $queryStr = "SELECT * FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) { - $queryStr = "SELECT * FROM tblDocumentContentAttributes WHERE attrdef=".$this->_id; + $queryStr = "SELECT * FROM `tblDocumentContentAttributes` WHERE `attrdef`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) { @@ -780,7 +780,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ $result = array('docs'=>array(), 'folders'=>array(), 'contents'=>array()); if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all || $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_document) { - $queryStr = "SELECT * FROM tblDocumentAttributes WHERE attrdef=".$this->_id; + $queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id; if($limit) $queryStr .= " limit ".(int) $limit; $resArr = $db->getResultArray($queryStr); @@ -791,7 +791,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ } } } - $queryStr = "SELECT count(*) c, value FROM tblDocumentAttributes WHERE attrdef=".$this->_id." GROUP BY value ORDER BY c DESC"; + $queryStr = "SELECT count(*) c, `value` FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." GROUP BY `value` ORDER BY c DESC"; $resArr = $db->getResultArray($queryStr); if($resArr) { $result['frequencies']['document'] = $resArr; @@ -800,7 +800,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all || $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_folder) { - $queryStr = "SELECT * FROM tblFolderAttributes WHERE attrdef=".$this->_id; + $queryStr = "SELECT * FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id; if($limit) $queryStr .= " limit ".(int) $limit; $resArr = $db->getResultArray($queryStr); @@ -811,7 +811,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ } } } - $queryStr = "SELECT count(*) c, value FROM tblFolderAttributes WHERE attrdef=".$this->_id." GROUP BY value ORDER BY c DESC"; + $queryStr = "SELECT count(*) c, `value` FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id." GROUP BY `value` ORDER BY c DESC"; $resArr = $db->getResultArray($queryStr); if($resArr) { $result['frequencies']['folder'] = $resArr; @@ -820,7 +820,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all || $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) { - $queryStr = "SELECT * FROM tblDocumentContentAttributes WHERE attrdef=".$this->_id; + $queryStr = "SELECT * FROM `tblDocumentContentAttributes` WHERE `attrdef`=".$this->_id; if($limit) $queryStr .= " limit ".(int) $limit; $resArr = $db->getResultArray($queryStr); @@ -831,7 +831,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ } } } - $queryStr = "SELECT count(*) c, value FROM tblDocumentContentAttributes WHERE attrdef=".$this->_id." GROUP BY value ORDER BY c DESC"; + $queryStr = "SELECT count(*) c, `value` FROM `tblDocumentContentAttributes` WHERE `attrdef`=".$this->_id." GROUP BY `value` ORDER BY c DESC"; $resArr = $db->getResultArray($queryStr); if($resArr) { $result['frequencies']['content'] = $resArr; @@ -854,7 +854,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ return false; // Delete user itself - $queryStr = "DELETE FROM tblAttributeDefinitions WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblAttributeDefinitions` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; return true; @@ -873,7 +873,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ $result = array('docs'=>array(), 'folders'=>array(), 'contents'=>array()); if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all || $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_document) { - $queryStr = "SELECT * FROM tblDocumentAttributes WHERE attrdef=".$this->_id." AND value=".$db->qstr($attrvalue); + $queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue); if($limit) $queryStr .= " limit ".(int) $limit; $resArr = $db->getResultArray($queryStr); @@ -888,7 +888,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */ if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all || $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_folder) { - $queryStr = "SELECT * FROM tblFolderAttributes WHERE attrdef=".$this->_id." AND value=".$db->qstr($attrvalue); + $queryStr = "SELECT * FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue); if($limit) $queryStr .= " limit ".(int) $limit; $resArr = $db->getResultArray($queryStr); diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 2f632e959..584a75499 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -411,7 +411,7 @@ class SeedDMS_Core_DMS { $tbllist = explode(',',strtolower(join(',',$tbllist))); if(!array_search('tblversion', $tbllist)) return false; - $queryStr = "SELECT * FROM tblVersion order by major,minor,subminor limit 1"; + $queryStr = "SELECT * FROM `tblVersion` order by `major`,`minor`,`subminor` limit 1"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -433,7 +433,7 @@ class SeedDMS_Core_DMS { $tbllist = explode(',',strtolower(join(',',$tbllist))); if(!array_search('tblversion', $tbllist)) return true; - $queryStr = "SELECT * FROM tblVersion order by major,minor,subminor limit 1"; + $queryStr = "SELECT * FROM `tblVersion` order by `major`,`minor`,`subminor` limit 1"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -601,7 +601,7 @@ class SeedDMS_Core_DMS { function getDocumentContent($id) { /* {{{ */ if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblDocumentContent WHERE id = ".(int) $id; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `id` = ".(int) $id; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1030,7 +1030,7 @@ class SeedDMS_Core_DMS { if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status) { // Count the number of rows that the search will produce. - $resArr = $this->db->getResultArray("SELECT COUNT(*) AS num FROM (SELECT DISTINCT `tblDocuments`.id ".$searchQuery.") a"); + $resArr = $this->db->getResultArray("SELECT COUNT(*) AS num FROM (SELECT DISTINCT `tblDocuments`.`id` ".$searchQuery.") a"); $totalDocs = 0; if (is_numeric($resArr[0]["num"]) && $resArr[0]["num"]>0) { $totalDocs = (integer)$resArr[0]["num"]; @@ -1124,7 +1124,7 @@ class SeedDMS_Core_DMS { function getFolderByName($name, $folder=null) { /* {{{ */ if (!$name) return false; - $queryStr = "SELECT * FROM tblFolders WHERE name = " . $this->db->qstr($name); + $queryStr = "SELECT * FROM `tblFolders` WHERE `name` = " . $this->db->qstr($name); if($folder) $queryStr .= " AND `parent` = ". $folder->getID(); $queryStr .= " LIMIT 1"; @@ -1150,7 +1150,7 @@ class SeedDMS_Core_DMS { * @return array list of errors */ function checkFolders() { /* {{{ */ - $queryStr = "SELECT * FROM tblFolders"; + $queryStr = "SELECT * FROM `tblFolders`"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr === false) @@ -1184,7 +1184,7 @@ class SeedDMS_Core_DMS { * @return array list of errors */ function checkDocuments() { /* {{{ */ - $queryStr = "SELECT * FROM tblFolders"; + $queryStr = "SELECT * FROM `tblFolders`"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr === false) @@ -1195,7 +1195,7 @@ class SeedDMS_Core_DMS { $fcache[$rec['id']] = array('name'=>$rec['name'], 'parent'=>$rec['parent'], 'folderList'=>$rec['folderList']); } - $queryStr = "SELECT * FROM tblDocuments"; + $queryStr = "SELECT * FROM `tblDocuments`"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr === false) @@ -1297,7 +1297,7 @@ class SeedDMS_Core_DMS { $role = '0'; if(trim($pwdexpiration) == '') $pwdexpiration = '0000-00-00 00:00:00'; - $queryStr = "INSERT INTO tblUsers (login, pwd, fullName, email, language, theme, comment, role, hidden, disabled, pwdExpiration, quota, homefolder) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$db->qstr($pwdexpiration).", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")"; + $queryStr = "INSERT INTO `tblUsers` (`login`, `pwd`, `fullName`, `email`, `language`, `theme`, `comment`, `role`, `hidden`, `disabled`, `pwdExpiration`, `quota`, `homefolder`) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$db->qstr($pwdexpiration).", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")"; $res = $this->db->getResult($queryStr); if (!$res) return false; @@ -1360,7 +1360,7 @@ class SeedDMS_Core_DMS { return false; } - $queryStr = "INSERT INTO tblGroups (name, comment) VALUES (".$this->db->qstr($name).", ".$this->db->qstr($comment).")"; + $queryStr = "INSERT INTO `tblGroups` (`name`, `comment`) VALUES (".$this->db->qstr($name).", ".$this->db->qstr($comment).")"; if (!$this->db->getResult($queryStr)) return false; @@ -1381,7 +1381,7 @@ class SeedDMS_Core_DMS { if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblKeywordCategories WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblKeywordCategories` WHERE `id` = " . (int) $id; $resArr = $this->db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr) || (count($resArr) != 1)) return false; @@ -1393,7 +1393,7 @@ class SeedDMS_Core_DMS { } /* }}} */ function getKeywordCategoryByName($name, $userID) { /* {{{ */ - $queryStr = "SELECT * FROM tblKeywordCategories WHERE name = " . $this->db->qstr($name) . " AND owner = " . (int) $userID; + $queryStr = "SELECT * FROM `tblKeywordCategories` WHERE `name` = " . $this->db->qstr($name) . " AND `owner` = " . (int) $userID; $resArr = $this->db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr) || (count($resArr) != 1)) return false; @@ -1405,9 +1405,9 @@ class SeedDMS_Core_DMS { } /* }}} */ function getAllKeywordCategories($userIDs = array()) { /* {{{ */ - $queryStr = "SELECT * FROM tblKeywordCategories"; + $queryStr = "SELECT * FROM `tblKeywordCategories`"; if ($userIDs) - $queryStr .= " WHERE owner in (".implode(',', $userIDs).")"; + $queryStr .= " WHERE `owner` IN (".implode(',', $userIDs).")"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) @@ -1427,9 +1427,9 @@ class SeedDMS_Core_DMS { * This function should be replaced by getAllKeywordCategories() */ function getAllUserKeywordCategories($userID) { /* {{{ */ - $queryStr = "SELECT * FROM tblKeywordCategories"; + $queryStr = "SELECT * FROM `tblKeywordCategories`"; if ($userID != -1) - $queryStr .= " WHERE owner = " . (int) $userID; + $queryStr .= " WHERE `owner` = " . (int) $userID; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) @@ -1449,7 +1449,7 @@ class SeedDMS_Core_DMS { if (is_object($this->getKeywordCategoryByName($name, $userID))) { return false; } - $queryStr = "INSERT INTO tblKeywordCategories (owner, name) VALUES (".(int) $userID.", ".$this->db->qstr($name).")"; + $queryStr = "INSERT INTO `tblKeywordCategories` (`owner`, `name`) VALUES (".(int) $userID.", ".$this->db->qstr($name).")"; if (!$this->db->getResult($queryStr)) return false; @@ -1470,7 +1470,7 @@ class SeedDMS_Core_DMS { if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblCategory WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblCategory` WHERE `id` = " . (int) $id; $resArr = $this->db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr) || (count($resArr) != 1)) return false; @@ -1482,7 +1482,7 @@ class SeedDMS_Core_DMS { } /* }}} */ function getDocumentCategories() { /* {{{ */ - $queryStr = "SELECT * FROM tblCategory order by name"; + $queryStr = "SELECT * FROM `tblCategory` order by `name`"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) @@ -1509,7 +1509,7 @@ class SeedDMS_Core_DMS { function getDocumentCategoryByName($name) { /* {{{ */ if (!$name) return false; - $queryStr = "SELECT * FROM tblCategory where name=".$this->db->qstr($name); + $queryStr = "SELECT * FROM `tblCategory` where `name`=".$this->db->qstr($name); $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; @@ -1525,7 +1525,7 @@ class SeedDMS_Core_DMS { if (is_object($this->getDocumentCategoryByName($name))) { return false; } - $queryStr = "INSERT INTO tblCategory (name) VALUES (".$this->db->qstr($name).")"; + $queryStr = "INSERT INTO `tblCategory` (`name`) VALUES (".$this->db->qstr($name).")"; if (!$this->db->getResult($queryStr)) return false; @@ -1577,7 +1577,7 @@ class SeedDMS_Core_DMS { */ function createPasswordRequest($user) { /* {{{ */ $hash = md5(uniqid(time())); - $queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$this->db->getCurrentDatetime().")"; + $queryStr = "INSERT INTO `tblUserPasswordRequest` (`userID`, `hash`, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$this->db->getCurrentDatetime().")"; $resArr = $this->db->getResult($queryStr); if (is_bool($resArr) && !$resArr) return false; return $hash; @@ -1593,7 +1593,7 @@ class SeedDMS_Core_DMS { */ function checkPasswordRequest($hash) { /* {{{ */ /* Get the password request from the database */ - $queryStr = "SELECT * FROM tblUserPasswordRequest where hash=".$this->db->qstr($hash); + $queryStr = "SELECT * FROM `tblUserPasswordRequest` where `hash`=".$this->db->qstr($hash); $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1613,7 +1613,7 @@ class SeedDMS_Core_DMS { */ function deletePasswordRequest($hash) { /* {{{ */ /* Delete the request, so nobody can use it a second time */ - $queryStr = "DELETE FROM tblUserPasswordRequest WHERE hash=".$this->db->qstr($hash); + $queryStr = "DELETE FROM `tblUserPasswordRequest` WHERE `hash`=".$this->db->qstr($hash); if (!$this->db->getResult($queryStr)) return false; return true; @@ -1632,7 +1632,7 @@ class SeedDMS_Core_DMS { if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblAttributeDefinitions WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblAttributeDefinitions` WHERE `id` = " . (int) $id; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1656,7 +1656,7 @@ class SeedDMS_Core_DMS { function getAttributeDefinitionByName($name) { /* {{{ */ if (!$name) return false; - $queryStr = "SELECT * FROM tblAttributeDefinitions WHERE name = " . $this->db->qstr($name); + $queryStr = "SELECT * FROM `tblAttributeDefinitions` WHERE `name` = " . $this->db->qstr($name); $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1676,14 +1676,14 @@ class SeedDMS_Core_DMS { * @return array of instances of {@link SeedDMS_Core_AttributeDefinition} or false */ function getAllAttributeDefinitions($objtype=0) { /* {{{ */ - $queryStr = "SELECT * FROM tblAttributeDefinitions"; + $queryStr = "SELECT * FROM `tblAttributeDefinitions`"; if($objtype) { if(is_array($objtype)) - $queryStr .= ' WHERE objtype in (\''.implode("','", $objtype).'\')'; + $queryStr .= ' WHERE `objtype` in (\''.implode("','", $objtype).'\')'; else - $queryStr .= ' WHERE objtype='.intval($objtype); + $queryStr .= ' WHERE `objtype`='.intval($objtype); } - $queryStr .= ' ORDER BY name'; + $queryStr .= ' ORDER BY `name`'; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -1723,7 +1723,7 @@ class SeedDMS_Core_DMS { } else { $valueset = ''; } - $queryStr = "INSERT INTO tblAttributeDefinitions (name, objtype, type, multiple, minvalues, maxvalues, valueset, regex) VALUES (".$this->db->qstr($name).", ".intval($objtype).", ".intval($type).", ".intval($multiple).", ".intval($minvalues).", ".intval($maxvalues).", ".$this->db->qstr($valueset).", ".$this->db->qstr($regex).")"; + $queryStr = "INSERT INTO `tblAttributeDefinitions` (`name`, `objtype`, `type`, `multiple`, `minvalues`, `maxvalues`, `valueset`, `regex`) VALUES (".$this->db->qstr($name).", ".intval($objtype).", ".intval($type).", ".intval($multiple).", ".intval($minvalues).", ".intval($maxvalues).", ".$this->db->qstr($valueset).", ".$this->db->qstr($regex).")"; $res = $this->db->getResult($queryStr); if (!$res) return false; @@ -1737,13 +1737,13 @@ class SeedDMS_Core_DMS { * @return array of instances of {@link SeedDMS_Core_Workflow} or false */ function getAllWorkflows() { /* {{{ */ - $queryStr = "SELECT * FROM tblWorkflows ORDER BY name"; + $queryStr = "SELECT * FROM `tblWorkflows` ORDER BY `name`"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; - $queryStr = "SELECT * FROM tblWorkflowStates ORDER BY name"; + $queryStr = "SELECT * FROM `tblWorkflowStates` ORDER BY `name`"; $ressArr = $this->db->getResultArray($queryStr); if (is_bool($ressArr) && $ressArr == false) @@ -1770,7 +1770,7 @@ class SeedDMS_Core_DMS { * @return object of instances of {@link SeedDMS_Core_Workflow} or false */ function getWorkflow($id) { /* {{{ */ - $queryStr = "SELECT * FROM tblWorkflows WHERE id=".intval($id); + $queryStr = "SELECT * FROM `tblWorkflows` WHERE `id`=".intval($id); $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -1796,7 +1796,7 @@ class SeedDMS_Core_DMS { function getWorkflowByName($name) { /* {{{ */ if (!$name) return false; - $queryStr = "SELECT * FROM tblWorkflows WHERE name=".$this->db->qstr($name); + $queryStr = "SELECT * FROM `tblWorkflows` WHERE `name`=".$this->db->qstr($name); $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -1824,7 +1824,7 @@ class SeedDMS_Core_DMS { if (is_object($this->getWorkflowByName($name))) { return false; } - $queryStr = "INSERT INTO tblWorkflows (name, initstate) VALUES (".$db->qstr($name).", ".$initstate->getID().")"; + $queryStr = "INSERT INTO `tblWorkflows` (`name`, `initstate`) VALUES (".$db->qstr($name).", ".$initstate->getID().")"; $res = $db->getResult($queryStr); if (!$res) return false; @@ -1844,7 +1844,7 @@ class SeedDMS_Core_DMS { if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblWorkflowStates WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblWorkflowStates` WHERE `id` = " . (int) $id; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1866,7 +1866,7 @@ class SeedDMS_Core_DMS { function getWorkflowStateByName($name) { /* {{{ */ if (!$name) return false; - $queryStr = "SELECT * FROM tblWorkflowStates WHERE name=".$this->db->qstr($name); + $queryStr = "SELECT * FROM `tblWorkflowStates` WHERE `name`=".$this->db->qstr($name); $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -1889,7 +1889,7 @@ class SeedDMS_Core_DMS { * @return array of instances of {@link SeedDMS_Core_Workflow_State} or false */ function getAllWorkflowStates() { /* {{{ */ - $queryStr = "SELECT * FROM tblWorkflowStates ORDER BY name"; + $queryStr = "SELECT * FROM `tblWorkflowStates` ORDER BY `name`"; $ressArr = $this->db->getResultArray($queryStr); if (is_bool($ressArr) && $ressArr == false) @@ -1917,7 +1917,7 @@ class SeedDMS_Core_DMS { if (is_object($this->getWorkflowStateByName($name))) { return false; } - $queryStr = "INSERT INTO tblWorkflowStates (name, documentstatus) VALUES (".$db->qstr($name).", ".(int) $docstatus.")"; + $queryStr = "INSERT INTO `tblWorkflowStates` (`name`, `documentstatus`) VALUES (".$db->qstr($name).", ".(int) $docstatus.")"; $res = $db->getResult($queryStr); if (!$res) return false; @@ -1937,7 +1937,7 @@ class SeedDMS_Core_DMS { if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblWorkflowActions WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblWorkflowActions` WHERE `id` = " . (int) $id; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1961,7 +1961,7 @@ class SeedDMS_Core_DMS { function getWorkflowActionByName($name) { /* {{{ */ if (!$name) return false; - $queryStr = "SELECT * FROM tblWorkflowActions WHERE name = " . $this->db->qstr($name); + $queryStr = "SELECT * FROM `tblWorkflowActions` WHERE `name` = " . $this->db->qstr($name); $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1980,7 +1980,7 @@ class SeedDMS_Core_DMS { * @return array list of instances of {@link SeedDMS_Core_Workflow_Action} or false */ function getAllWorkflowActions() { /* {{{ */ - $queryStr = "SELECT * FROM tblWorkflowActions"; + $queryStr = "SELECT * FROM `tblWorkflowActions`"; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -2007,7 +2007,7 @@ class SeedDMS_Core_DMS { if (is_object($this->getWorkflowActionByName($name))) { return false; } - $queryStr = "INSERT INTO tblWorkflowActions (name) VALUES (".$db->qstr($name).")"; + $queryStr = "INSERT INTO `tblWorkflowActions` (`name`) VALUES (".$db->qstr($name).")"; $res = $db->getResult($queryStr); if (!$res) return false; @@ -2027,7 +2027,7 @@ class SeedDMS_Core_DMS { if (!is_numeric($id)) return false; - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `id` = " . (int) $id; $resArr = $this->db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -2050,7 +2050,7 @@ class SeedDMS_Core_DMS { * the document is gone already. */ function getUnlinkedDocumentContent() { /* {{{ */ - $queryStr = "SELECT * FROM tblDocumentContent WHERE document NOT IN (SELECT id FROM tblDocuments)"; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` NOT IN (SELECT id FROM `tblDocuments`)"; $resArr = $this->db->getResultArray($queryStr); if ($resArr === false) return false; @@ -2074,7 +2074,7 @@ class SeedDMS_Core_DMS { * in version 4.0.0 of SeedDMS for implementation of user quotas. */ function getNoFileSizeDocumentContent() { /* {{{ */ - $queryStr = "SELECT * FROM tblDocumentContent WHERE fileSize = 0 OR fileSize is null"; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `fileSize` = 0 OR `fileSize` is null"; $resArr = $this->db->getResultArray($queryStr); if ($resArr === false) return false; @@ -2098,7 +2098,7 @@ class SeedDMS_Core_DMS { * in version 4.0.0 of SeedDMS for finding duplicates. */ function getNoChecksumDocumentContent() { /* {{{ */ - $queryStr = "SELECT * FROM tblDocumentContent WHERE checksum = '' OR checksum is null"; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `checksum` = '' OR `checksum` is null"; $resArr = $this->db->getResultArray($queryStr); if ($resArr === false) return false; @@ -2122,7 +2122,7 @@ class SeedDMS_Core_DMS { * in version 4.0.0 of SeedDMS for finding duplicates. */ function getDuplicateDocumentContent() { /* {{{ */ - $queryStr = "SELECT a.*, b.id as dupid FROM tblDocumentContent a LEFT JOIN tblDocumentContent b ON a.checksum=b.checksum where a.id!=b.id ORDER by a.id"; + $queryStr = "SELECT a.*, b.`id` as dupid FROM `tblDocumentContent` a LEFT JOIN `tblDocumentContent` b ON a.`checksum`=b.`checksum` where a.`id`!=b.`id` ORDER by a.`id`"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; @@ -2154,29 +2154,29 @@ class SeedDMS_Core_DMS { function getStatisticalData($type='') { /* {{{ */ switch($type) { case 'docsperuser': - $queryStr = "select b.fullname as `key`, count(owner) as total from tblDocuments a left join tblUsers b on a.owner=b.id group by owner"; + $queryStr = "select b.`fullname` as `key`, count(`owner`) as total from `tblDocuments` a left join `tblUsers` b on a.`owner`=b.`id` group by `owner`"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; return $resArr; case 'docspermimetype': - $queryStr = "select b.mimeType as `key`, count(mimeType) as total from tblDocuments a left join tblDocumentContent b on a.id=b.document group by b.mimeType"; + $queryStr = "select b.`mimeType` as `key`, count(mimeType) as total from `tblDocuments` a left join `tblDocumentContent` b on a.`id`=b.`document` group by b.`mimeType`"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; return $resArr; case 'docspercategory': - $queryStr = "select b.name as `key`, count(a.categoryID) as total from tblDocumentCategory a left join tblCategory b on a.categoryID=b.id group by a.categoryID"; + $queryStr = "select b.`name` as `key`, count(a.`categoryID`) as total from `tblDocumentCategory` a left join `tblCategory` b on a.`categoryID`=b.id group by a.`categoryID`"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; return $resArr; case 'docsperstatus': - $queryStr = "select b.status as `key`, count(b.status) as total from (select a.id, max(b.version), max(c.statusLogId) as maxlog from tblDocuments a left join tblDocumentStatus b on a.id=b.documentid left join tblDocumentStatusLog c on b.statusid=c.statusid group by a.id, b.version order by a.id, b.statusid) a left join tblDocumentStatusLog b on a.maxlog=b.statusLogId group by b.status"; - $queryStr = "select b.status as `key`, count(b.status) as total from (select a.id, max(c.statusLogId) as maxlog from tblDocuments a left join tblDocumentStatus b on a.id=b.documentid left join tblDocumentStatusLog c on b.statusid=c.statusid group by a.id order by a.id, b.statusid) a left join tblDocumentStatusLog b on a.maxlog=b.statusLogId group by b.status"; + $queryStr = "select b.`status` as `key`, count(b.`status`) as total from (select a.id, max(b.version), max(c.`statusLogId`) as maxlog from `tblDocuments` a left join `tblDocumentStatus` b on a.id=b.`documentid` left join `tblDocumentStatusLog` c on b.`statusid`=c.`statusid` group by a.`id`, b.`version` order by a.`id`, b.`statusid`) a left join `tblDocumentStatusLog` b on a.`maxlog`=b.`statusLogId` group by b.`status`"; + $queryStr = "select b.status as `key`, count(b.status) as total from (select a.id, max(c.`statusLogId`) as maxlog from `tblDocuments` a left join `tblDocumentStatus` b on a.id=b.`documentid` left join `tblDocumentStatusLog` c on b.`statusid`=c.`statusid` group by a.`id` order by a.id, b.`statusid`) a left join `tblDocumentStatusLog` b on a.maxlog=b.`statusLogId` group by b.`status`"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; @@ -2206,7 +2206,7 @@ class SeedDMS_Core_DMS { } return $resArr; case 'sizeperuser': - $queryStr = "select c.fullname as `key`, sum(fileSize) as total from tblDocuments a left join tblDocumentContent b on a.id=b.document left join tblUsers c on a.owner=c.id group by a.owner"; + $queryStr = "select c.`fullname` as `key`, sum(`fileSize`) as total from `tblDocuments` a left join `tblDocumentContent` b on a.id=b.`document` left join `tblUsers` c on a.`owner`=c.`id` group by a.`owner`"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; @@ -2236,7 +2236,7 @@ class SeedDMS_Core_DMS { $startts = mktime(24, 0, 0); $timeline = array(); - $queryStr = "SELECT document FROM tblDocumentContent WHERE date > ".$startts." AND date < ".$endts; + $queryStr = "SELECT `document` FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts; $resArr = $this->db->getResultArray($queryStr); if ($resArr === false) return false; diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index f15b506e6..948dbfd16 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -170,7 +170,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ public static function getInstance($id, $dms) { /* {{{ */ $db = $dms->getDB(); - $queryStr = "SELECT * FROM tblDocuments WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblDocuments` WHERE `id` = " . (int) $id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -179,7 +179,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $resArr = $resArr[0]; // New Locking mechanism uses a separate table to track the lock. - $queryStr = "SELECT * FROM tblDocumentLocks WHERE document = " . (int) $id; + $queryStr = "SELECT * FROM `tblDocumentLocks` WHERE `document` = " . (int) $id; $lockArr = $db->getResultArray($queryStr); if ((is_bool($lockArr) && $lockArr==false) || (count($lockArr)==0)) { // Could not find a lock on the selected document. @@ -227,7 +227,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments SET name = ".$db->qstr($newName)." WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `name` = ".$db->qstr($newName)." WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -250,7 +250,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setComment($newComment) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments SET comment = ".$db->qstr($newComment)." WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `comment` = ".$db->qstr($newComment)." WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -263,7 +263,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setKeywords($newKeywords) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments SET keywords = ".$db->qstr($newKeywords)." WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `keywords` = ".$db->qstr($newKeywords)." WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -280,7 +280,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $db = $this->_dms->getDB(); if(!$this->_categories) { - $queryStr = "SELECT * FROM tblCategory where id in (select categoryID from tblDocumentCategory where documentID = ".$this->_id.")"; + $queryStr = "SELECT * FROM `tblCategory` where `id` in (select `categoryID` from `tblDocumentCategory` where `documentID` = ".$this->_id.")"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -305,14 +305,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $db = $this->_dms->getDB(); $db->startTransaction(); - $queryStr = "DELETE from tblDocumentCategory WHERE documentID = ". $this->_id; + $queryStr = "DELETE from `tblDocumentCategory` WHERE `documentID` = ". $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } foreach($newCategories as $cat) { - $queryStr = "INSERT INTO tblDocumentCategory (categoryID, documentID) VALUES (". $cat->getId() .", ". $this->_id .")"; + $queryStr = "INSERT INTO `tblDocumentCategory` (`categoryID`, `documentID`) VALUES (". $cat->getId() .", ". $this->_id .")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -350,7 +350,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return false; } - $queryStr = "UPDATE tblDocuments SET date = " . (int) $date . " WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `date` = " . (int) $date . " WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; $this->_date = $date; @@ -380,7 +380,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setFolder($newFolder) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments SET folder = " . $newFolder->getID() . " WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `folder` = " . $newFolder->getID() . " WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; $this->_folderID = $newFolder->getID(); @@ -395,7 +395,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (strlen($flist)>1) { $flist .= ":"; } - $queryStr = "UPDATE tblDocuments SET folderList = '" . $flist . "' WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `folderList` = '" . $flist . "' WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -422,7 +422,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setOwner($newOwner) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments set owner = " . $newOwner->getID() . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblDocuments` set `owner` = " . $newOwner->getID() . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -452,7 +452,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setDefaultAccess($mode, $noclean="false") { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments set defaultAccess = " . (int) $mode . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblDocuments` set `defaultAccess` = " . (int) $mode . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -483,7 +483,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setInheritAccess($inheritAccess, $noclean=false) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments SET inheritAccess = " . ($inheritAccess ? "1" : "0") . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `inheritAccess` = " . ($inheritAccess ? "1" : "0") . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -534,7 +534,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return true; } - $queryStr = "UPDATE tblDocuments SET expires = " . (int) $expires . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `expires` = " . (int) $expires . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -599,10 +599,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $lockUserID = -1; if (is_bool($falseOrUser) && !$falseOrUser) { - $queryStr = "DELETE FROM tblDocumentLocks WHERE document = ".$this->_id; + $queryStr = "DELETE FROM `tblDocumentLocks` WHERE `document` = ".$this->_id; } else if (is_object($falseOrUser)) { - $queryStr = "INSERT INTO tblDocumentLocks (document, userID) VALUES (".$this->_id.", ".$falseOrUser->getID().")"; + $queryStr = "INSERT INTO `tblDocumentLocks` (`document`, `userID`) VALUES (".$this->_id.", ".$falseOrUser->getID().")"; $lockUserID = $falseOrUser->getID(); } else { @@ -635,7 +635,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function setSequence($seq) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblDocuments SET sequence = " . $seq . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `sequence` = " . $seq . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -652,7 +652,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function clearAccessList($noclean=false) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblACLs WHERE targetType = " . T_DOCUMENT . " AND target = " . $this->_id; + $queryStr = "DELETE FROM `tblACLs` WHERE `targetType` = " . T_DOCUMENT . " AND `target` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -699,8 +699,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if ($mode!=M_ANY) { $modeStr = " AND mode".$op.(int)$mode; } - $queryStr = "SELECT * FROM tblACLs WHERE targetType = ".T_DOCUMENT. - " AND target = " . $this->_id . $modeStr . " ORDER BY targetType"; + $queryStr = "SELECT * FROM `tblACLs` WHERE `targetType` = ".T_DOCUMENT. + " AND target = " . $this->_id . $modeStr . " ORDER BY `targetType`"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -730,9 +730,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function addAccess($mode, $userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; - $queryStr = "INSERT INTO tblACLs (target, targetType, ".$userOrGroup.", mode) VALUES + $queryStr = "INSERT INTO `tblACLs` (`target`, `targetType`, ".$userOrGroup.", `mode`) VALUES (".$this->_id.", ".T_DOCUMENT.", " . (int) $userOrGroupID . ", " .(int) $mode. ")"; if (!$db->getResult($queryStr)) return false; @@ -760,9 +760,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function changeAccess($newMode, $userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; - $queryStr = "UPDATE tblACLs SET mode = " . (int) $newMode . " WHERE targetType = ".T_DOCUMENT." AND target = " . $this->_id . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; + $queryStr = "UPDATE `tblACLs` SET `mode` = " . (int) $newMode . " WHERE `targetType` = ".T_DOCUMENT." AND `target` = " . $this->_id . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; if (!$db->getResult($queryStr)) return false; @@ -787,9 +787,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function removeAccess($userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; - $queryStr = "DELETE FROM tblACLs WHERE targetType = ".T_DOCUMENT." AND target = ".$this->_id." AND ".$userOrGroup." = " . (int) $userOrGroupID; + $queryStr = "DELETE FROM `tblACLs` WHERE `targetType` = ".T_DOCUMENT." AND `target` = ".$this->_id." AND ".$userOrGroup." = " . (int) $userOrGroupID; if (!$db->getResult($queryStr)) return false; @@ -927,7 +927,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (empty($this->_notifyList)) { $db = $this->_dms->getDB(); - $queryStr ="SELECT * FROM tblNotify WHERE targetType = " . T_DOCUMENT . " AND target = " . $this->_id; + $queryStr ="SELECT * FROM `tblNotify` WHERE `targetType` = " . T_DOCUMENT . " AND `target` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1078,7 +1078,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return -3; } - $queryStr = "INSERT INTO tblNotify (target, targetType, " . $userOrGroup . ") VALUES (" . $this->_id . ", " . T_DOCUMENT . ", " . (int) $userOrGroupID . ")"; + $queryStr = "INSERT INTO `tblNotify` (`target`, `targetType`, " . $userOrGroup . ") VALUES (" . $this->_id . ", " . T_DOCUMENT . ", " . (int) $userOrGroupID . ")"; if (!$db->getResult($queryStr)) return -4; @@ -1150,7 +1150,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return -3; } - $queryStr = "DELETE FROM tblNotify WHERE target = " . $this->_id . " AND targetType = " . T_DOCUMENT . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; + $queryStr = "DELETE FROM `tblNotify` WHERE `target` = " . $this->_id . " AND `targetType` = " . T_DOCUMENT . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; /* If type is given then delete only those notifications */ if($type) $queryStr .= " AND `type` = ".(int) $type; @@ -1193,7 +1193,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ * innodb is used. That's why the version is now determined here. */ if ((int)$version<1) { - $queryStr = "SELECT MAX(version) as m from tblDocumentContent where document = ".$this->_id; + $queryStr = "SELECT MAX(`version`) as m from `tblDocumentContent` where `document` = ".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$res) return false; @@ -1205,7 +1205,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $checksum = SeedDMS_Core_File::checksum($tmpFile); $db->startTransaction(); - $queryStr = "INSERT INTO tblDocumentContent (document, version, comment, date, createdBy, dir, orgFileName, fileType, mimeType, fileSize, checksum) VALUES ". + $queryStr = "INSERT INTO `tblDocumentContent` (`document`, `version`, `comment`, `date`, `createdBy`, `dir`, `orgFileName`, `fileType`, `mimeType`, `fileSize`, `checksum`) VALUES ". "(".$this->_id.", ".(int)$version.",".$db->qstr($comment).", ".$db->getCurrentTimestamp().", ".$user->getID().", ".$db->qstr($dir).", ".$db->qstr($orgFileName).", ".$db->qstr($fileType).", ".$db->qstr($mimeType).", ".$filesize.", ".$db->qstr($checksum).")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); @@ -1359,7 +1359,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ /* If $version < 1 than replace the content of the latest version. */ if ((int) $version<1) { - $queryStr = "SELECT MAX(version) as m from tblDocumentContent where document = ".$this->_id; + $queryStr = "SELECT MAX(`version`) as m from `tblDocumentContent` where `document` = ".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$res) return false; @@ -1389,7 +1389,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $checksum = SeedDMS_Core_File::checksum($tmpFile); $db->startTransaction(); - $queryStr = "UPDATE tblDocumentContent set date=".$db->getCurrentTimestamp().", fileSize=".$filesize.", checksum=".$db->qstr($checksum)." WHERE id=".$content->getID(); + $queryStr = "UPDATE `tblDocumentContent` set `date`=".$db->getCurrentTimestamp().", `fileSize`=".$filesize.", `checksum`=".$db->qstr($checksum)." WHERE `id`=".$content->getID(); if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -1419,7 +1419,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $db = $this->_dms->getDB(); if (!isset($this->_content)) { - $queryStr = "SELECT * FROM tblDocumentContent WHERE document = ".$this->_id." ORDER BY version"; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version`"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$res) return false; @@ -1451,7 +1451,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ } $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentContent WHERE document = ".$this->_id." AND version = " . (int) $version; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." AND `version` = " . (int) $version; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$res) return false; @@ -1466,7 +1466,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function getLatestContent() { /* {{{ */ if (!isset($this->_latestContent)) { $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentContent WHERE document = ".$this->_id." ORDER BY version DESC LIMIT 0,1"; + $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version` DESC LIMIT 0,1"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1492,13 +1492,13 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $status = $version->getStatus(); $stID = $status["statusID"]; - $queryStr = "DELETE FROM tblDocumentContent WHERE `document` = " . $this->getID() . " AND `version` = " . $version->_version; + $queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() . " AND `version` = " . $version->_version; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblDocumentContentAttributes WHERE content = " . $version->getId(); + $queryStr = "DELETE FROM `tblDocumentContentAttributes` WHERE `content` = " . $version->getId(); if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -1520,7 +1520,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $stList = ""; foreach ($status as $st) { $stList .= (strlen($stList)==0 ? "" : ", "). "'".$st["reviewID"]."'"; - $queryStr = "SELECT * FROM tblDocumentReviewLog WHERE reviewID = " . $st['reviewID']; + $queryStr = "SELECT * FROM `tblDocumentReviewLog` WHERE `reviewID` = " . $st['reviewID']; $resArr = $db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr)) { $db->rollbackTransaction(); @@ -1549,7 +1549,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $stList = ""; foreach ($status as $st) { $stList .= (strlen($stList)==0 ? "" : ", "). "'".$st["approveID"]."'"; - $queryStr = "SELECT * FROM tblDocumentApproveLog WHERE approveID = " . $st['approveID']; + $queryStr = "SELECT * FROM `tblDocumentApproveLog` WHERE `approveID` = " . $st['approveID']; $resArr = $db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr)) { $db->rollbackTransaction(); @@ -1603,7 +1603,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (!is_numeric($linkID)) return false; - $queryStr = "SELECT * FROM tblDocumentLinks WHERE document = " . $this->_id ." AND id = " . (int) $linkID; + $queryStr = "SELECT * FROM `tblDocumentLinks` WHERE `document` = " . $this->_id ." AND `id` = " . (int) $linkID; $resArr = $db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr) || count($resArr)==0) return false; @@ -1631,12 +1631,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (!isset($this->_documentLinks)) { $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentLinks WHERE document = " . $this->_id; + $queryStr = "SELECT * FROM `tblDocumentLinks` WHERE `document` = " . $this->_id; $tmp = array(); if($publiconly) - $tmp[] = "public=1"; + $tmp[] = "`public`=1"; if($user) - $tmp[] = "userID=".$user->getID(); + $tmp[] = "`userID`=".$user->getID(); if($tmp) { $queryStr .= " AND (".implode(" OR ", $tmp).")"; } @@ -1675,12 +1675,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function getReverseDocumentLinks($publiconly=false, $user=null) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentLinks WHERE target = " . $this->_id; + $queryStr = "SELECT * FROM `tblDocumentLinks` WHERE `target` = " . $this->_id; $tmp = array(); if($publiconly) - $tmp[] = "public=1"; + $tmp[] = "`public`=1"; if($user) - $tmp[] = "userID=".$user->getID(); + $tmp[] = "`userID`=".$user->getID(); if($tmp) { $queryStr .= " AND (".implode(" OR ", $tmp).")"; } @@ -1703,7 +1703,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $public = ($public) ? "1" : "0"; - $queryStr = "INSERT INTO tblDocumentLinks(document, target, userID, public) VALUES (".$this->_id.", ".(int)$targetID.", ".(int)$userID.", ".(int)$public.")"; + $queryStr = "INSERT INTO `tblDocumentLinks` (`document`, `target`, `userID`, `public`) VALUES (".$this->_id.", ".(int)$targetID.", ".(int)$userID.", ".(int)$public.")"; if (!$db->getResult($queryStr)) return false; @@ -1716,7 +1716,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (!is_numeric($linkID)) return false; - $queryStr = "DELETE FROM tblDocumentLinks WHERE document = " . $this->_id ." AND id = " . (int) $linkID; + $queryStr = "DELETE FROM `tblDocumentLinks` WHERE `document` = " . $this->_id ." AND `id` = " . (int) $linkID; if (!$db->getResult($queryStr)) return false; unset ($this->_documentLinks); return true; @@ -1727,7 +1727,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (!is_numeric($ID)) return false; - $queryStr = "SELECT * FROM tblDocumentFiles WHERE document = " . $this->_id ." AND id = " . (int) $ID; + $queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id ." AND `id` = " . (int) $ID; $resArr = $db->getResultArray($queryStr); if ((is_bool($resArr) && !$resArr) || count($resArr)==0) return false; @@ -1739,7 +1739,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ if (!isset($this->_documentFiles)) { $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentFiles WHERE document = " . $this->_id." ORDER BY `date` DESC"; + $queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id." ORDER BY `date` DESC"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1757,7 +1757,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $dir = $this->getDir(); - $queryStr = "INSERT INTO tblDocumentFiles (comment, date, dir, document, fileType, mimeType, orgFileName, userID, name) VALUES ". + $queryStr = "INSERT INTO `tblDocumentFiles` (`comment`, `date`, `dir`, `document`, `fileType`, `mimeType`, `orgFileName`, `userID`, `name`) VALUES ". "(".$db->qstr($comment).", ".$db->getCurrentTimestamp().", ".$db->qstr($dir).", ".$this->_id.", ".$db->qstr($fileType).", ".$db->qstr($mimeType).", ".$db->qstr($orgFileName).",".$user->getID().",".$db->qstr($name).")"; if (!$db->getResult($queryStr)) return false; @@ -1793,7 +1793,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $name=$file->getName(); $comment=$file->getcomment(); - $queryStr = "DELETE FROM tblDocumentFiles WHERE document = " . $this->getID() . " AND id = " . (int) $ID; + $queryStr = "DELETE FROM `tblDocumentFiles` WHERE `document` = " . $this->getID() . " AND `id` = " . (int) $ID; if (!$db->getResult($queryStr)) return false; @@ -1861,44 +1861,44 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return false; } - $queryStr = "DELETE FROM tblDocuments WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblDocuments` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblDocumentAttributes WHERE document = " . $this->_id; + $queryStr = "DELETE FROM `tblDocumentAttributes` WHERE `document` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblACLs WHERE target = " . $this->_id . " AND targetType = " . T_DOCUMENT; + $queryStr = "DELETE FROM `tblACLs` WHERE `target` = " . $this->_id . " AND `targetType` = " . T_DOCUMENT; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblDocumentLinks WHERE document = " . $this->_id . " OR target = " . $this->_id; + $queryStr = "DELETE FROM `tblDocumentLinks` WHERE `document` = " . $this->_id . " OR `target` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblDocumentLocks WHERE document = " . $this->_id; + $queryStr = "DELETE FROM `tblDocumentLocks` WHERE `document` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblDocumentFiles WHERE document = " . $this->_id; + $queryStr = "DELETE FROM `tblDocumentFiles` WHERE `document` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblDocumentCategory WHERE documentID = " . $this->_id; + $queryStr = "DELETE FROM `tblDocumentCategory` WHERE `documentID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete the notification list. - $queryStr = "DELETE FROM tblNotify WHERE target = " . $this->_id . " AND targetType = " . T_DOCUMENT; + $queryStr = "DELETE FROM `tblNotify` WHERE `target` = " . $this->_id . " AND `targetType` = " . T_DOCUMENT; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -2066,7 +2066,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function getFolderList() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT folderList FROM tblDocuments where id = ".$this->_id; + $queryStr = "SELECT `folderList` FROM `tblDocuments` where id = ".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -2096,7 +2096,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $pathPrefix .= ":"; } if($curfolderlist != $pathPrefix) { - $queryStr = "UPDATE tblDocuments SET folderList='".$pathPrefix."' WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `folderList`='".$pathPrefix."' WHERE `id` = ". $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -2115,7 +2115,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ function getUsedDiskSpace() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT SUM(filesize) sum FROM tblDocumentContent WHERE document = " . $this->_id; + $queryStr = "SELECT SUM(`fileSize`) sum FROM `tblDocumentContent` WHERE `document` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -2148,7 +2148,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ } */ - $queryStr = "SELECT * FROM tblDocumentFiles WHERE document = " . $this->_id; + $queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -2317,7 +2317,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; } - $queryStr = "UPDATE tblDocumentContent SET date = ".(int) $date." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; + $queryStr = "UPDATE `tblDocumentContent` SET `date` = ".(int) $date." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; @@ -2339,7 +2339,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; $db = $this->_document->_dms->getDB(); - $queryStr = "UPDATE tblDocumentContent SET fileSize = ".$filesize." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; + $queryStr = "UPDATE `tblDocumentContent` SET `fileSize` = ".$filesize." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; $this->_fileSize = $filesize; @@ -2360,7 +2360,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; $db = $this->_document->_dms->getDB(); - $queryStr = "UPDATE tblDocumentContent SET checksum = ".$db->qstr($checksum)." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; + $queryStr = "UPDATE `tblDocumentContent` SET `checksum` = ".$db->qstr($checksum)." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; $this->_checksum = $checksum; @@ -2371,7 +2371,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ function setComment($newComment) { /* {{{ */ $db = $this->_document->_dms->getDB(); - $queryStr = "UPDATE tblDocumentContent SET comment = ".$db->qstr($newComment)." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; + $queryStr = "UPDATE `tblDocumentContent` SET `comment` = ".$db->qstr($newComment)." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; @@ -2801,7 +2801,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (1 || !isset($this->_approvalStatus)) { /* First get a list of all approvals for this document content */ $queryStr= - "SELECT approveID FROM tblDocumentApprovers WHERE `version`='".$this->_version + "SELECT approveID FROM `tblDocumentApprovers` WHERE `version`='".$this->_version ."' AND `documentID` = '". $this->_document->getID() ."' "; $recs = $db->getResultArray($queryStr); if (is_bool($recs) && !$recs) @@ -3504,7 +3504,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $db = $this->_document->_dms->getDB(); if($this->_workflow) { - $queryStr = "UPDATE tblWorkflowDocumentContent set state=". $state->getID() ." WHERE workflow=". intval($this->_workflow->getID()). " AND document=". intval($this->_document->getID()) ." AND version=". intval($this->_version) .""; + $queryStr = "UPDATE `tblWorkflowDocumentContent` set `state`=". $state->getID() ." WHERE `workflow`=". intval($this->_workflow->getID()). " AND `document`=". intval($this->_document->getID()) ." AND version=". intval($this->_version) .""; if (!$db->getResult($queryStr)) { return false; } @@ -3531,9 +3531,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (!$this->_workflowState) { $queryStr= - "SELECT b.* FROM tblWorkflowDocumentContent a LEFT JOIN tblWorkflowStates b ON a.state = b.id WHERE workflow=". intval($this->_workflow->getID()) - ." AND a.version='".$this->_version - ."' AND a.document = '". $this->_document->getID() ."' "; + "SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.id WHERE `workflow`=". intval($this->_workflow->getID()) + ." AND a.`version`='".$this->_version + ."' AND a.`document` = '". $this->_document->getID() ."' "; $recs = $db->getResultArray($queryStr); if (is_bool($recs) && !$recs) return false; @@ -3555,7 +3555,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($workflow && is_object($workflow)) { $db->startTransaction(); $initstate = $workflow->getInitState(); - $queryStr = "INSERT INTO tblWorkflowDocumentContent (workflow, document, version, state, date) VALUES (". $workflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentDatetime().")"; + $queryStr = "INSERT INTO `tblWorkflowDocumentContent` (`workflow`, `document`, `version`, `state`, `date`) VALUES (". $workflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentDatetime().")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -3586,9 +3586,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (!isset($this->_workflow)) { $queryStr= - "SELECT b.* FROM tblWorkflowDocumentContent a LEFT JOIN tblWorkflows b ON a.workflow = b.id WHERE a.`version`='".$this->_version + "SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.id WHERE a.`version`='".$this->_version ."' AND a.`document` = '". $this->_document->getID() ."' " - ." ORDER BY date DESC LIMIT 1"; + ." ORDER BY `date` DESC LIMIT 1"; $recs = $db->getResultArray($queryStr); if (is_bool($recs) && !$recs) return false; @@ -3657,7 +3657,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } $db->startTransaction(); - $queryStr = "DELETE from tblWorkflowLog WHERE `document` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `workflow` = ".$this->_workflow->getID(); + $queryStr = "DELETE from `tblWorkflowLog` WHERE `document` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `workflow` = ".$this->_workflow->getID(); if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -3700,7 +3700,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if(SeedDMS_Core_DMS::checkIfEqual($this->_workflow->getInitState(), $this->getWorkflowState()) || $unlink == true) { $db->startTransaction(); $queryStr= - "DELETE FROM tblWorkflowDocumentContent WHERE " + "DELETE FROM `tblWorkflowDocumentContent` WHERE " ."`version`='".$this->_version."' " ." AND `document` = '". $this->_document->getID() ."' " ." AND `workflow` = '". $this->_workflow->getID() ."' "; @@ -3710,7 +3710,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } if(!$unlink) { $queryStr= - "DELETE FROM tblWorkflowLog WHERE " + "DELETE FROM `tblWorkflowLog` WHERE " ."`version`='".$this->_version."' " ." AND `document` = '". $this->_document->getID() ."' " ." AND `workflow` = '". $this->_workflow->getID() ."' "; @@ -3742,7 +3742,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; $queryStr= - "SELECT * FROM tblWorkflowDocumentContent WHERE " + "SELECT * FROM `tblWorkflowDocumentContent` WHERE " ."`version`='".$this->_version."' " ." AND `document` = '". $this->_document->getID() ."' " ." AND `workflow` = '". $this->_workflow->getID() ."' "; @@ -3777,7 +3777,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($subworkflow) { $initstate = $subworkflow->getInitState(); - $queryStr = "INSERT INTO tblWorkflowDocumentContent (parentworkflow, workflow, document, version, state, date) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentDatetime().")"; + $queryStr = "INSERT INTO `tblWorkflowDocumentContent` (`parentworkflow`, `workflow`, `document`, `version`, `state`, `date`) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentDatetime().")"; if (!$db->getResult($queryStr)) { return false; } @@ -3809,7 +3809,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $db->startTransaction(); $queryStr= - "SELECT * FROM tblWorkflowDocumentContent WHERE workflow=". intval($this->_workflow->getID()) + "SELECT * FROM `tblWorkflowDocumentContent` WHERE `workflow`=". intval($this->_workflow->getID()) . " AND `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' "; $recs = $db->getResultArray($queryStr); @@ -3868,7 +3868,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ /* Check if the user has already triggered the transition */ $queryStr= - "SELECT * FROM tblWorkflowLog WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' AND `workflow` = ". $this->_workflow->getID(). " AND userid = ".$user->getID(); + "SELECT * FROM `tblWorkflowLog` WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' AND `workflow` = ". $this->_workflow->getID(). " AND userid = ".$user->getID(); $queryStr .= " AND `transition` = ".$transition->getID(); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) @@ -4017,7 +4017,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; $state = $this->_workflowState; - $queryStr = "INSERT INTO tblWorkflowLog (document, version, workflow, userid, transition, date, comment) VALUES (".$this->_document->getID().", ".$this->_version.", " . (int) $this->_workflow->getID() . ", " .(int) $user->getID(). ", ".(int) $transition->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($comment).")"; + $queryStr = "INSERT INTO `tblWorkflowLog` (`document`, `version`, `workflow`, `userid`, `transition`, `date`, `comment`) VALUES (".$this->_document->getID().", ".$this->_version.", " . (int) $this->_workflow->getID() . ", " .(int) $user->getID(). ", ".(int) $transition->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($comment).")"; if (!$db->getResult($queryStr)) return false; @@ -4148,7 +4148,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; */ $queryStr= - "SELECT * FROM tblWorkflowLog WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."'"; // AND `workflow` = ". $this->_workflow->getID(); + "SELECT * FROM `tblWorkflowLog` WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."'"; // AND `workflow` = ". $this->_workflow->getID(); if($transition) $queryStr .= " AND `transition` = ".$transition->getID(); $queryStr .= " ORDER BY `date`"; @@ -4183,7 +4183,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; $queryStr= - "SELECT * FROM tblWorkflowLog WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' AND `workflow` = ". $this->_workflow->getID(); + "SELECT * FROM `tblWorkflowLog` WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' AND `workflow` = ". $this->_workflow->getID(); $queryStr .= " ORDER BY `id` DESC LIMIT 1"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) diff --git a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php index f9e263a5c..76011efd0 100644 --- a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php +++ b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php @@ -56,7 +56,7 @@ class SeedDMS_Core_DocumentCategory { function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblCategory SET name = ".$db->qstr($newName)." WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblCategory` SET `name` = ".$db->qstr($newName)." WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -67,7 +67,7 @@ class SeedDMS_Core_DocumentCategory { function isUsed() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentCategory WHERE categoryID=".$this->_id; + $queryStr = "SELECT * FROM `tblDocumentCategory` WHERE `categoryID`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) return false; @@ -77,21 +77,21 @@ class SeedDMS_Core_DocumentCategory { function getCategories() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblCategory"; + $queryStr = "SELECT * FROM `tblCategory`"; return $db->getResultArray($queryStr); } /* }}} */ function addCategory($keywords) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "INSERT INTO tblCategory (category) VALUES (".$db->qstr($keywords).")"; + $queryStr = "INSERT INTO `tblCategory` (`category`) VALUES (".$db->qstr($keywords).")"; return $db->getResult($queryStr); } /* }}} */ function remove() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblCategory WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblCategory` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -101,7 +101,7 @@ class SeedDMS_Core_DocumentCategory { function getDocumentsByCategory() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblDocumentCategory where categoryID=".$this->_id; + $queryStr = "SELECT * FROM `tblDocumentCategory` where `categoryID`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index b04d5c516..d4f389e95 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -126,7 +126,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { public static function getInstance($id, $dms) { /* {{{ */ $db = $dms->getDB(); - $queryStr = "SELECT * FROM tblFolders WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblFolders` WHERE `id` = " . (int) $id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -155,7 +155,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { public function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblFolders SET name = " . $db->qstr($newName) . " WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblFolders` SET `name` = " . $db->qstr($newName) . " WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -169,7 +169,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { public function setComment($newComment) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblFolders SET comment = " . $db->qstr($newComment) . " WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblFolders` SET `comment` = " . $db->qstr($newComment) . " WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -203,7 +203,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return false; } - $queryStr = "UPDATE tblFolders SET date = " . (int) $date . " WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblFolders` SET `date` = " . (int) $date . " WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; $this->_date = $date; @@ -276,7 +276,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (strlen($pathPrefix)>1) { $pathPrefix .= ":"; } - $queryStr = "UPDATE tblFolders SET parent = ".$newParent->getID().", folderList='".$pathPrefix."' WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblFolders` SET `parent` = ".$newParent->getID().", `folderList`='".$pathPrefix."' WHERE `id` = ". $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -342,7 +342,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function setOwner($newOwner) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblFolders set owner = " . $newOwner->getID() . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblFolders` set `owner` = " . $newOwner->getID() . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -373,7 +373,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function setDefaultAccess($mode, $noclean=false) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblFolders set defaultAccess = " . (int) $mode . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblFolders` set `defaultAccess` = " . (int) $mode . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -406,7 +406,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $inheritAccess = ($inheritAccess) ? "1" : "0"; - $queryStr = "UPDATE tblFolders SET inheritAccess = " . (int) $inheritAccess . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblFolders` SET `inheritAccess` = " . (int) $inheritAccess . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -423,7 +423,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function setSequence($seq) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblFolders SET sequence = " . $seq . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblFolders` SET `sequence` = " . $seq . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -443,7 +443,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (isset($this->_subFolders)) { return count($this->subFolders); } - $queryStr = "SELECT count(*) as c FROM tblFolders WHERE parent = " . $this->_id; + $queryStr = "SELECT count(*) as c FROM `tblFolders` WHERE `parent` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -466,11 +466,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $db = $this->_dms->getDB(); if (!isset($this->_subFolders)) { - $queryStr = "SELECT * FROM tblFolders WHERE parent = " . $this->_id; + $queryStr = "SELECT * FROM `tblFolders` WHERE `parent` = " . $this->_id; - if ($orderby=="n") $queryStr .= " ORDER BY name"; - elseif ($orderby=="s") $queryStr .= " ORDER BY sequence"; - elseif ($orderby=="d") $queryStr .= " ORDER BY date"; + if ($orderby=="n") $queryStr .= " ORDER BY `name`"; + elseif ($orderby=="s") $queryStr .= " ORDER BY `sequence`"; + elseif ($orderby=="d") $queryStr .= " ORDER BY `date`"; if($dir == 'desc') $queryStr .= " DESC"; @@ -514,7 +514,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $db->startTransaction(); //inheritAccess = true, defaultAccess = M_READ - $queryStr = "INSERT INTO tblFolders (name, parent, folderList, comment, date, owner, inheritAccess, defaultAccess, sequence) ". + $queryStr = "INSERT INTO `tblFolders` (`name`, `parent`, `folderList`, `comment`, `date`, `owner`, `inheritAccess`, `defaultAccess`, `sequence`) ". "VALUES (".$db->qstr($name).", ".$this->_id.", ".$db->qstr($pathPrefix).", ".$db->qstr($comment).", ".$db->getCurrentTimestamp().", ".$owner->getID().", 1, ".M_READ.", ". $sequence.")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); @@ -618,7 +618,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (isset($this->_documents)) { return count($this->documents); } - $queryStr = "SELECT count(*) as c FROM tblDocuments WHERE folder = " . $this->_id; + $queryStr = "SELECT count(*) as c FROM `tblDocuments` WHERE `folder` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -637,7 +637,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (isset($this->_documents)) { return count($this->documents); } - $queryStr = "SELECT count(*) as c FROM tblDocuments WHERE folder = " . $this->_id . " AND `name` = ".$db->qstr($name); + $queryStr = "SELECT count(*) as c FROM `tblDocuments` WHERE `folder` = " . $this->_id . " AND `name` = ".$db->qstr($name); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -660,10 +660,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $db = $this->_dms->getDB(); if (!isset($this->_documents)) { - $queryStr = "SELECT * FROM tblDocuments WHERE folder = " . $this->_id; - if ($orderby=="n") $queryStr .= " ORDER BY name"; - elseif($orderby=="s") $queryStr .= " ORDER BY sequence"; - elseif($orderby=="d") $queryStr .= " ORDER BY date"; + $queryStr = "SELECT * FROM `tblDocuments` WHERE `folder` = " . $this->_id; + if ($orderby=="n") $queryStr .= " ORDER BY `name`"; + elseif($orderby=="s") $queryStr .= " ORDER BY `sequence`"; + elseif($orderby=="d") $queryStr .= " ORDER BY `date`"; if($dir == 'desc') $queryStr .= " DESC"; @@ -715,7 +715,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $pathPrefix .= ":"; } - $queryStr = "SELECT id FROM tblFolders WHERE folderList like '".$pathPrefix. "%'"; + $queryStr = "SELECT id FROM `tblFolders` WHERE `folderList` like '".$pathPrefix. "%'"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -745,7 +745,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $documents = array(); if($folderids) { - $queryStr = "SELECT id FROM tblDocuments WHERE folder in (".implode(',', $folderids). ")"; + $queryStr = "SELECT id FROM `tblDocuments` WHERE `folder` in (".implode(',', $folderids). ")"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -818,7 +818,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $db->startTransaction(); - $queryStr = "INSERT INTO tblDocuments (name, comment, date, expires, owner, folder, folderList, inheritAccess, defaultAccess, locked, keywords, sequence) VALUES ". + $queryStr = "INSERT INTO `tblDocuments` (`name`, `comment`, `date`, `expires`, `owner`, `folder`, `folderList`, `inheritAccess`, `defaultAccess`, `locked`, `keywords`, `sequence`) VALUES ". "(".$db->qstr($name).", ".$db->qstr($comment).", ".$db->getCurrentTimestamp().", ".(int) $expires.", ".$owner->getID().", ".$this->_id.",".$db->qstr($pathPrefix).", 1, ".M_READ.", -1, ".$db->qstr($keywords).", " . $sequence . ")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); @@ -888,30 +888,30 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $db->startTransaction(); // unset homefolder as it will no longer exist - $queryStr = "UPDATE tblUsers SET homefolder=NULL WHERE homefolder = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `homefolder`=NULL WHERE `homefolder` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Remove database entries - $queryStr = "DELETE FROM tblFolders WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblFolders` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblFolderAttributes WHERE folder = " . $this->_id; + $queryStr = "DELETE FROM `tblFolderAttributes` WHERE `folder` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblACLs WHERE target = ". $this->_id. " AND targetType = " . T_FOLDER; + $queryStr = "DELETE FROM `tblACLs` WHERE `target` = ". $this->_id. " AND `targetType` = " . T_FOLDER; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblNotify WHERE target = ". $this->_id. " AND targetType = " . T_FOLDER; + $queryStr = "DELETE FROM `tblNotify` WHERE `target` = ". $this->_id. " AND `targetType` = " . T_FOLDER; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -1002,8 +1002,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if ($mode!=M_ANY) { $modeStr = " AND mode".$op.(int)$mode; } - $queryStr = "SELECT * FROM tblACLs WHERE targetType = ".T_FOLDER. - " AND target = " . $this->_id . $modeStr . " ORDER BY targetType"; + $queryStr = "SELECT * FROM `tblACLs` WHERE `targetType` = ".T_FOLDER. + " AND `target` = " . $this->_id . $modeStr . " ORDER BY `targetType`"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1029,7 +1029,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function clearAccessList($noclean=false) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblACLs WHERE targetType = " . T_FOLDER . " AND target = " . $this->_id; + $queryStr = "DELETE FROM `tblACLs` WHERE `targetType` = " . T_FOLDER . " AND `target` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -1054,9 +1054,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function addAccess($mode, $userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; - $queryStr = "INSERT INTO tblACLs (target, targetType, ".$userOrGroup.", mode) VALUES + $queryStr = "INSERT INTO `tblACLs` (`target`, `targetType`, ".$userOrGroup.", `mode`) VALUES (".$this->_id.", ".T_FOLDER.", " . (int) $userOrGroupID . ", " .(int) $mode. ")"; if (!$db->getResult($queryStr)) return false; @@ -1084,9 +1084,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function changeAccess($newMode, $userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; - $queryStr = "UPDATE tblACLs SET mode = " . (int) $newMode . " WHERE targetType = ".T_FOLDER." AND target = " . $this->_id . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; + $queryStr = "UPDATE `tblACLs` SET `mode` = " . (int) $newMode . " WHERE `targetType` = ".T_FOLDER." AND `target` = " . $this->_id . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; if (!$db->getResult($queryStr)) return false; @@ -1103,9 +1103,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function removeAccess($userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; - $queryStr = "DELETE FROM tblACLs WHERE targetType = ".T_FOLDER." AND target = ".$this->_id." AND ".$userOrGroup." = " . (int) $userOrGroupID; + $queryStr = "DELETE FROM `tblACLs` WHERE `targetType` = ".T_FOLDER." AND `target` = ".$this->_id." AND ".$userOrGroup." = " . (int) $userOrGroupID; if (!$db->getResult($queryStr)) return false; @@ -1235,7 +1235,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { if (empty($this->_notifyList)) { $db = $this->_dms->getDB(); - $queryStr ="SELECT * FROM tblNotify WHERE targetType = " . T_FOLDER . " AND target = " . $this->_id; + $queryStr ="SELECT * FROM `tblNotify` WHERE `targetType` = " . T_FOLDER . " AND `target` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -1297,7 +1297,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function addNotify($userOrGroupID, $isUser) { /* {{{ */ $db = $this->_dms->getDB(); - $userOrGroup = ($isUser) ? "userID" : "groupID"; + $userOrGroup = ($isUser) ? "`userID`" : "`groupID`"; /* Verify that user / group exists */ $obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID)); @@ -1392,7 +1392,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return -3; } - $queryStr = "INSERT INTO tblNotify (target, targetType, " . $userOrGroup . ") VALUES (" . $this->_id . ", " . T_FOLDER . ", " . (int) $userOrGroupID . ")"; + $queryStr = "INSERT INTO `tblNotify` (`target`, `targetType`, " . $userOrGroup . ") VALUES (" . $this->_id . ", " . T_FOLDER . ", " . (int) $userOrGroupID . ")"; if (!$db->getResult($queryStr)) return -4; @@ -1466,7 +1466,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return -3; } - $queryStr = "DELETE FROM tblNotify WHERE target = " . $this->_id . " AND targetType = " . T_FOLDER . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; + $queryStr = "DELETE FROM `tblNotify` WHERE `target` = " . $this->_id . " AND `targetType` = " . T_FOLDER . " AND " . $userOrGroup . " = " . (int) $userOrGroupID; /* If type is given then delete only those notifications */ if($type) $queryStr .= " AND `type` = ".(int) $type; @@ -1627,7 +1627,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { function getFolderList() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT folderList FROM tblFolders where id = ".$this->_id; + $queryStr = "SELECT `folderList` FROM `tblFolders` where `id` = ".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1656,7 +1656,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $pathPrefix .= ":"; } if($curfolderlist != $pathPrefix) { - $queryStr = "UPDATE tblFolders SET folderList='".$pathPrefix."' WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblFolders` SET `folderList`='".$pathPrefix."' WHERE `id` = ". $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php index 954bf1f7e..845090896 100644 --- a/SeedDMS_Core/Core/inc.ClassGroup.php +++ b/SeedDMS_Core/Core/inc.ClassGroup.php @@ -75,7 +75,7 @@ class SeedDMS_Core_Group { /* {{{ */ $queryStr = "SELECT * FROM `tblGroups` WHERE `name` = ".$db->qstr($id); break; default: - $queryStr = "SELECT * FROM `tblGroups` WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblGroups` WHERE `id` = " . (int) $id; } $resArr = $db->getResultArray($queryStr); @@ -96,7 +96,7 @@ class SeedDMS_Core_Group { /* {{{ */ switch($orderby) { default: - $queryStr = "SELECT * FROM tblGroups ORDER BY name"; + $queryStr = "SELECT * FROM `tblGroups` ORDER BY `name`"; } $resArr = $db->getResultArray($queryStr); @@ -124,7 +124,7 @@ class SeedDMS_Core_Group { /* {{{ */ function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblGroups SET name = ".$db->qstr($newName)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblGroups` SET `name` = ".$db->qstr($newName)." WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -137,7 +137,7 @@ class SeedDMS_Core_Group { /* {{{ */ function setComment($newComment) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblGroups SET comment = ".$db->qstr($newComment)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblGroups` SET `comment` = ".$db->qstr($newComment)." WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -190,7 +190,7 @@ class SeedDMS_Core_Group { /* {{{ */ function addUser($user,$asManager=false) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "INSERT INTO tblGroupMembers (groupID, userID, manager) VALUES (".$this->_id.", ".$user->getID(). ", " . ($asManager?"1":"0") ." )"; + $queryStr = "INSERT INTO `tblGroupMembers` (`groupID`, `userID`, `manager`) VALUES (".$this->_id.", ".$user->getID(). ", " . ($asManager?"1":"0") ." )"; $res = $db->getResult($queryStr); if (!$res) return false; @@ -202,7 +202,7 @@ class SeedDMS_Core_Group { /* {{{ */ function removeUser($user) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblGroupMembers WHERE groupID = ".$this->_id." AND userID = ".$user->getID(); + $queryStr = "DELETE FROM `tblGroupMembers` WHERE `groupID` = ".$this->_id." AND `userID` = ".$user->getID(); $res = $db->getResult($queryStr); if (!$res) return false; @@ -227,8 +227,8 @@ class SeedDMS_Core_Group { /* {{{ */ } $db = $this->_dms->getDB(); - if ($asManager) $queryStr = "SELECT * FROM tblGroupMembers WHERE groupID = " . $this->_id . " AND userID = " . $user->getID() . " AND manager = 1"; - else $queryStr = "SELECT * FROM tblGroupMembers WHERE groupID = " . $this->_id . " AND userID = " . $user->getID(); + if ($asManager) $queryStr = "SELECT * FROM `tblGroupMembers` WHERE `groupID` = " . $this->_id . " AND `userID` = " . $user->getID() . " AND `manager` = 1"; + else $queryStr = "SELECT * FROM `tblGroupMembers` WHERE `groupID` = " . $this->_id . " AND `userID` = " . $user->getID(); $resArr = $db->getResultArray($queryStr); @@ -249,8 +249,8 @@ class SeedDMS_Core_Group { /* {{{ */ if (!$this->isMember($user)) return false; - if ($this->isMember($user,true)) $queryStr = "UPDATE tblGroupMembers SET manager = 0 WHERE groupID = ".$this->_id." AND userID = ".$user->getID(); - else $queryStr = "UPDATE tblGroupMembers SET manager = 1 WHERE groupID = ".$this->_id." AND userID = ".$user->getID(); + if ($this->isMember($user,true)) $queryStr = "UPDATE `tblGroupMembers` SET `manager` = 0 WHERE `groupID` = ".$this->_id." AND `userID` = ".$user->getID(); + else $queryStr = "UPDATE `tblGroupMembers` SET `manager` = 1 WHERE `groupID` = ".$this->_id." AND `userID` = ".$user->getID(); if (!$db->getResult($queryStr)) return false; return true; @@ -270,37 +270,37 @@ class SeedDMS_Core_Group { /* {{{ */ $db->startTransaction(); - $queryStr = "DELETE FROM tblGroupMembers WHERE groupID = " . $this->_id; + $queryStr = "DELETE FROM `tblGroupMembers` WHERE `groupID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblACLs WHERE groupID = " . $this->_id; + $queryStr = "DELETE FROM `tblACLs` WHERE `groupID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblNotify WHERE groupID = " . $this->_id; + $queryStr = "DELETE FROM `tblNotify` WHERE `groupID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblMandatoryReviewers WHERE reviewerGroupID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryReviewers` WHERE `reviewerGroupID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblMandatoryApprovers WHERE approverGroupID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryApprovers` WHERE `approverGroupID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblWorkflowTransitionGroups WHERE groupid = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowTransitionGroups` WHERE `groupid` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblGroups WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblGroups` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -410,11 +410,11 @@ class SeedDMS_Core_Group { /* {{{ */ function getWorkflowStatus($documentID=null, $version=null) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = 'select distinct d.*, c.groupid from tblWorkflowTransitions a left join tblWorkflows b on a.workflow=b.id left join tblWorkflowTransitionGroups c on a.id=c.transition left join tblWorkflowDocumentContent d on b.id=d.workflow where d.document is not null and a.state=d.state and c.groupid='.$this->_id; + $queryStr = 'select distinct d.*, c.`groupid` from `tblWorkflowTransitions` a left join `tblWorkflows` b on a.`workflow`=b.`id` left join `tblWorkflowTransitionGroups` c on a.`id`=c.`transition` left join `tblWorkflowDocumentContent` d on b.`id`=d.`workflow` where d.`document` is not null and a.`state`=d.`state` and c.`groupid`='.$this->_id; if($documentID) { - $queryStr .= ' AND d.document='.(int) $documentID; + $queryStr .= ' AND d.`document`='.(int) $documentID; if($version) - $queryStr .= ' AND d.version='.(int) $version; + $queryStr .= ' AND d.`version`='.(int) $version; } $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) diff --git a/SeedDMS_Core/Core/inc.ClassKeywords.php b/SeedDMS_Core/Core/inc.ClassKeywords.php index cf3bca2a5..c32084d43 100644 --- a/SeedDMS_Core/Core/inc.ClassKeywords.php +++ b/SeedDMS_Core/Core/inc.ClassKeywords.php @@ -71,7 +71,7 @@ class SeedDMS_Core_KeywordCategory { function setName($newName) { $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblKeywordCategories SET name = ".$db->qstr($newName)." WHERE id = ". $this->_id; + $queryStr = "UPDATE `tblKeywordCategories` SET `name` = ".$db->qstr($newName)." WHERE `id` = ". $this->_id; if (!$db->getResult($queryStr)) return false; @@ -82,7 +82,7 @@ class SeedDMS_Core_KeywordCategory { function setOwner($user) { $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblKeywordCategories SET owner = " . $user->getID() . " WHERE id " . $this->_id; + $queryStr = "UPDATE `tblKeywordCategories` SET `owner` = " . $user->getID() . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -94,28 +94,28 @@ class SeedDMS_Core_KeywordCategory { function getKeywordLists() { $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblKeywords WHERE category = " . $this->_id . " order by `keywords`"; + $queryStr = "SELECT * FROM `tblKeywords` WHERE `category` = " . $this->_id . " order by `keywords`"; return $db->getResultArray($queryStr); } function editKeywordList($listID, $keywords) { $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblKeywords SET keywords = ".$db->qstr($keywords)." WHERE id = $listID"; + $queryStr = "UPDATE `tblKeywords` SET `keywords` = ".$db->qstr($keywords)." WHERE `id` = $listID"; return $db->getResult($queryStr); } function addKeywordList($keywords) { $db = $this->_dms->getDB(); - $queryStr = "INSERT INTO tblKeywords (category, keywords) VALUES (" . $this->_id . ", ".$db->qstr($keywords).")"; + $queryStr = "INSERT INTO `tblKeywords` (`category`, `keywords`) VALUES (" . $this->_id . ", ".$db->qstr($keywords).")"; return $db->getResult($queryStr); } function removeKeywordList($listID) { $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblKeywords WHERE id = $listID"; + $queryStr = "DELETE FROM `tblKeywords` WHERE `id` = $listID"; return $db->getResult($queryStr); } @@ -123,13 +123,13 @@ class SeedDMS_Core_KeywordCategory { $db = $this->_dms->getDB(); $db->startTransaction(); - $queryStr = "DELETE FROM tblKeywords WHERE category = " . $this->_id; + $queryStr = "DELETE FROM `tblKeywords` WHERE `category` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblKeywordCategories WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblKeywordCategories` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; diff --git a/SeedDMS_Core/Core/inc.ClassObject.php b/SeedDMS_Core/Core/inc.ClassObject.php index cff100589..e0cd1cbfb 100644 --- a/SeedDMS_Core/Core/inc.ClassObject.php +++ b/SeedDMS_Core/Core/inc.ClassObject.php @@ -75,13 +75,13 @@ class SeedDMS_Core_Object { /* {{{ */ switch(get_class($this)) { case $this->_dms->getClassname('document'): - $queryStr = "SELECT a.* FROM tblDocumentAttributes a LEFT JOIN tblAttributeDefinitions b ON a.attrdef=b.id WHERE a.document = " . $this->_id." ORDER BY b.`name`"; + $queryStr = "SELECT a.* FROM `tblDocumentAttributes` a LEFT JOIN `tblAttributeDefinitions` b ON a.`attrdef`=b.`id` WHERE a.`document` = " . $this->_id." ORDER BY b.`name`"; break; case $this->_dms->getClassname('documentcontent'): - $queryStr = "SELECT a.* FROM tblDocumentContentAttributes a LEFT JOIN tblAttributeDefinitions b ON a.attrdef=b.id WHERE a.content = " . $this->_id." ORDER BY b.`name`"; + $queryStr = "SELECT a.* FROM `tblDocumentContentAttributes` a LEFT JOIN `tblAttributeDefinitions` b ON a.`attrdef`=b.`id` WHERE a.`content` = " . $this->_id." ORDER BY b.`name`"; break; case $this->_dms->getClassname('folder'): - $queryStr = "SELECT a.* FROM tblFolderAttributes a LEFT JOIN tblAttributeDefinitions b ON a.attrdef=b.id WHERE a.folder = " . $this->_id." ORDER BY b.`name`"; + $queryStr = "SELECT a.* FROM `tblFolderAttributes` a LEFT JOIN `tblAttributeDefinitions` b ON a.`attrdef`=b.`id` WHERE a.`folder` = " . $this->_id." ORDER BY b.`name`"; break; default: return false; @@ -223,13 +223,13 @@ class SeedDMS_Core_Object { /* {{{ */ if(!isset($this->_attributes[$attrdef->getId()])) { switch(get_class($this)) { case $this->_dms->getClassname('document'): - $queryStr = "INSERT INTO tblDocumentAttributes (document, attrdef, value) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")"; + $queryStr = "INSERT INTO `tblDocumentAttributes` (`document`, `attrdef`, `value`) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")"; break; case $this->_dms->getClassname('documentcontent'): - $queryStr = "INSERT INTO tblDocumentContentAttributes (content, attrdef, value) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")"; + $queryStr = "INSERT INTO `tblDocumentContentAttributes` (`content`, `attrdef`, `value`) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")"; break; case $this->_dms->getClassname('folder'): - $queryStr = "INSERT INTO tblFolderAttributes (folder, attrdef, value) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")"; + $queryStr = "INSERT INTO `tblFolderAttributes` (`folder`, `attrdef`, `value`) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")"; break; default: return false; @@ -262,13 +262,13 @@ class SeedDMS_Core_Object { /* {{{ */ if(isset($this->_attributes[$attrdef->getId()])) { switch(get_class($this)) { case $this->_dms->getClassname('document'): - $queryStr = "DELETE FROM tblDocumentAttributes WHERE document=".$this->_id." AND attrdef=".$attrdef->getId(); + $queryStr = "DELETE FROM `tblDocumentAttributes` WHERE `document`=".$this->_id." AND `attrdef`=".$attrdef->getId(); break; case $this->_dms->getClassname('documentcontent'): - $queryStr = "DELETE FROM tblDocumentContentAttributes WHERE content=".$this->_id." AND attrdef=".$attrdef->getId(); + $queryStr = "DELETE FROM `tblDocumentContentAttributes` WHERE `content`=".$this->_id." AND `attrdef`=".$attrdef->getId(); break; case $this->_dms->getClassname('folder'): - $queryStr = "DELETE FROM tblFolderAttributes WHERE folder=".$this->_id." AND attrdef=".$attrdef->getId(); + $queryStr = "DELETE FROM `tblFolderAttributes` WHERE `folder`=".$this->_id." AND `attrdef`=".$attrdef->getId(); break; default: return false; diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 19d530731..0a3c78827 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -170,15 +170,15 @@ class SeedDMS_Core_User { /* {{{ */ switch($by) { case 'name': - $queryStr = "SELECT * FROM tblUsers WHERE login = ".$db->qstr($id); + $queryStr = "SELECT * FROM `tblUsers` WHERE `login` = ".$db->qstr($id); if($email) - $queryStr .= " AND email=".$db->qstr($email); + $queryStr .= " AND `email`=".$db->qstr($email); break; case 'email': - $queryStr = "SELECT * FROM tblUsers WHERE email = ".$db->qstr($id); + $queryStr = "SELECT * FROM `tblUsers` WHERE `email` = ".$db->qstr($id); break; default: - $queryStr = "SELECT * FROM tblUsers WHERE id = " . (int) $id; + $queryStr = "SELECT * FROM `tblUsers` WHERE `id` = " . (int) $id; } $resArr = $db->getResultArray($queryStr); @@ -196,9 +196,9 @@ class SeedDMS_Core_User { /* {{{ */ $db = $dms->getDB(); if($orderby == 'fullname') - $queryStr = "SELECT * FROM tblUsers ORDER BY fullname"; + $queryStr = "SELECT * FROM `tblUsers` ORDER BY `fullname`"; else - $queryStr = "SELECT * FROM tblUsers ORDER BY login"; + $queryStr = "SELECT * FROM `tblUsers` ORDER BY `login`"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -226,7 +226,7 @@ class SeedDMS_Core_User { /* {{{ */ function setLogin($newLogin) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET login =".$db->qstr($newLogin)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `login` =".$db->qstr($newLogin)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -240,7 +240,7 @@ class SeedDMS_Core_User { /* {{{ */ function setFullName($newFullName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET fullname = ".$db->qstr($newFullName)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `fullname` = ".$db->qstr($newFullName)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -254,7 +254,7 @@ class SeedDMS_Core_User { /* {{{ */ function setPwd($newPwd) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET pwd =".$db->qstr($newPwd)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `pwd` =".$db->qstr($newPwd)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -270,7 +270,7 @@ class SeedDMS_Core_User { /* {{{ */ if(trim($newPwdExpiration) == '') $newPwdExpiration = '0000-00-00 00:00:00'; - $queryStr = "UPDATE tblUsers SET pwdExpiration =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr($newPwdExpiration)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -284,7 +284,7 @@ class SeedDMS_Core_User { /* {{{ */ function setEmail($newEmail) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET email =".$db->qstr($newEmail)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `email` =".$db->qstr($newEmail)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -298,7 +298,7 @@ class SeedDMS_Core_User { /* {{{ */ function setLanguage($newLanguage) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET language =".$db->qstr($newLanguage)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `language` =".$db->qstr($newLanguage)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -312,7 +312,7 @@ class SeedDMS_Core_User { /* {{{ */ function setTheme($newTheme) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET theme =".$db->qstr($newTheme)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `theme` =".$db->qstr($newTheme)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -326,7 +326,7 @@ class SeedDMS_Core_User { /* {{{ */ function setComment($newComment) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET comment =".$db->qstr($newComment)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `comment` =".$db->qstr($newComment)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -340,7 +340,7 @@ class SeedDMS_Core_User { /* {{{ */ function setRole($newrole) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET role = " . $newrole . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `role` = " . $newrole . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -353,7 +353,7 @@ class SeedDMS_Core_User { /* {{{ */ function setAdmin($isAdmin) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET role = " . SeedDMS_Core_User::role_admin . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `role` = " . SeedDMS_Core_User::role_admin . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -366,7 +366,7 @@ class SeedDMS_Core_User { /* {{{ */ function setGuest($isGuest) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET role = " . SeedDMS_Core_User::role_guest . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `role` = " . SeedDMS_Core_User::role_guest . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -380,7 +380,7 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $isHidden = ($isHidden) ? "1" : "0"; - $queryStr = "UPDATE tblUsers SET hidden = " . $isHidden . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `hidden` = " . $isHidden . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -394,7 +394,7 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $isDisabled = ($isDisabled) ? "1" : "0"; - $queryStr = "UPDATE tblUsers SET disabled = " . $isDisabled . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `disabled` = " . $isDisabled . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -406,7 +406,7 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $this->_loginFailures++; - $queryStr = "UPDATE tblUsers SET loginfailures = " . $this->_loginFailures . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `loginfailures` = " . $this->_loginFailures . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -417,7 +417,7 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $this->_loginFailures = 0; - $queryStr = "UPDATE tblUsers SET loginfailures = " . $this->_loginFailures . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `loginfailures` = " . $this->_loginFailures . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -435,7 +435,7 @@ class SeedDMS_Core_User { /* {{{ */ function getUsedDiskSpace() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT SUM(filesize) sum FROM tblDocumentContent a LEFT JOIN tblDocuments b ON a.document=b.id WHERE b.owner = " . $this->_id; + $queryStr = "SELECT SUM(`fileSize`) sum FROM `tblDocumentContent` a LEFT JOIN `tblDocuments` b ON a.`document`=b.`id` WHERE b.`owner` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -449,7 +449,7 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $quota = intval($quota); - $queryStr = "UPDATE tblUsers SET quota = " . $quota . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `quota` = " . $quota . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -462,7 +462,7 @@ class SeedDMS_Core_User { /* {{{ */ function setHomeFolder($homefolder) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET homefolder = " . ($homefolder ? (int) $homefolder : NULL) . " WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblUsers` SET `homefolder` = " . ($homefolder ? (int) $homefolder : NULL) . " WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) return false; @@ -496,10 +496,10 @@ class SeedDMS_Core_User { /* {{{ */ $db->startTransaction(); // delete private keyword lists - $queryStr = "SELECT tblKeywords.id FROM tblKeywords, tblKeywordCategories WHERE tblKeywords.category = tblKeywordCategories.id AND tblKeywordCategories.owner = " . $this->_id; + $queryStr = "SELECT `tblKeywords`.`id` FROM `tblKeywords`, `tblKeywordCategories` WHERE `tblKeywords`.`category` = `tblKeywordCategories`.`id` AND `tblKeywordCategories`.`owner` = " . $this->_id; $resultArr = $db->getResultArray($queryStr); if (count($resultArr) > 0) { - $queryStr = "DELETE FROM tblKeywords WHERE "; + $queryStr = "DELETE FROM `tblKeywords` WHERE "; for ($i = 0; $i < count($resultArr); $i++) { $queryStr .= "id = " . $resultArr[$i]["id"]; if ($i + 1 < count($resultArr)) @@ -511,147 +511,147 @@ class SeedDMS_Core_User { /* {{{ */ } } - $queryStr = "DELETE FROM tblKeywordCategories WHERE owner = " . $this->_id; + $queryStr = "DELETE FROM `tblKeywordCategories` WHERE `owner` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } //Benachrichtigungen entfernen - $queryStr = "DELETE FROM tblNotify WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblNotify` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } /* Assign documents of the removed user to the given user */ - $queryStr = "UPDATE tblFolders SET owner = " . $assignTo . " WHERE owner = " . $this->_id; + $queryStr = "UPDATE `tblFolders` SET `owner` = " . $assignTo . " WHERE `owner` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "UPDATE tblDocuments SET owner = " . $assignTo . " WHERE owner = " . $this->_id; + $queryStr = "UPDATE `tblDocuments` SET `owner` = " . $assignTo . " WHERE `owner` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "UPDATE tblDocumentContent SET createdBy = " . $assignTo . " WHERE createdBy = " . $this->_id; + $queryStr = "UPDATE `tblDocumentContent` SET `createdBy` = " . $assignTo . " WHERE `createdBy` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Remove private links on documents ... - $queryStr = "DELETE FROM tblDocumentLinks WHERE userID = " . $this->_id . " AND public = 0"; + $queryStr = "DELETE FROM `tblDocumentLinks` WHERE `userID` = " . $this->_id . " AND `public` = 0"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // ... but keep public links - $queryStr = "UPDATE tblDocumentLinks SET userID = " . $assignTo . " WHERE userID = " . $this->_id; + $queryStr = "UPDATE `tblDocumentLinks` SET `userID` = " . $assignTo . " WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // set administrator for deleted user's attachments - $queryStr = "UPDATE tblDocumentFiles SET userID = " . $assignTo . " WHERE userID = " . $this->_id; + $queryStr = "UPDATE `tblDocumentFiles` SET `userID` = " . $assignTo . " WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // unlock documents locked by the user - $queryStr = "DELETE FROM tblDocumentLocks WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblDocumentLocks` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete user from all groups - $queryStr = "DELETE FROM tblGroupMembers WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblGroupMembers` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // User aus allen ACLs streichen - $queryStr = "DELETE FROM tblACLs WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblACLs` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete image of user - $queryStr = "DELETE FROM tblUserImages WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblUserImages` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete entries in password history - $queryStr = "DELETE FROM tblUserPasswordHistory WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblUserPasswordHistory` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete entries in password request - $queryStr = "DELETE FROM tblUserPasswordRequest WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblUserPasswordRequest` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // mandatory review/approve - $queryStr = "DELETE FROM tblMandatoryReviewers WHERE reviewerUserID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryReviewers` WHERE `reviewerUserID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblMandatoryApprovers WHERE approverUserID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryApprovers` WHERE `approverUserID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblMandatoryReviewers WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryReviewers` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblMandatoryApprovers WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryApprovers` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowMandatoryWorkflow` WHERE `userid` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblWorkflowTransitionUsers WHERE userid = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowTransitionUsers` WHERE `userid` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // set administrator for deleted user's events - $queryStr = "UPDATE tblEvents SET userID = " . $assignTo . " WHERE userID = " . $this->_id; + $queryStr = "UPDATE `tblEvents` SET `userID` = " . $assignTo . " WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete user itself - $queryStr = "DELETE FROM tblUsers WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblUsers` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -775,7 +775,7 @@ class SeedDMS_Core_User { /* {{{ */ if (!isset($this->_hasImage)) { $db = $this->_dms->getDB(); - $queryStr = "SELECT COUNT(*) AS num FROM tblUserImages WHERE userID = " . $this->_id; + $queryStr = "SELECT COUNT(*) AS num FROM `tblUserImages` WHERE `userID` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if ($resArr === false) return false; @@ -795,7 +795,7 @@ class SeedDMS_Core_User { /* {{{ */ function getImage() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblUserImages WHERE userID = " . $this->_id; + $queryStr = "SELECT * FROM `tblUserImages` WHERE `userID` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if ($resArr === false) return false; @@ -814,9 +814,9 @@ class SeedDMS_Core_User { /* {{{ */ fclose($fp); if ($this->hasImage()) - $queryStr = "UPDATE tblUserImages SET image = '".base64_encode($content)."', mimeType = ".$db->qstr($mimeType)." WHERE userID = " . $this->_id; + $queryStr = "UPDATE `tblUserImages` SET `image` = '".base64_encode($content)."', `mimeType` = ".$db->qstr($mimeType)." WHERE `userID` = " . $this->_id; else - $queryStr = "INSERT INTO tblUserImages (userID, image, mimeType) VALUES (" . $this->_id . ", '".base64_encode($content)."', ".$db->qstr($mimeType).")"; + $queryStr = "INSERT INTO `tblUserImages` (`userID`, `image`, `mimeType`) VALUES (" . $this->_id . ", '".base64_encode($content)."', ".$db->qstr($mimeType).")"; if (!$db->getResult($queryStr)) return false; @@ -1059,11 +1059,11 @@ class SeedDMS_Core_User { /* {{{ */ function getWorkflowStatus($documentID=null, $version=null) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = 'SELECT DISTINCT d.*, c.userid FROM tblWorkflowTransitions a LEFT JOIN tblWorkflows b ON a.workflow=b.id LEFT JOIN tblWorkflowTransitionUsers c ON a.id=c.transition LEFT JOIN tblWorkflowDocumentContent d ON b.id=d.workflow WHERE d.document IS NOT NULL AND a.state=d.state AND c.userid='.$this->_id; + $queryStr = 'SELECT DISTINCT d.*, c.`userid` FROM `tblWorkflowTransitions` a LEFT JOIN `tblWorkflows` b ON a.`workflow`=b.`id` LEFT JOIN `tblWorkflowTransitionUsers` c ON a.`id`=c.`transition` LEFT JOIN `tblWorkflowDocumentContent` d ON b.`id`=d.`workflow` WHERE d.`document` IS NOT NULL AND a.`state`=d.`state` AND c.`userid`='.$this->_id; if($documentID) { - $queryStr .= ' AND d.document='.(int) $documentID; + $queryStr .= ' AND d.`document`='.(int) $documentID; if($version) - $queryStr .= ' AND d.version='.(int) $version; + $queryStr .= ' AND d.`version`='.(int) $version; } $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -1075,11 +1075,11 @@ class SeedDMS_Core_User { /* {{{ */ } } - $queryStr = 'select distinct d.*, c.groupid from tblWorkflowTransitions a left join tblWorkflows b on a.workflow=b.id left join tblWorkflowTransitionGroups c on a.id=c.transition left join tblWorkflowDocumentContent d on b.id=d.workflow left join tblGroupMembers e on c.groupid = e.groupID where d.document is not null and a.state=d.state and e.userID='.$this->_id; + $queryStr = 'select distinct d.*, c.`groupid` from `tblWorkflowTransitions` a left join `tblWorkflows` b on a.`workflow`=b.`id` left join `tblWorkflowTransitionGroups` c on a.`id`=c.`transition` left join `tblWorkflowDocumentContent` d on b.`id`=d.`workflow` left join `tblGroupMembers` e on c.`groupid` = e.`groupID` where d.`document` is not null and a.`state`=d.`state` and e.`userID`='.$this->_id; if($documentID) { - $queryStr .= ' AND d.document='.(int) $documentID; + $queryStr .= ' AND d.`document`='.(int) $documentID; if($version) - $queryStr .= ' AND d.version='.(int) $version; + $queryStr .= ' AND d.`version`='.(int) $version; } $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -1106,7 +1106,7 @@ class SeedDMS_Core_User { /* {{{ */ function getMandatoryReviewers() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblMandatoryReviewers WHERE userID = " . $this->_id; + $queryStr = "SELECT * FROM `tblMandatoryReviewers` WHERE `userID` = " . $this->_id; $resArr = $db->getResultArray($queryStr); return $resArr; @@ -1122,7 +1122,7 @@ class SeedDMS_Core_User { /* {{{ */ function getMandatoryApprovers() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblMandatoryApprovers WHERE userID = " . $this->_id; + $queryStr = "SELECT * FROM `tblMandatoryApprovers` WHERE `userID` = " . $this->_id; $resArr = $db->getResultArray($queryStr); return $resArr; @@ -1140,7 +1140,7 @@ class SeedDMS_Core_User { /* {{{ */ function getMandatoryWorkflow() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id; + $queryStr = "SELECT * FROM `tblWorkflowMandatoryWorkflow` WHERE `userid` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1163,7 +1163,7 @@ class SeedDMS_Core_User { /* {{{ */ function getMandatoryWorkflows() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id; + $queryStr = "SELECT * FROM `tblWorkflowMandatoryWorkflow` WHERE `userid` = " . $this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && !$resArr) return false; @@ -1190,21 +1190,21 @@ class SeedDMS_Core_User { /* {{{ */ if ($isgroup){ - $queryStr = "SELECT * FROM tblMandatoryReviewers WHERE userID = " . $this->_id . " AND reviewerGroupID = " . $id; + $queryStr = "SELECT * FROM `tblMandatoryReviewers` WHERE `userID` = " . $this->_id . " AND `reviewerGroupID` = " . $id; $resArr = $db->getResultArray($queryStr); if (count($resArr)!=0) return true; - $queryStr = "INSERT INTO tblMandatoryReviewers (userID, reviewerGroupID) VALUES (" . $this->_id . ", " . $id .")"; + $queryStr = "INSERT INTO `tblMandatoryReviewers` (`userID`, `reviewerGroupID`) VALUES (" . $this->_id . ", " . $id .")"; $resArr = $db->getResult($queryStr); if (is_bool($resArr) && !$resArr) return false; }else{ - $queryStr = "SELECT * FROM tblMandatoryReviewers WHERE userID = " . $this->_id . " AND reviewerUserID = " . $id; + $queryStr = "SELECT * FROM `tblMandatoryReviewers` WHERE `userID` = " . $this->_id . " AND reviewerUserID = " . $id; $resArr = $db->getResultArray($queryStr); if (count($resArr)!=0) return true; - $queryStr = "INSERT INTO tblMandatoryReviewers (userID, reviewerUserID) VALUES (" . $this->_id . ", " . $id .")"; + $queryStr = "INSERT INTO `tblMandatoryReviewers` (`userID`, `reviewerUserID`) VALUES (" . $this->_id . ", " . $id .")"; $resArr = $db->getResult($queryStr); if (is_bool($resArr) && !$resArr) return false; } @@ -1224,21 +1224,21 @@ class SeedDMS_Core_User { /* {{{ */ if ($isgroup){ - $queryStr = "SELECT * FROM tblMandatoryApprovers WHERE userID = " . $this->_id . " AND approverGroupID = " . (int) $id; + $queryStr = "SELECT * FROM `tblMandatoryApprovers` WHERE `userID` = " . $this->_id . " AND `approverGroupID` = " . (int) $id; $resArr = $db->getResultArray($queryStr); if (count($resArr)!=0) return; - $queryStr = "INSERT INTO tblMandatoryApprovers (userID, approverGroupID) VALUES (" . $this->_id . ", " . $id .")"; + $queryStr = "INSERT INTO `tblMandatoryApprovers` (`userID`, `approverGroupID`) VALUES (" . $this->_id . ", " . $id .")"; $resArr = $db->getResult($queryStr); if (is_bool($resArr) && !$resArr) return false; }else{ - $queryStr = "SELECT * FROM tblMandatoryApprovers WHERE userID = " . $this->_id . " AND approverUserID = " . (int) $id; + $queryStr = "SELECT * FROM `tblMandatoryApprovers` WHERE `userID` = " . $this->_id . " AND approverUserID = " . (int) $id; $resArr = $db->getResultArray($queryStr); if (count($resArr)!=0) return; - $queryStr = "INSERT INTO tblMandatoryApprovers (userID, approverUserID) VALUES (" . $this->_id . ", " . $id .")"; + $queryStr = "INSERT INTO `tblMandatoryApprovers` (`userID`, `approverUserID`) VALUES (" . $this->_id . ", " . $id .")"; $resArr = $db->getResult($queryStr); if (is_bool($resArr) && !$resArr) return false; } @@ -1254,11 +1254,11 @@ class SeedDMS_Core_User { /* {{{ */ function setMandatoryWorkflow($workflow) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id . " AND workflow = " . (int) $workflow->getID(); + $queryStr = "SELECT * FROM `tblWorkflowMandatoryWorkflow` WHERE `userid` = " . $this->_id . " AND `workflow` = " . (int) $workflow->getID(); $resArr = $db->getResultArray($queryStr); if (count($resArr)!=0) return; - $queryStr = "INSERT INTO tblWorkflowMandatoryWorkflow (userid, workflow) VALUES (" . $this->_id . ", " . $workflow->getID() .")"; + $queryStr = "INSERT INTO `tblWorkflowMandatoryWorkflow` (`userid`, `workflow`) VALUES (" . $this->_id . ", " . $workflow->getID() .")"; $resArr = $db->getResult($queryStr); if (is_bool($resArr) && !$resArr) return false; } /* }}} */ @@ -1274,14 +1274,14 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $db->startTransaction(); - $queryStr = "DELETE FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowMandatoryWorkflow` WHERE `userid` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } foreach($workflows as $workflow) { - $queryStr = "INSERT INTO tblWorkflowMandatoryWorkflow (userid, workflow) VALUES (" . $this->_id . ", " . $workflow->getID() .")"; + $queryStr = "INSERT INTO `tblWorkflowMandatoryWorkflow` (`userid`, `workflow`) VALUES (" . $this->_id . ", " . $workflow->getID() .")"; $resArr = $db->getResult($queryStr); if (is_bool($resArr) && !$resArr) { $db->rollbackTransaction(); @@ -1300,7 +1300,7 @@ class SeedDMS_Core_User { /* {{{ */ */ function delMandatoryReviewers() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblMandatoryReviewers WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryReviewers` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) return false; return true; } /* }}} */ @@ -1313,7 +1313,7 @@ class SeedDMS_Core_User { /* {{{ */ function delMandatoryApprovers() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblMandatoryApprovers WHERE userID = " . $this->_id; + $queryStr = "DELETE FROM `tblMandatoryApprovers` WHERE `userID` = " . $this->_id; if (!$db->getResult($queryStr)) return false; return true; } /* }}} */ @@ -1325,7 +1325,7 @@ class SeedDMS_Core_User { /* {{{ */ */ function delMandatoryWorkflow() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "DELETE FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowMandatoryWorkflow` WHERE `userid` = " . $this->_id; if (!$db->getResult($queryStr)) return false; return true; } /* }}} */ diff --git a/SeedDMS_Core/Core/inc.ClassWorkflow.php b/SeedDMS_Core/Core/inc.ClassWorkflow.php index f3c491c86..579098427 100644 --- a/SeedDMS_Core/Core/inc.ClassWorkflow.php +++ b/SeedDMS_Core/Core/inc.ClassWorkflow.php @@ -75,7 +75,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflows SET name = ".$db->qstr($newName)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflows` SET `name` = ".$db->qstr($newName)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -89,7 +89,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ function setInitState($state) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflows SET initstate = ".$state->getID()." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflows` SET `initstate` = ".$state->getID()." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -104,7 +104,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ if($this->_transitions) return $this->_transitions; - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE workflow=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `workflow`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -165,7 +165,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ function getNextTransitions($state) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE workflow=".$this->_id." AND state=".$state->getID(); + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `workflow`=".$this->_id." AND `state`=".$state->getID(); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -189,7 +189,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ function getPreviousTransitions($state) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE workflow=".$this->_id." AND nextstate=".$state->getID(); + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `workflow`=".$this->_id." AND `nextstate`=".$state->getID(); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -214,7 +214,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ function getTransitionsByStates($state, $nextstate) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE workflow=".$this->_id." AND state=".$state->getID()." AND nextstate=".$nextstate->getID(); + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `workflow`=".$this->_id." AND `state`=".$state->getID()." AND `nextstate`=".$nextstate->getID(); $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -254,7 +254,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ $db = $this->_dms->getDB(); $db->startTransaction(); - $queryStr = "INSERT INTO tblWorkflowTransitions (workflow, state, action, nextstate) VALUES (".$this->_id.", ".$state->getID().", ".$action->getID().", ".$nextstate->getID().")"; + $queryStr = "INSERT INTO `tblWorkflowTransitions` (`workflow`, `state`, `action`, `nextstate`) VALUES (".$this->_id.", ".$state->getID().", ".$action->getID().", ".$nextstate->getID().")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -267,7 +267,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ $transition = $this->getTransition($db->getInsertID()); foreach($users as $user) { - $queryStr = "INSERT INTO tblWorkflowTransitionUsers (transition, userid) VALUES (".$transition->getID().", ".$user->getID().")"; + $queryStr = "INSERT INTO `tblWorkflowTransitionUsers` (`transition`, `userid`) VALUES (".$transition->getID().", ".$user->getID().")"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -275,7 +275,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ } foreach($groups as $group) { - $queryStr = "INSERT INTO tblWorkflowTransitionGroups (transition, groupid, minusers) VALUES (".$transition->getID().", ".$group->getID().", 1)"; + $queryStr = "INSERT INTO `tblWorkflowTransitionGroups` (`transition`, `groupid`, `minusers`) VALUES (".$transition->getID().", ".$group->getID().", 1)"; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -294,7 +294,7 @@ class SeedDMS_Core_Workflow { /* {{{ */ function isUsed() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowDocumentContent WHERE workflow=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowDocumentContent` WHERE `workflow`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) return false; @@ -345,20 +345,20 @@ class SeedDMS_Core_Workflow { /* {{{ */ $db->startTransaction(); - $queryStr = "DELETE FROM tblWorkflowTransitions WHERE workflow = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowTransitions` WHERE `workflow` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } - $queryStr = "DELETE FROM tblWorkflowMandatoryWorkflow WHERE workflow = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowMandatoryWorkflow` WHERE `workflow` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; } // Delete workflow itself - $queryStr = "DELETE FROM tblWorkflows WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflows` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -443,7 +443,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowStates SET name = ".$db->qstr($newName)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowStates` SET `name` = ".$db->qstr($newName)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -457,7 +457,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ function setMaxTime($maxtime) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowStates SET maxtime = ".intval($maxtime)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowStates` SET `maxtime` = ".intval($maxtime)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -471,7 +471,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ function setPreCondFunc($precondfunc) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowStates SET precondfunc = ".$db->qstr($precondfunc)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowStates` SET `precondfunc` = ".$db->qstr($precondfunc)." WHERE id = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -493,7 +493,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ function setDocumentStatus($docstatus) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowStates SET documentstatus = ".intval($docstatus)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowStates` SET `documentstatus` = ".intval($docstatus)." WHERE id = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -510,7 +510,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ function isUsed() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE state=".$this->_id. " OR nextstate=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `state`=".$this->_id. " OR `nextstate`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) return false; @@ -525,7 +525,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ function getTransitions() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE state=".$this->_id. " OR nextstate=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `state`=".$this->_id. " OR `nextstate`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) return false; @@ -555,7 +555,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */ $db->startTransaction(); // Delete workflow state itself - $queryStr = "DELETE FROM tblWorkflowStates WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowStates` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -616,7 +616,7 @@ class SeedDMS_Core_Workflow_Action { /* {{{ */ function setName($newName) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowActions SET name = ".$db->qstr($newName)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowActions` SET `name` = ".$db->qstr($newName)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -633,7 +633,7 @@ class SeedDMS_Core_Workflow_Action { /* {{{ */ function isUsed() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE action=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `action`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) return false; @@ -648,7 +648,7 @@ class SeedDMS_Core_Workflow_Action { /* {{{ */ function getTransitions() { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "SELECT * FROM tblWorkflowTransitions WHERE action=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitions` WHERE `action`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_array($resArr) && count($resArr) == 0) return false; @@ -678,7 +678,7 @@ class SeedDMS_Core_Workflow_Action { /* {{{ */ $db->startTransaction(); // Delete workflow state itself - $queryStr = "DELETE FROM tblWorkflowActions WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowActions` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false; @@ -785,7 +785,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ function setWorkflow($newWorkflow) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowTransitions SET workflow = ".$newWorkflow->getID()." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowTransitions` SET `workflow` = ".$newWorkflow->getID()." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -799,7 +799,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ function setState($newState) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowTransitions SET state = ".$newState->getID()." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowTransitions` SET `state` = ".$newState->getID()." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -813,7 +813,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ function setNextState($newNextState) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowTransitions SET nextstate = ".$newNextState->getID()." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowTransitions` SET `nextstate` = ".$newNextState->getID()." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -827,7 +827,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ function setAction($newAction) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowTransitions SET action = ".$newAction->getID()." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowTransitions` SET `action` = ".$newAction->getID()." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -841,7 +841,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ function setMaxTime($maxtime) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblWorkflowTransitions SET maxtime = ".intval($maxtime)." WHERE id = " . $this->_id; + $queryStr = "UPDATE `tblWorkflowTransitions` SET `maxtime` = ".intval($maxtime)." WHERE `id` = " . $this->_id; $res = $db->getResult($queryStr); if (!$res) return false; @@ -861,7 +861,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ if($this->_users) return $this->_users; - $queryStr = "SELECT * FROM tblWorkflowTransitionUsers WHERE transition=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitionUsers` WHERE `transition`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -889,7 +889,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ if($this->_groups) return $this->_groups; - $queryStr = "SELECT * FROM tblWorkflowTransitionGroups WHERE transition=".$this->_id; + $queryStr = "SELECT * FROM `tblWorkflowTransitionGroups` WHERE `transition`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; @@ -918,7 +918,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */ $db->startTransaction(); // Delete workflow transition itself - $queryStr = "DELETE FROM tblWorkflowTransitions WHERE id = " . $this->_id; + $queryStr = "DELETE FROM `tblWorkflowTransitions` WHERE `id` = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); return false;