gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 21:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-11-17 19:44:52 +01:00
commit 3113c59796
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
restapi/index.php
View File

@ -170,6 +170,7 @@ class RestapiController { /* {{{ */
'email'=>$u->getEmail(),
'language' => $u->getLanguage(),
'quota' => $u->getQuota(),
'homefolder' => $u->getHomeFolder(),
'theme' => $u->getTheme(),
'role' => $this->__getRoleData($u->getRole()), //array('id'=>(int)$u->getRole()->getId(), 'name'=>$u->getRole()->getName()),
'hidden'=>$u->isHidden() ? true : false,
@ -2260,18 +2261,6 @@ class RestapiController { /* {{{ */
if($check !== true)
return $check;
$params = $request->getParsedBody();
if ($params['homefolder'] == null) {
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new home folder', 'data'=>''), 400);
}
$newHomefolderId = (int) $params['homefolder'];
$newHomefolder = $dms->getFolder($newHomefolderId);
if (!$newHomefolder) {
return $response->withJson(array('success'=>false, 'message'=>'', 'data'=>'Folder not found.'), 404);
return;
}
if(ctype_digit($args['id']))
$account = $dms->getUser($args['id']);
else {
@ -2286,6 +2275,16 @@ class RestapiController { /* {{{ */
return;
}
if(!ctype_digit($args['folderid']) || $args['folderid'] == 0) {
return $response->withJson(array('success'=>false, 'message'=>'No homefolder given', 'data'=>''), 400);
return;
}
$newHomefolder = $dms->getFolder($args['folderid']);
if (!$newHomefolder) {
return $response->withJson(array('success'=>false, 'message'=>'', 'data'=>'Folder not found.'), 404);
return;
}
$operation = $account->setHomeFolder($newHomefolder->getId());
if (!$operation){
@ -3200,7 +3199,7 @@ $app->post('/roles', \RestapiController::class.':createRole');
$app->get('/roles/{id}', \RestapiController::class.':getRole');
$app->delete('/roles/{id}', \RestapiController::class.':deleteRole');
$app->put('/users/{id}/quota', \RestapiController::class.':changeUserQuota');
$app->put('/users/{id}/homefolder', \RestapiController::class.':changeUserHomefolder');
$app->put('/users/{id}/homefolder/{folderid}', \RestapiController::class.':changeUserHomefolder');
$app->post('/groups', \RestapiController::class.':createGroup');
$app->get('/groups', \RestapiController::class.':getGroups');
$app->delete('/groups/{id}', \RestapiController::class.':deleteGroup');