gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some bugs in changeFolderAccess.

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-15 17:03:13 +01:00
parent 444dc412bf
commit b59d414adb
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
restapi/index.php
View File

@ -1136,6 +1136,9 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
return; return;
} }
$userOrGroupIdInput = $app->request()->put('id');
if ($operationType == 'add')
{
if ($app->request()->put('id') == null) if ($app->request()->put('id') == null)
{ {
$app->response()->header('Content-Type', 'application/json'); $app->response()->header('Content-Type', 'application/json');
@ -1150,7 +1153,6 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
return; return;
} }
$userOrGroupIdInput = $app->request()->put('id');
$modeInput = $app->request()->put('mode'); $modeInput = $app->request()->put('mode');
$mode = M_NONE; $mode = M_NONE;
@ -1166,6 +1168,7 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
{ {
$mode = M_ALL; $mode = M_ALL;
} }
}
$userOrGroupId = $userOrGroupIdInput; $userOrGroupId = $userOrGroupIdInput;
@ -1177,6 +1180,14 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
{ {
$userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput); $userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
} }
if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
{
$userOrGroupObj = $dms->getUser($userOrGroupIdInput);
}
if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
{
$userOrGroupObj = $dms->getGroup($userOrGroupIdInput);
}
if (!$userOrGroupObj) { if (!$userOrGroupObj) {
$app->response()->status(404); $app->response()->status(404);
return; return;
@ -1299,14 +1310,12 @@ $app->post('/groups', 'createGroup');
$app->get('/groups/:id', 'getGroup'); $app->get('/groups/:id', 'getGroup');
$app->put('/groups/:id/addUser', 'addUserToGroup'); $app->put('/groups/:id/addUser', 'addUserToGroup');
$app->put('/groups/:id/removeUser', 'removeUserFromGroup'); $app->put('/groups/:id/removeUser', 'removeUserFromGroup');
$app->put('/groups/:id/removeUser', 'removeUserFromGroup');
$app->put('/folder/:id/setInherit', 'setFolderInheritsAccess'); $app->put('/folder/:id/setInherit', 'setFolderInheritsAccess');
$app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); // $app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); //
$app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); // $app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); //
$app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder'); $app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder');
$app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder'); $app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder');
$app->put('/folder/:id/access/clear', 'clearFolderAccessList'); $app->put('/folder/:id/access/clear', 'clearFolderAccessList');
$app->run(); $app->run();
?> ?>