Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

SeedDMS_Preview/Preview/PdfPreviewer.php

@@ -152,10 +152,11 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 	 * @param string $dir directory relative to $this->previewDir
 	 * @return boolean true if preview exists, otherwise false
 	 */
-	public function hasRawPreview($infile, $dir) { /* {{{ */
+	public function hasRawPreview($infile, $dir, $target='') { /* {{{ */
 		if(!$this->previewDir)
 			return false;
-		$target = $this->previewDir.$dir.md5($infile);
+		if(!$target)
+			$target = $this->previewDir.$dir.md5($infile);
 		if($target !== false && file_exists($target.'.pdf') && filectime($target.'.pdf') >= filectime($infile)) {
 			return true;
 		}
@@ -193,11 +194,12 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 	 * @param string $dir directory relative to $this->previewDir
 	 * @return boolean/string image content if preview exists, otherwise false
 	 */
-	public function getRawPreview($infile, $dir) { /* {{{ */
+	public function getRawPreview($infile, $dir, $target='') { /* {{{ */
 		if(!$this->previewDir)
 			return false;
 
-		$target = $this->previewDir.$dir.md5($infile);
+		if(!$target)
+			$target = $this->previewDir.$dir.md5($infile);
 		if($target && file_exists($target.'.pdf')) {
 			$this->sendFile($target.'.pdf');
 		}

SeedDMS_Preview/package.xml

@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-02-17</date>
+ <date>2020-03-21</date>
  <time>09:49:39</time>
  <version>
-  <release>1.3.0</release>
+  <release>1.3.1</release>
-  <api>1.3.0</api>
+  <api>1.3.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add new methode getPreviewFile()
+add parameter $target to SeedDMS_Preview_pdfPreviewer::hasRawPreview() and SeedDMS_Preview_pdfPreviewer::getRawPreview()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -420,5 +420,21 @@ new parameter for enabling/disabling xsendfile
 fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent
    </notes>
   </release>
+  <release>
+   <date>2020-02-17</date>
+   <time>09:49:39</time>
+   <version>
+    <release>1.3.0</release>
+    <api>1.3.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add new methode getPreviewFile()
+   </notes>
+  </release>
  </changelog>
 </package>

controllers/class.PdfPreview.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Implementation of PdfPreview controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for previewing a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_PdfPreview extends SeedDMS_Controller_Common {
+
+	public function run() {
+		global $theme;
+		$dms = $this->params['dms'];
+		$type = $this->params['type'];
+		$settings = $this->params['settings'];
+
+		switch($type) {
+			case "version":
+				$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')) {
+					$previewer = new SeedDMS_Preview_PdfPreviewer($settings->_cacheDir, $settings->_cmdTimeout);
+					$previewer->setConverters(isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : array());
+					$previewer->setXsendfile($settings->_enableXsendfile);
+					if(!$previewer->hasPreview($content)) {
+						add_log_line("");
+						if(!$previewer->createPreview($content)) {
+							add_log_line("", PEAR_LOG_ERR);
+						}
+					}
+					if(!$previewer->hasPreview($content)) {
+						header('Content-Type: application/pdf');
+						readfile('../views/'.$theme.'/images/empty.pdf');
+						exit;
+					}
+					header('Content-Type: application/pdf');
+					$previewer->getPreview($content);
+				}
+				break;
+		}
+		return true;
+	}
+}

controllers/class.Preview.php

@@ -52,7 +52,7 @@ class SeedDMS_Controller_Preview extends SeedDMS_Controller_Common {
 				$this->params['content'] = $content;
 				if(null === $this->callHook('version')) {
 					if($width)
-						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width);
+						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout);
 					else
 						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 					$previewer->setConverters($settings->_converters['preview']);

op/op.PdfPreview.php

@@ -27,12 +27,11 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
-/**
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
- * Include class to preview documents
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
- */
-require_once("SeedDMS/Preview.php");
 
 $documentid = $_GET["documentid"];
 if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
@@ -52,10 +51,13 @@ if(isset($_GET['version'])) {
 	$version = $_GET["version"];
 	if (!is_numeric($version))
 		exit;
-	if(intval($version)<1)
+	$controller->setParam('document', $document);
-		$object = $document->getLatestContent();
+	$controller->setParam('version', $version);
-	else
+	$controller->setParam('type', 'version');
-		$object = $document->getContentByVersion($version);
+	if(!$controller->run()) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+	}
+	exit;
 } elseif(isset($_GET['file'])) {
 	$file = $_GET['file'];
 	if (!is_numeric($file) || intval($file)<1)