diff --git a/restapi/index.php b/restapi/index.php index 7efc667bc..51d57a90c 100644 --- a/restapi/index.php +++ b/restapi/index.php @@ -390,17 +390,17 @@ function createFolder($request, $response, $args) { /* {{{ */ $params = $request->getParsedBody(); if(!empty($params['name'])) { $comment = isset($params['comment']) ? $params['comment'] : ''; - if(isset($params['sequence'])) { - $sequence = str_replace(',', '.', $params["sequence"]); - if (!is_numeric($sequence)) - return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400); - } else { - $dd = $parent->getSubFolders('s'); - if(count($dd) > 1) - $sequence = $dd[count($dd)-1]->getSequence() + 1; - else - $sequence = 1.0; - } + if(isset($params['sequence'])) { + $sequence = str_replace(',', '.', $params["sequence"]); + if (!is_numeric($sequence)) + return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400); + } else { + $dd = $parent->getSubFolders('s'); + if(count($dd) > 1) + $sequence = $dd[count($dd)-1]->getSequence() + 1; + else + $sequence = 1.0; + } $newattrs = array(); if(!empty($params['attributes'])) { foreach($params['attributes'] as $attrname=>$attrvalue) { @@ -410,12 +410,12 @@ function createFolder($request, $response, $args) { /* {{{ */ } } } - /* Check if name already exists in the folder */ - if(!$settings->_enableDuplicateSubFolderNames) { - if($folder->hasSubFolderByName($params['name'])) { - return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400); - } - } + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateSubFolderNames) { + if($folder->hasSubFolderByName($params['name'])) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400); + } + } if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) { $rec = __getFolderData($folder); @@ -577,12 +577,12 @@ function uploadDocument($request, $response, $args) { /* {{{ */ $origfilename = $file_info->getClientFilename(); if (trim($docname) == '') $docname = $origfilename; - /* Check if name already exists in the folder */ - if(!$settings->_enableDuplicateDocNames) { - if($mfolder->hasDocumentByName($docname)) { - return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); - } - } + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateDocNames) { + if($mfolder->hasDocumentByName($docname)) { + return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); + } + } $temp = $file_info->file; $finfo = finfo_open(FILEINFO_MIME_TYPE); $userfiletype = finfo_file($finfo, $temp); @@ -699,12 +699,12 @@ function uploadDocumentPut($request, $response, $args) { /* {{{ */ $userfiletype = finfo_file($finfo, $temp); $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION); finfo_close($finfo); - /* Check if name already exists in the folder */ - if(!$settings->_enableDuplicateDocNames) { - if($mfolder->hasDocumentByName($docname)) { + /* Check if name already exists in the folder */ + if(!$settings->_enableDuplicateDocNames) { + if($mfolder->hasDocumentByName($docname)) { return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400); - } - } + } + } $res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0); unlink($temp); if($res) { @@ -796,13 +796,13 @@ function addDocumentLink($request, $response, $args) { /* {{{ */ $targetdoc = $dms->getDocument($args['documentid']); if($sourcedoc && $targetdoc) { if($sourcedoc->getAccessMode($userobj, 'addDocumentLink') >= M_READ) { - $params = $request->getParsedBody(); - $public = !isset($params['public']) ? true : false; - if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){ + $params = $request->getParsedBody(); + $public = !isset($params['public']) ? true : false; + if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){ return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201); - } else { - return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500); - } + } else { + return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500); + } } else { return $response->withJson(array('success'=>false, 'message'=>'No access on source document', 'data'=>''), 403); }