Peter M. Groen / knowledgetree

Commit 8df5e7e9576beee5c3648cb040d71f8538c91542

Authored by Neil Blakey-Milner
1 parent efc8cd38

Remove hardcoded users_groups_link and groups_folders_link table names. 

Submitted by:	Marcel Berteler
SF Bug:		1021345


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2930 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
lib/security/Permission.inc
  View file @8df5e7e
... ... @@ -165,7 +165,7 @@ class Permission {
165 165 }
166 166 $sql = $default->db;
167 167 $sQuery = "SELECT GFL.folder_id " .
168   - "FROM groups_folders_link AS GFL INNER JOIN users_groups_link AS UGL ON GFL.group_id = UGL.group_id " .
  168 + "FROM $default->groups_folders_table AS GFL INNER JOIN $default->users_groups_table AS UGL ON GFL.group_id = UGL.group_id " .
169 169 "WHERE UGL.user_id = " . $_SESSION["userID"] . " " .
170 170 "AND GFL.can_write = 1 ";
171 171 if ($oFolder->getInheritParentPermission()) {
... ... @@ -225,7 +225,7 @@ class Permission {
225 225 }
226 226  
227 227 $sQuery = "SELECT GFL.folder_id " .
228   - "FROM groups_folders_link AS GFL INNER JOIN users_groups_link AS UGL ON GFL.group_id = UGL.group_id " .
  228 + "FROM $default->groups_folders_table AS GFL INNER JOIN $default->users_groups_table AS UGL ON GFL.group_id = UGL.group_id " .
229 229 "WHERE UGL.user_id = " . $_SESSION["userID"] . " " .
230 230 "AND GFL.can_read = 1 ";
231 231 if ($oFolder->getInheritParentPermission()) {
... ... @@ -480,4 +480,4 @@ class Permission {
480 480 }
481 481 }
482 482  
483   -?>
484 483 \ No newline at end of file
  484 +?>
... ...
presentation/lookAndFeel/knowledgeTree/documentmanagement/createDependantDocumentUI.inc
  View file @8df5e7e
... ... @@ -75,7 +75,7 @@ function getUserDropDown($iUnitID, $iUserID) {
75 75 $iUnitID = -1;
76 76 }
77 77 $oPatternListBox = & new PatternListBox($default->users_table, "Name", "id", "fUserID", "GUL.unit_id = $iUnitID");
78   - $sFromClause = "INNER join users_groups_link AS UGL ON UGL.user_id = ST.id " .
  78 + $sFromClause = "INNER join $default->users_groups_table AS UGL ON UGL.user_id = ST.id " .
79 79 "INNER JOIN groups_units_link AS GUL ON GUL.group_id = UGL.group_id ";
80 80 $oPatternListBox->setFromClause($sFromClause);
81 81 if (isset($iUserID)) {
... ... @@ -119,4 +119,4 @@ function getBrowseJavaScript() {
119 119 $sToRender .= "//--></script>\n";
120 120 return $sToRender;
121 121 }
122   -?>
123 122 \ No newline at end of file
  123 +?>
... ...
presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
  View file @8df5e7e
... ... @@ -153,7 +153,7 @@ function getAddPage($iFolderCollaborationID, $iFolderID, $iUnitID, $sDocumentTit
153 153 function getUserDropDown($iUnitID, $iUserID = null) {
154 154 global $default;
155 155 $oPatternListBox = & new PatternListBox($default->users_table, "Name", "id", "fUserID", "GUL.unit_id = $iUnitID");
156   - $sFromClause = "INNER join users_groups_link AS UGL ON UGL.user_id = ST.id " .
  156 + $sFromClause = "INNER join $default->users_groups_table AS UGL ON UGL.user_id = ST.id " .
157 157 "INNER JOIN groups_units_link AS GUL ON GUL.group_id = UGL.group_id ";
158 158 $oPatternListBox->setFromClause($sFromClause);
159 159 if (isset($iUserID)) {
... ... @@ -194,4 +194,4 @@ function getBrowseJavaScript() {
194 194 $sToRender .= "//--></script>\n";
195 195 return $sToRender;
196 196 }
197   -?>
198 197 \ No newline at end of file
  198 +?>
... ...