mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-09 13:06:14 +00:00
fix line indenting, propperly get query parameters in uploadDocumentPut
This commit is contained in:
parent
8cf9f4e965
commit
8e5e3ec4ea
|
@ -255,7 +255,7 @@ function getLockedDocuments($request, $response) { /* {{{ */
|
||||||
|
|
||||||
function getFolder($request, $response, $args) { /* {{{ */
|
function getFolder($request, $response, $args) { /* {{{ */
|
||||||
global $dms, $userobj, $settings;
|
global $dms, $userobj, $settings;
|
||||||
$params = $request->getQueryParams();
|
$params = $request->getQueryParams();
|
||||||
$forcebyname = isset($params['forcebyname']) ? $params['forcebyname'] : 0;
|
$forcebyname = isset($params['forcebyname']) ? $params['forcebyname'] : 0;
|
||||||
$parent = isset($params['parentid']) ? $dms->getFolder($params['parentid']) : null;
|
$parent = isset($params['parentid']) ? $dms->getFolder($params['parentid']) : null;
|
||||||
|
|
||||||
|
@ -574,7 +574,7 @@ function updateDocument($request, $response, $args) { /* {{{ */
|
||||||
$userfiletype = finfo_file($finfo, $temp);
|
$userfiletype = finfo_file($finfo, $temp);
|
||||||
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
|
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
|
||||||
finfo_close($finfo);
|
finfo_close($finfo);
|
||||||
$res=$document->addContent($comment, $userobj, $temp, $origfilename, $fileType, $userfiletype);
|
$res=$document->addContent($comment, $userobj, $temp, $origfilename, $fileType, $userfiletype);
|
||||||
|
|
||||||
unlink($temp);
|
unlink($temp);
|
||||||
if($res) {
|
if($res) {
|
||||||
|
@ -607,7 +607,7 @@ function uploadDocumentPut($request, $response, $args) { /* {{{ */
|
||||||
$mfolder = $dms->getFolder($args['id']);
|
$mfolder = $dms->getFolder($args['id']);
|
||||||
if($mfolder) {
|
if($mfolder) {
|
||||||
if ($mfolder->getAccessMode($userobj, 'addDocument') >= M_READWRITE) {
|
if ($mfolder->getAccessMode($userobj, 'addDocument') >= M_READWRITE) {
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getQueryParams();
|
||||||
$docname = isset($params['name']) ? $params['name'] : '';
|
$docname = isset($params['name']) ? $params['name'] : '';
|
||||||
$keywords = isset($params['keywords']) ? $params['keywords'] : '';
|
$keywords = isset($params['keywords']) ? $params['keywords'] : '';
|
||||||
$origfilename = isset($params['origfilename']) ? $params['origfilename'] : null;
|
$origfilename = isset($params['origfilename']) ? $params['origfilename'] : null;
|
||||||
|
@ -1117,7 +1117,7 @@ function getAccount($request, $response) { /* {{{ */
|
||||||
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>__getUserData($userobj)), 200);
|
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>__getUserData($userobj)), 200);
|
||||||
} else {
|
} else {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
|
return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
|
||||||
}
|
}
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1129,7 +1129,7 @@ function getAccount($request, $response) { /* {{{ */
|
||||||
function doSearch($request, $response) { /* {{{ */
|
function doSearch($request, $response) { /* {{{ */
|
||||||
global $dms, $userobj;
|
global $dms, $userobj;
|
||||||
|
|
||||||
$params = $request->getQueryParams();
|
$params = $request->getQueryParams();
|
||||||
$querystr = $params['query'];
|
$querystr = $params['query'];
|
||||||
$mode = $params['mode'];
|
$mode = $params['mode'];
|
||||||
if(!$limit = $params['limit'])
|
if(!$limit = $params['limit'])
|
||||||
|
@ -1193,7 +1193,7 @@ function doSearch($request, $response) { /* {{{ */
|
||||||
if($recs)
|
if($recs)
|
||||||
// array_unshift($recs, array('type'=>'', 'id'=>0, 'name'=>$querystr, 'comment'=>''));
|
// array_unshift($recs, array('type'=>'', 'id'=>0, 'name'=>$querystr, 'comment'=>''));
|
||||||
array_unshift($recs, ' '.$querystr);
|
array_unshift($recs, ' '.$querystr);
|
||||||
return $response->withJson($recs, 200);
|
return $response->withJson($recs, 200);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$recs = array();
|
$recs = array();
|
||||||
|
@ -1351,7 +1351,7 @@ function changeUserPassword($request, $response, $args) { /* {{{ */
|
||||||
if($check !== true)
|
if($check !== true)
|
||||||
return $check;
|
return $check;
|
||||||
|
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if ($params['password'] == null) {
|
if ($params['password'] == null) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new password', 'data'=>''), 200);
|
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new password', 'data'=>''), 200);
|
||||||
}
|
}
|
||||||
|
@ -1404,7 +1404,7 @@ function setDisabledUser($request, $response, $args) { /* {{{ */
|
||||||
$check = checkIfAdmin($request, $response);
|
$check = checkIfAdmin($request, $response);
|
||||||
if($check !== true)
|
if($check !== true)
|
||||||
return $check;
|
return $check;
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if (!isset($params['disable'])) {
|
if (!isset($params['disable'])) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'You must supply a disabled state', 'data'=>''), 400);
|
return $response->withJson(array('success'=>false, 'message'=>'You must supply a disabled state', 'data'=>''), 400);
|
||||||
}
|
}
|
||||||
|
@ -1450,7 +1450,7 @@ function createGroup($request, $response) { /* {{{ */
|
||||||
$check = checkIfAdmin($request, $response);
|
$check = checkIfAdmin($request, $response);
|
||||||
if($check !== true)
|
if($check !== true)
|
||||||
return $check;
|
return $check;
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
$groupName = $params['name'];
|
$groupName = $params['name'];
|
||||||
$comment = $params['comment'];
|
$comment = $params['comment'];
|
||||||
|
|
||||||
|
@ -1497,7 +1497,7 @@ function changeGroupMembership($request, $response, $args, $operationType) { /*
|
||||||
$group = $dms->getGroupByName($args['id']);
|
$group = $dms->getGroupByName($args['id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if (empty($params['userid'])) {
|
if (empty($params['userid'])) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'Missing userid', 'data'=>''), 200);
|
return $response->withJson(array('success'=>false, 'message'=>'Missing userid', 'data'=>''), 200);
|
||||||
}
|
}
|
||||||
|
@ -1742,7 +1742,7 @@ function createCategory($request, $response) { /* {{{ */
|
||||||
if($check !== true)
|
if($check !== true)
|
||||||
return $check;
|
return $check;
|
||||||
|
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if (empty($params['category'])) {
|
if (empty($params['category'])) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'Need a category.', 'data'=>''), 400);
|
return $response->withJson(array('success'=>false, 'message'=>'Need a category.', 'data'=>''), 400);
|
||||||
}
|
}
|
||||||
|
@ -1788,7 +1788,7 @@ function changeCategoryName($request, $response, $args) { /* {{{ */
|
||||||
if($check !== true)
|
if($check !== true)
|
||||||
return $check;
|
return $check;
|
||||||
|
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if (empty($params['name']))
|
if (empty($params['name']))
|
||||||
{
|
{
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''), 200);
|
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''), 200);
|
||||||
|
@ -1837,7 +1837,7 @@ function changeAttributeDefinitionName($request, $response, $args) { /* {{{ */
|
||||||
if($check !== true)
|
if($check !== true)
|
||||||
return $check;
|
return $check;
|
||||||
|
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if ($params['name'] == null) {
|
if ($params['name'] == null) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''), 200);
|
return $response->withJson(array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''), 200);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user