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

move code for getting version into method version()

Browse Source
This commit is contained in:
Uwe Steinmann 2019-03-27 15:30:11 +01:00
parent f97af846e6
commit cd4eb3d115
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
controllers/class.Download.php
View File

@ -24,8 +24,25 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
public function version() { /* {{{ */ public function version() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$content = $this->params['content']; $version = $this->params['version'];
$document = $this->params['document'];
if($version < 1) {
$content = $this->callHook('documentLatestContent', $document);
if($content === null)
$content = $document->getLatestContent();
} else {
$content = $this->callHook('documentContent', $document, $version);
if($content === null)
$content = $document->getContentByVersion($version);
}
if (!is_object($content)) {
$this->errormsg = 'invalid_version';
return false;
}
/* set params['content'] for compatiblity with older extensions which
* expect the content in the controller
*/
$this->params['content'] = $content;
if(null === $this->callHook('version')) { if(null === $this->callHook('version')) {
if(file_exists($dms->contentDir . $content->getPath())) { if(file_exists($dms->contentDir . $content->getPath())) {
header("Content-Transfer-Encoding: binary"); header("Content-Transfer-Encoding: binary");
@ -174,25 +191,6 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
$dms = $this->params['dms']; $dms = $this->params['dms'];
$type = $this->params['type']; $type = $this->params['type'];
$version = $this->params['version'];
$document = $this->params['document'];
if($version < 1) {
$content = $this->callHook('documentLatestContent', $document);
if($content === null)
$content = $document->getLatestContent();
} else {
$content = $this->callHook('documentContent', $document, $version);
if($content === null)
$content = $document->getContentByVersion($version);
}
if (!is_object($content)) {
$this->errormsg = 'invalid_version';
return false;
}
/* set params['content'] for compatiblity with older extensions which
* expect the content in the controller
*/
$this->params['content'] = $content;
switch($type) { switch($type) {
case "version": case "version":
return $this->version(); return $this->version();