gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- cannot use LetoDMS_User::role_admin in a string

Browse Source
This commit is contained in:
steinm 2010-12-10 08:26:21 +00:00
parent a2e6aed67c
commit 2903e30f08
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/inc.ClassDocument.php
View File

@ -1294,13 +1294,13 @@ class LetoDMS_Document { /* {{{ */
$queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ".
"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ".
"WHERE `tblGroupMembers`.`groupID` IN (". $groupIDs .") ". "WHERE `tblGroupMembers`.`groupID` IN (". $groupIDs .") ".
"AND `tblUsers`.`role` != LetoDMS_User::role_guest)"; "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest.")";
} }
$queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). $queryStr .= (strlen($queryStr)==0 ? "" : " UNION ").
"(SELECT `tblUsers`.* FROM `tblUsers` ". "(SELECT `tblUsers`.* FROM `tblUsers` ".
"WHERE (`tblUsers`.`role` != LetoDMS_User::role_guest) ". "WHERE (`tblUsers`.`role` != ".LetoDMS_User::role_guest.") ".
"AND ((`tblUsers`.`id` = ". $this->_ownerID . ") ". "AND ((`tblUsers`.`id` = ". $this->_ownerID . ") ".
"OR (`tblUsers`.`role` = LetoDMS_User::role_admin)". "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin.")".
(strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))"). (strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))").
")) ORDER BY `login`"; ")) ORDER BY `login`";
} }
@ -1309,16 +1309,16 @@ class LetoDMS_Document { /* {{{ */
$queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ".
"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ".
"WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")". "WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")".
"AND `tblUsers`.`role` != LetoDMS_User::role_guest ". "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest .
(strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"); (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))");
} }
$queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). $queryStr .= (strlen($queryStr)==0 ? "" : " UNION ").
"(SELECT `tblUsers`.* FROM `tblUsers` ". "(SELECT `tblUsers`.* FROM `tblUsers` ".
"WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ". "WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ".
"OR (`tblUsers`.`role` = LetoDMS_User::role_admin))". "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin."))".
"UNION ". "UNION ".
"(SELECT `tblUsers`.* FROM `tblUsers` ". "(SELECT `tblUsers`.* FROM `tblUsers` ".
"WHERE `tblUsers`.`role` != LetoDMS_User::role_guest ". "WHERE `tblUsers`.`role` != ".LetoDMS_User::role_guest .
(strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"). (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))").
" ORDER BY `login`"; " ORDER BY `login`";
} }

12
inc/inc.ClassFolder.php
View File

@ -855,13 +855,13 @@ class LetoDMS_Folder {
$queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ".
"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ".
"WHERE `tblGroupMembers`.`groupID` IN (". $groupIDs .") ". "WHERE `tblGroupMembers`.`groupID` IN (". $groupIDs .") ".
"AND `tblUsers`.`role` != LetoDMS_User::role_guest)"; "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest.")";
} }
$queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). $queryStr .= (strlen($queryStr)==0 ? "" : " UNION ").
"(SELECT `tblUsers`.* FROM `tblUsers` ". "(SELECT `tblUsers`.* FROM `tblUsers` ".
"WHERE (`tblUsers`.`role` != LetoDMS_User::role_guest) ". "WHERE (`tblUsers`.`role` != ".LetoDMS_User::role_guest.") ".
"AND ((`tblUsers`.`id` = ". $this->_ownerID . ") ". "AND ((`tblUsers`.`id` = ". $this->_ownerID . ") ".
"OR (`tblUsers`.`role` = LetoDMS_User::role_admin)". "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin.")".
(strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))"). (strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))").
")) ORDER BY `login`"; ")) ORDER BY `login`";
} }
@ -870,16 +870,16 @@ class LetoDMS_Folder {
$queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ".
"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ".
"WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")". "WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")".
"AND `tblUsers`.`role` != LetoDMS_User::role_guest ". "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest." ".
(strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"); (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))");
} }
$queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). $queryStr .= (strlen($queryStr)==0 ? "" : " UNION ").
"(SELECT `tblUsers`.* FROM `tblUsers` ". "(SELECT `tblUsers`.* FROM `tblUsers` ".
"WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ". "WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ".
"OR (`tblUsers`.`role` = LetoDMS_User::role_admin))". "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin."))".
"UNION ". "UNION ".
"(SELECT `tblUsers`.* FROM `tblUsers` ". "(SELECT `tblUsers`.* FROM `tblUsers` ".
"WHERE `tblUsers`.`role` != LetoDMS_User::role_guest ". "WHERE `tblUsers`.`role` != ".LetoDMS_User::role_guest." ".
(strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"). (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))").
" ORDER BY `login`"; " ORDER BY `login`";
} }