move retrieval of document data into function

This commit is contained in:
Uwe Steinmann 2017-12-20 11:51:05 +01:00
parent b539921c23
commit 83aa6fe02e

View File

@ -60,6 +60,21 @@ if(USE_PHP_SESSION) {
require "vendor/autoload.php"; require "vendor/autoload.php";
#\Slim\Slim::registerAutoloader(); #\Slim\Slim::registerAutoloader();
function __getLatestVersionData($lc) { /* {{{ */
$document = $lc->getDocument();
return array(
'type'=>'document',
'id'=>$document->getId(),
'date'=>$document->getDate(),
'name'=>$document->getName(),
'mimetype'=>$lc->getMimeType(),
'version'=>$lc->getVersion(),
'size'=>$lc->getFileSize(),
'comment'=>$document->getComment(),
'keywords'=>$document->getKeywords(),
);
} /* }}} */
function doLogin() { /* {{{ */ function doLogin() { /* {{{ */
global $app, $dms, $userobj, $session, $settings; global $app, $dms, $userobj, $session, $settings;
@ -136,19 +151,12 @@ function getLockedDocuments() { /* {{{ */
if(false !== ($documents = $dms->getDocumentsLockedByUser($userobj))) { if(false !== ($documents = $dms->getDocumentsLockedByUser($userobj))) {
$documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ); $documents = SeedDMS_Core_DMS::filterAccess($documents, $userobj, M_READ);
$recs = array();
foreach($documents as $document) { foreach($documents as $document) {
$lc = $document->getLatestContent(); $lc = $document->getLatestContent();
$recs[] = array( if($lc) {
'type'=>'document', $recs[] = __getLatestVersionData($lc);
'id'=>$document->getId(), }
'date'=>$document->getDate(),
'name'=>$document->getName(),
'mimetype'=>$lc->getMimeType(),
'version'=>$lc->getVersion(),
'size'=>$lc->getFileSize(),
'comment'=>$document->getComment(),
'keywords'=>$document->getKeywords(),
);
} }
$app->response()->header('Content-Type', 'application/json'); $app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs)); echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
@ -271,17 +279,7 @@ function getFolderChildren($id) { /* {{{ */
foreach($documents as $document) { foreach($documents as $document) {
$lc = $document->getLatestContent(); $lc = $document->getLatestContent();
if($lc) { if($lc) {
$recs[] = array( $recs[] = __getLatestVersionData($lc);
'type'=>'document',
'id'=>$document->getId(),
'date'=>$document->getDate(),
'name'=>$document->getName(),
'mimetype'=>$lc->getMimeType(),
'version'=>$lc->getVersion(),
'size'=>$lc->getFileSize(),
'comment'=>$document->getComment(),
'keywords'=>$document->getKeywords(),
);
} }
} }
$app->response()->header('Content-Type', 'application/json'); $app->response()->header('Content-Type', 'application/json');
@ -461,20 +459,14 @@ function getDocument($id) { /* {{{ */
if($document) { if($document) {
if ($document->getAccessMode($userobj) >= M_READ) { if ($document->getAccessMode($userobj) >= M_READ) {
$lc = $document->getLatestContent(); $lc = $document->getLatestContent();
$app->response()->header('Content-Type', 'application/json'); if($lc) {
$data = array( $data = __getLatestVersionData($lc);
'id'=>$id, $app->response()->header('Content-Type', 'application/json');
'name'=>$document->getName(), echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
'comment'=>$document->getComment(), } else {
'date'=>$document->getDate(), $app->response()->header('Content-Type', 'application/json');
'mimetype'=>$lc->getMimeType(), echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
'version'=>$lc->getVersion(), }
'orig_filename'=>$lc->getOriginalFileName(),
'size'=>$lc->getFileSize(),
'keywords'=>$document->getKeywords(),
);
$app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
} else { } else {
$app->response()->header('Content-Type', 'application/json'); $app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>'')); echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
@ -838,17 +830,9 @@ function doSearch() { /* {{{ */
if(get_class($entry) == 'SeedDMS_Core_Document') { if(get_class($entry) == 'SeedDMS_Core_Document') {
$document = $entry; $document = $entry;
$lc = $document->getLatestContent(); $lc = $document->getLatestContent();
$recs[] = array( if($lc) {
'type'=>'document', $recs[] = __getLatestVersionData($lc);
'id'=>$document->getId(), }
'date'=>$document->getDate(),
'name'=>$document->getName(),
'mimetype'=>$lc->getMimeType(),
'version'=>$lc->getVersion(),
'size'=>$lc->getFileSize(),
'comment'=>$document->getComment(),
'keywords'=>$document->getKeywords(),
);
} elseif(get_class($entry) == 'SeedDMS_Core_Folder') { } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
$folder = $entry; $folder = $entry;
$recs[] = array( $recs[] = array(
@ -901,17 +885,9 @@ function doSearchByAttr() { /* {{{ */
if(get_class($entry) == 'SeedDMS_Core_Document') { if(get_class($entry) == 'SeedDMS_Core_Document') {
$document = $entry; $document = $entry;
$lc = $document->getLatestContent(); $lc = $document->getLatestContent();
$recs[] = array( if($lc) {
'type'=>'document', $recs[] = __getLatestVersionData($lc);
'id'=>$document->getId(), }
'date'=>$document->getDate(),
'name'=>$document->getName(),
'mimetype'=>$lc->getMimeType(),
'version'=>$lc->getVersion(),
'size'=>$lc->getFileSize(),
'comment'=>$document->getComment(),
'keywords'=>$document->getKeywords(),
);
} elseif(get_class($entry) == 'SeedDMS_Core_Folder') { } elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
$folder = $entry; $folder = $entry;
$recs[] = array( $recs[] = array(