gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-13 18:23:46 +01:00
commit c785906ffb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -1389,7 +1389,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
// //
$queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ". $queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ".
"AND `tblNotify`.`targetType` = '".T_FOLDER."' ". "AND `tblNotify`.`targetType` = '".T_FOLDER."' ".
"AND `tblNotify`.`".$userOrGroup."` = '". (int) $userOrGroupID."'"; "AND `tblNotify`.".$userOrGroup." = '". (int) $userOrGroupID."'";
$resArr = $db->getResultArray($queryStr); $resArr = $db->getResultArray($queryStr);
if (is_bool($resArr)) { if (is_bool($resArr)) {
return -4; return -4;
@ -1430,7 +1430,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
return -1; return -1;
} }
$userOrGroup = ($isUser) ? "userID" : "groupID"; $userOrGroup = ($isUser) ? "`userID`" : "`groupID`";
/* Verify that the requesting user has permission to add the target to /* Verify that the requesting user has permission to add the target to
* the notification system. * the notification system.
@ -1463,7 +1463,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
// //
$queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ". $queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ".
"AND `tblNotify`.`targetType` = '".T_FOLDER."' ". "AND `tblNotify`.`targetType` = '".T_FOLDER."' ".
"AND `tblNotify`.`".$userOrGroup."` = '". (int) $userOrGroupID."'"; "AND `tblNotify`.".$userOrGroup." = '". (int) $userOrGroupID."'";
$resArr = $db->getResultArray($queryStr); $resArr = $db->getResultArray($queryStr);
if (is_bool($resArr)) { if (is_bool($resArr)) {
return -4; return -4;