gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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 2020-12-09 19:55:29 +01:00
commit 52f5dbdcfa
4 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
controllers/class.Preview.php
View File

@ -72,6 +72,38 @@ class SeedDMS_Controller_Preview extends SeedDMS_Controller_Common {
$previewer->getPreview($content);
}
break;
case "file":
$object = $this->params['object'];
$document = $this->params['document'];
$width = $this->params['width'];
if (!is_object($object)) {
$this->errormsg = 'invalid_version';
return false;
}
if(null === $this->callHook('file')) {
if($width)
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout);
else
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$previewer->setConverters($settings->_converters['preview']);
$previewer->setXsendfile($settings->_enableXsendfile);
if(!$previewer->hasPreview($object)) {
add_log_line("");
if(!$previewer->createPreview($object)) {
add_log_line("", PEAR_LOG_ERR);
}
}
if(!$previewer->hasPreview($object)) {
header('Content-Type: image/svg+xml');
readfile('../views/'.$theme.'/images/empty.svg');
exit;
}
header('Content-Type: image/png');
$previewer->getPreview($object);
}
break;
}
return true;
}

17
op/op.Preview.php
View File

@ -64,7 +64,9 @@ if(isset($_GET['version'])) {
$controller->setParam('version', $version);
$controller->setParam('type', 'version');
if(!$controller->run()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
header('Content-Type: image/svg+xml');
readfile('../views/'.$theme.'/images/empty.svg');
exit;
}
exit;
} elseif(isset($_GET['file'])) {
@ -72,10 +74,21 @@ if(isset($_GET['version'])) {
if (!is_numeric($file) || intval($file)<1)
exit;
$object = $document->getDocumentFile($file);
$controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null);
$controller->setParam('document', $document);
$controller->setParam('object', $object);
$controller->setParam('type', 'file');
if(!$controller->run()) {
header('Content-Type: image/svg+xml');
readfile('../views/'.$theme.'/images/empty.svg');
exit;
}
exit;
} else {
exit;
}
/* From here on old code which isn't used anymore
if (!is_object($object)) {
exit;
}
@ -98,5 +111,5 @@ if(!$previewer->hasPreview($object)) {
}
header('Content-Type: image/png');
$previewer->getPreview($object);
*/
?>

7
op/op.ViewOnline.php
View File

@ -50,7 +50,7 @@ if ($document->getAccessMode($user) < M_READ) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
}
if(isset($_GET["version"])) {
if(isset($_GET["version"])) { /* {{{ */
$version = $_GET["version"];
if (!is_numeric($version)) {
@ -63,7 +63,8 @@ if(isset($_GET["version"])) {
if(!$controller->run()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
}
} elseif(isset($_GET["file"])) {
} /* }}} */
elseif(isset($_GET["file"])) { /* {{{ */
$fileid = $_GET["file"];
if (!is_numeric($fileid) || intval($fileid)<1) {
@ -87,7 +88,7 @@ if(isset($_GET["version"])) {
ob_clean();
readfile($dms->contentDir . $file->getPath());
}
} /* }}} */
add_log_line();
exit;

2
views/bootstrap/class.Bootstrap.php
View File

@ -381,7 +381,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <span class=\"fa fa-bars\"></span>\n";
echo " </a>\n";
echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
if(isset($this->params['user']) && $this->params['user']) {
if(isset($this->params['session']) && isset($this->params['user']) && $this->params['user']) {
echo " <div class=\"nav-collapse nav-col1\">\n";
echo " <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
echo " <li class=\"dropdown\">\n";