gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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

79
restapi/index.php
View File

@ -1136,46 +1136,57 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
return; return;
} }
if ($app->request()->put('id') == null)
{
$app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
return;
}
if ($app->request()->put('mode') == null)
{
$app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
return;
}
$userOrGroupIdInput = $app->request()->put('id'); $userOrGroupIdInput = $app->request()->put('id');
$modeInput = $app->request()->put('mode'); if ($operationType == 'add')
{
if ($app->request()->put('id') == null)
{
$app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
return;
}
$mode = M_NONE; if ($app->request()->put('mode') == null)
if ($modeInput == 'read') {
{ $app->response()->header('Content-Type', 'application/json');
$mode = M_READ; echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
} return;
if ($modeInput == 'readwrite') }
{
$mode = M_READWRITE; $modeInput = $app->request()->put('mode');
}
if ($modeInput == 'all') $mode = M_NONE;
{ if ($modeInput == 'read')
$mode = M_ALL; {
} $mode = M_READ;
}
if ($modeInput == 'readwrite')
{
$mode = M_READWRITE;
}
if ($modeInput == 'all')
{
$mode = M_ALL;
}
}
$userOrGroupId = $userOrGroupIdInput; $userOrGroupId = $userOrGroupIdInput;
if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user') if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
{ {
$userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput); $userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
} }
if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group') if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
{ {
$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);
@ -1232,15 +1243,15 @@ function clearFolderAccessList($id) { /* {{{ */
} }
if (!$folder) if (!$folder)
{ {
$app->response()->status(404); $app->response()->status(404);
return; return;
} }
$operationResult = $folder->clearAccessList(); $operationResult = $folder->clearAccessList();
$data = array(); $data = array();
$app->response()->header('Content-Type', 'application/json'); $app->response()->header('Content-Type', 'application/json');
if (!$operationResult) if (!$operationResult)
{ {
echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data)); echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));
} }
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data)); echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
} /* }}} */ } /* }}} */
@ -1298,7 +1309,6 @@ $app->put('/accounts/:id/disable', 'setDisabledAccount');
$app->post('/groups', 'createGroup'); $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'); //
@ -1306,7 +1316,6 @@ $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();
?> ?>