Peter M. Groen / knowledgetree

Commit e767ca643e968e0f9d71742583587e083d5adedf

Authored by michael
1 parent df4da277

s/user_id/userID/g 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@330 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
lib/security/permission.inc
  View file @e767ca6
@@ -134,7 +134,7 @@ class Permission { @@ -134,7 +134,7 @@ class Permission {
134 $sql->query("SELECT * FROM " . $default->owl_group_folders_table ." AS GFL INNER JOIN " . $default->owl_groups_users_link_table . " as GUL ON GFL.group_id = GUL.group_id " . 134 $sql->query("SELECT * FROM " . $default->owl_group_folders_table ." AS GFL INNER JOIN " . $default->owl_groups_users_link_table . " as GUL ON GFL.group_id = GUL.group_id " .
135 "INNER JOIN " . $default->owl_groups_table . " AS G ON G.ID = GFL.group_id " . 135 "INNER JOIN " . $default->owl_groups_table . " AS G ON G.ID = GFL.group_id " .
136 "WHERE GFL.folder_id = " . $iFolderID . " " . 136 "WHERE GFL.folder_id = " . $iFolderID . " " .
137 - "AND GUL.user_id = " . $_SESSION["user_id"] . " " . 137 + "AND GUL.user_id = " . $_SESSION["userID"] . " " .
138 "AND G.Name = 'Unit Administrators' "); 138 "AND G.Name = 'Unit Administrators' ");
139 if ($sql->next_record()) { 139 if ($sql->next_record()) {
140 return true; 140 return true;
@@ -154,7 +154,7 @@ class Permission { @@ -154,7 +154,7 @@ class Permission {
154 function userHasGroupWritePermissionForFolder($iFolderID) { 154 function userHasGroupWritePermissionForFolder($iFolderID) {
155 global $default, $lang_err_user_folder_write; 155 global $default, $lang_err_user_folder_write;
156 $sql = new Owl_DB(); 156 $sql = new Owl_DB();
157 - $sql->query("SELECT * FROM " . $default->owl_groups_folders_table . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND can_write = 1"); 157 + $sql->query("SELECT * FROM " . $default->owl_groups_folders_table . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND can_write = 1");
158 if ($sql->next_record()) { 158 if ($sql->next_record()) {
159 return true; 159 return true;
160 } 160 }
@@ -172,7 +172,7 @@ class Permission { @@ -172,7 +172,7 @@ class Permission {
172 function userHasGroupReadPermissionForFolder($iFolderID) { 172 function userHasGroupReadPermissionForFolder($iFolderID) {
173 global $default, $lang_err_user_folder_read; 173 global $default, $lang_err_user_folder_read;
174 $sql = new Owl_DB(); 174 $sql = new Owl_DB();
175 - $sql->query("SELECT * FROM " . $default->owl_groups_folders_table = "groups_folders_link" . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND can_read = 1"); 175 + $sql->query("SELECT * FROM " . $default->owl_groups_folders_table = "groups_folders_link" . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND can_read = 1");
176 if ($sql->next_record()) { 176 if ($sql->next_record()) {
177 return true; 177 return true;
178 } 178 }
@@ -190,7 +190,7 @@ class Permission { @@ -190,7 +190,7 @@ class Permission {
190 function userIsInGroupID($iGroupID) { 190 function userIsInGroupID($iGroupID) {
191 global $default, $lang_err_user_group; 191 global $default, $lang_err_user_group;
192 $sql = new Owl_DB(); 192 $sql = new Owl_DB();
193 - $sql->query("SELECT id FROM " . $default->owl_groups_users_table . " WHERE id = " . $iGroupID . " AND user_id = " . $_SESSION["user_id"]); 193 + $sql->query("SELECT id FROM " . $default->owl_groups_users_table . " WHERE id = " . $iGroupID . " AND user_id = " . $_SESSION["userID"]);
194 if ($sql->next_record()) { 194 if ($sql->next_record()) {
195 return true; 195 return true;
196 } 196 }
@@ -208,7 +208,7 @@ class Permission { @@ -208,7 +208,7 @@ class Permission {
208 function userIsInGroupName($sGroupName) { 208 function userIsInGroupName($sGroupName) {
209 global $default, $lang_err_user_group; 209 global $default, $lang_err_user_group;
210 $sql = new Owl_DB(); 210 $sql = new Owl_DB();
211 - $sql->query("SELECT id FROM " . $default->owl_groups_users_table . " AS GULT INNER JOIN " . $default->owl_groups_table . " AS G ON GULT.group_id = G.ID WHERE G.name = '" . $sGroupName . "' AND user_id = " . $_SESSION["user_id"]); 211 + $sql->query("SELECT id FROM " . $default->owl_groups_users_table . " AS GULT INNER JOIN " . $default->owl_groups_table . " AS G ON GULT.group_id = G.ID WHERE G.name = '" . $sGroupName . "' AND user_id = " . $_SESSION["userID"]);
212 if ($sql->next_record()) { 212 if ($sql->next_record()) {
213 return true; 213 return true;
214 } 214 }
@@ -227,7 +227,7 @@ class Permission { @@ -227,7 +227,7 @@ class Permission {
227 function userHasWriteRoleForFolder($iFolderID) { 227 function userHasWriteRoleForFolder($iFolderID) {
228 global $default, $lang_err_user_role; 228 global $default, $lang_err_user_role;
229 $sql = new Owl_DB(); 229 $sql = new Owl_DB();
230 - $sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND R.can_write = 1"); 230 + $sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND R.can_write = 1");
231 if ($sql->next_record()) { 231 if ($sql->next_record()) {
232 return true; 232 return true;
233 } 233 }
@@ -245,7 +245,7 @@ class Permission { @@ -245,7 +245,7 @@ class Permission {
245 function userHasReadRoleForFolder($iFolderID) { 245 function userHasReadRoleForFolder($iFolderID) {
246 global $default, $lang_err_user_role; 246 global $default, $lang_err_user_role;
247 $sql = new Owl_DB(); 247 $sql = new Owl_DB();
248 - $sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND R.can_read = 1"); 248 + $sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND R.can_read = 1");
249 if ($sql->next_record()) { 249 if ($sql->next_record()) {
250 return true; 250 return true;
251 } 251 }
tests/foldermanagement/folderManager.php
  View file @e767ca6
@@ -29,7 +29,7 @@ if (checkSession()) { @@ -29,7 +29,7 @@ if (checkSession()) {
29 29
30 //check creation of a duplicate folder 30 //check creation of a duplicate folder
31 echo "<b>Testing creation of duplicate folder</b><br>"; 31 echo "<b>Testing creation of duplicate folder</b><br>";
32 - if (!FolderManager::createFolder("Test folder", "This is another a test' %//^&* folder", -1, $_SESSION["user_id"], 1, 1, true)) { 32 + if (!FolderManager::createFolder("Test folder", "This is another a test' %//^&* folder", -1, $_SESSION["userID"], 1, 1, true)) {
33 echo "Passed creation of duplicate folder test<br>"; 33 echo "Passed creation of duplicate folder test<br>";
34 } else { 34 } else {
35 echo "Failed creation of a dupliate folder test: " . $_SESSION["errorMessage"] . "<br>"; 35 echo "Failed creation of a dupliate folder test: " . $_SESSION["errorMessage"] . "<br>";