gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31:32 +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 2025-02-12 20:56:53 +01:00
commit 1510acc606
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer-dist.json
View File

@ -26,6 +26,7 @@
"zf1/zend-search-lucene": "*", "zf1/zend-search-lucene": "*",
"symfony/http-foundation": "^5.4", "symfony/http-foundation": "^5.4",
"php-di/php-di": "^6.4", "php-di/php-di": "^6.4",
"slim/psr7": "^1.7",
"seeddms/core": "dev-master", "seeddms/core": "dev-master",
"seeddms/lucene": "dev-master", "seeddms/lucene": "dev-master",
"seeddms/preview": "dev-master", "seeddms/preview": "dev-master",

8
restapi/index.php
View File

@ -1296,7 +1296,7 @@ final class SeedDMS_RestapiController { /* {{{ */
if(!($fh = @fopen($file, 'rb'))) { if(!($fh = @fopen($file, 'rb'))) {
return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500); return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500);
} }
$stream = new \Slim\Http\Stream($fh); // create a stream instance for the response body $stream = new \Slim\Psr7\Stream($fh); // create a stream instance for the response body
return $response->withHeader('Content-Type', $lc->getMimeType()) return $response->withHeader('Content-Type', $lc->getMimeType())
->withHeader('Content-Description', 'File Transfer') ->withHeader('Content-Description', 'File Transfer')
@ -1372,7 +1372,7 @@ final class SeedDMS_RestapiController { /* {{{ */
if(!($fh = @fopen($file, 'rb'))) { if(!($fh = @fopen($file, 'rb'))) {
return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500); return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500);
} }
$stream = new \Slim\Http\Stream($fh); // create a stream instance for the response body $stream = new \Slim\Psr7\Stream($fh); // create a stream instance for the response body
return $response->withHeader('Content-Type', $lc->getMimeType()) return $response->withHeader('Content-Type', $lc->getMimeType())
->withHeader('Content-Description', 'File Transfer') ->withHeader('Content-Description', 'File Transfer')
@ -1477,7 +1477,7 @@ final class SeedDMS_RestapiController { /* {{{ */
if(!($fh = @fopen($file, 'rb'))) { if(!($fh = @fopen($file, 'rb'))) {
return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500); return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500);
} }
$stream = new \Slim\Http\Stream($fh); // create a stream instance for the response body $stream = new \Slim\Psr7\Stream($fh); // create a stream instance for the response body
return $response->withHeader('Content-Type', $lc->getMimeType()) return $response->withHeader('Content-Type', $lc->getMimeType())
->withHeader('Content-Description', 'File Transfer') ->withHeader('Content-Description', 'File Transfer')
@ -1623,7 +1623,7 @@ final class SeedDMS_RestapiController { /* {{{ */
if(!($fh = @fopen($file, 'rb'))) { if(!($fh = @fopen($file, 'rb'))) {
return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500); return $this->renderer->json($response, array('success'=>false, 'message'=>'', 'data'=>''))->withStatus(500);
} }
$stream = new \Slim\Http\Stream($fh); // create a stream instance for the response body $stream = new \Slim\Psr7\Stream($fh); // create a stream instance for the response body
return $response->withHeader('Content-Type', 'image/png') return $response->withHeader('Content-Type', 'image/png')
->withHeader('Content-Description', 'File Transfer') ->withHeader('Content-Description', 'File Transfer')