Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

CHANGELOG

@@ -62,6 +62,10 @@
 - use bootstrap classes for some forms
 - show transitions in WorkflowActionMgr and WorkflowStateMgr where actions and
   states are used
+- remove file from dropfolder when updating a document and requested by
+  configuration
+- another check if dropfolder is accessible when opening the dialog box
+- add preview of pdf documents and convertion to pdf
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.30

SeedDMS_Preview/Preview.php

@@ -16,9 +16,19 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+/**
+ * @uses Preview/Base.php
+ */
+require_once('Preview/Base.php');
+
 /**
  * @uses Preview/Previewer.php
  */
 require_once('Preview/Previewer.php');
 
+/**
+ * @uses Preview/PdfPreviewer.php
+ */
+require_once('Preview/PdfPreviewer.php');
+
 ?>

SeedDMS_Preview/Preview/Base.php

@@ -0,0 +1,120 @@
+<?php
+/**
+ * Implementation of preview base
+ *
+ * @category   DMS
+ * @package    SeedDMS_Preview
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing creation of preview images for documents.
+ *
+ * @category   DMS
+ * @package    SeedDMS_Preview
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Preview_Base {
+	/**
+	 * @var string $cacheDir location in the file system where all the
+	 *      cached data like thumbnails are located. This should be an
+	 *      absolute path.
+	 * @access public
+	 */
+	public $previewDir;
+
+	/**
+	 * @var array $converters list of mimetypes and commands for converting
+	 * file into preview image
+	 * @access protected
+	 */
+	protected $converters;
+
+	/**
+	 * @var integer $timeout maximum time for execution of external commands
+	 * @access protected
+	 */
+	protected $timeout;
+
+	function __construct($previewDir, $timeout=5) { /* {{{ */
+		if(!is_dir($previewDir)) {
+			if (!SeedDMS_Core_File::makeDir($previewDir)) {
+				$this->previewDir = '';
+			} else {
+				$this->previewDir = $previewDir;
+			}
+		} else {
+			$this->previewDir = $previewDir;
+		}
+		$this->timeout = intval($timeout);
+	} /* }}} */
+
+	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
+		$descriptorspec = array(
+			0 => array("pipe", "r"),
+			1 => array("pipe", "w"),
+			2 => array("pipe", "w")
+		);
+		$pipes = array();
+	 
+		$timeout += time();
+		$process = proc_open($cmd, $descriptorspec, $pipes);
+		if (!is_resource($process)) {
+			throw new Exception("proc_open failed on: " . $cmd);
+		}
+			 
+		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
+		do {
+			stream_select($read, $write, $exeptions, $timeleft, 200000);
+					 
+			if (!empty($read)) {
+				$output .= fread($pipes[1], 8192);
+													}
+			$timeleft = $timeout - time();
+		} while (!feof($pipes[1]) && $timeleft > 0);
+ 
+		if ($timeleft <= 0) {
+			proc_terminate($process);
+			throw new Exception("command timeout on: " . $cmd);
+		} else {
+			return $output;
+		}
+	} /* }}} */
+
+	/**
+	 * Set a list of converters
+	 *
+	 * Merges the list of passed converters with the already existing ones.
+	 * Existing converters will be overwritten.
+	 *
+	 * @param array list of converters. The key of the array contains the mimetype
+	 * and the value is the command to be called for creating the preview
+	 */
+	function setConverters($arr) { /* {{{ */
+		$this->converters = array_merge($arr, $this->converters);
+	} /* }}} */
+
+	/**
+	 * Check if converter for a given mimetype is set
+	 *
+	 * @param string $mimetype 
+	 * @return boolean true if converter exists, otherwise false
+	 */
+	function hasConverter($mimetype) { /* {{{ */
+		return array_key_exists($mimetype, $this->converters);
+	} /* }}} */
+
+}
+

SeedDMS_Preview/Preview/PdfPreviewer.php

@@ -0,0 +1,276 @@
+<?php
+/**
+ * Implementation of pdf preview documents
+ *
+ * @category   DMS
+ * @package    SeedDMS_Preview
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing creation of pdf preview for documents.
+ *
+ * @category   DMS
+ * @package    SeedDMS_Preview
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
+
+	function __construct($previewDir, $timeout=5) { /* {{{ */
+		parent::__construct($previewDir, $timeout);
+		$this->converters = array(
+			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'application/vnd.oasis.opendocument.text' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'text/rtf' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'application/msword' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+		);
+	} /* }}} */
+
+	/**
+	 * Return the physical filename of the preview image on disk
+	 *
+	 * @param object $object document content or document file
+	 * @return string file name of preview image
+	 */
+	protected function getFileName($object) { /* {{{ */
+		if(!$object)
+			return false;
+
+		$document = $object->getDocument();
+		$dir = $this->previewDir.'/'.$document->getDir();
+		switch(get_class($object)) {
+			case "SeedDMS_Core_DocumentContent":
+				$target = $dir.'p'.$object->getVersion();
+				break;
+			case "SeedDMS_Core_DocumentFile":
+				$target = $dir.'f'.$object->getID();
+				break;
+			default:
+				return false;
+		}
+		return $target;
+	} /* }}} */
+
+	/**
+	 * Create a pdf preview for a given file
+	 *
+	 * This method creates a preview in pdf format for a regular file
+	 * in the file system and stores the result in the directory $dir relative
+	 * to the configured preview directory. The filename of the resulting preview
+	 * image is either $target.pdf (if set) or md5($infile).pdf.
+	 * The $mimetype is used to select the propper conversion programm.
+	 * An already existing pdf preview is replaced.
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @param string $mimetype MimeType of input file
+	 * @param string $target optional name of preview image (without extension)
+	 * @return boolean true on success, false on failure
+	 */
+	public function createRawPreview($infile, $dir, $mimetype, $target='') { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+		if(!is_dir($this->previewDir.'/'.$dir)) {
+			if (!SeedDMS_Core_File::makeDir($this->previewDir.'/'.$dir)) {
+				return false;
+			}
+		}
+		if(!file_exists($infile))
+			return false;
+		if(!$target)
+			$target = $this->previewDir.$dir.md5($infile);
+		if($target != '' && (!file_exists($target.'.pdf') || filectime($target.'.pdf') < filectime($infile))) {
+			$cmd = '';
+			if(isset($this->converters[$mimetype])) {
+				$cmd = str_replace(array('%f', '%o'), array($infile, $target.'.pdf'), $this->converters[$mimetype]);
+			}
+			if($cmd) {
+				try {
+					self::execWithTimeout($cmd, $this->timeout);
+				} catch(Exception $e) {
+				}
+			}
+			return true;
+		}
+		return true;
+			
+	} /* }}} */
+
+	/**
+	 * Create preview image
+	 *
+	 * This function creates a preview image for the given document
+	 * content or document file. It internally uses
+	 * {@link SeedDMS_Preview::createRawPreview()}. The filename of the
+	 * preview image is created by {@link SeedDMS_Preview_Previewer::getFileName()}
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean true on success, false on failure
+	 */
+	public function createPreview($object) { /* {{{ */
+		if(!$object)
+			return false;
+
+		$document = $object->getDocument();
+		$file = $document->_dms->contentDir.$object->getPath();
+		$target = $this->getFileName($object);
+		return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $target);
+	} /* }}} */
+
+	/**
+	 * Check if a preview image already exists.
+	 *
+	 * This function is a companion to {@link SeedDMS_Preview_Previewer::createRawPreview()}.
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @return boolean true if preview exists, otherwise false
+	 */
+	public function hasRawPreview($infile, $dir) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+		$target = $this->previewDir.$dir.md5($infile);
+		if($target !== false && file_exists($target.'.pdf') && filectime($target.'.pdf') >= filectime($infile)) {
+			return true;
+		}
+		return false;
+	} /* }}} */
+
+	/**
+	 * Check if a preview image already exists.
+	 *
+	 * This function is a companion to {@link SeedDMS_Preview_Previewer::createPreview()}.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean true if preview exists, otherwise false
+	 */
+	public function hasPreview($object) { /* {{{ */
+		if(!$object)
+			return false;
+
+		if(!$this->previewDir)
+			return false;
+		$target = $this->getFileName($object);
+		if($target !== false && file_exists($target.'.pdf') && filectime($target.'.pdf') >= $object->getDate()) {
+			return true;
+		}
+		return false;
+	} /* }}} */
+
+	/**
+	 * Return a preview image.
+	 *
+	 * This function returns the content of a preview image if it exists..
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
+	public function getRawPreview($infile, $dir) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$target = $this->previewDir.$dir.md5($infile);
+		if($target && file_exists($target.'.pdf')) {
+			readfile($target.'.pdf');
+		}
+	} /* }}} */
+
+	/**
+	 * Return a preview image.
+	 *
+	 * This function returns the content of a preview image if it exists..
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
+	public function getPreview($object) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$target = $this->getFileName($object);
+		if($target && file_exists($target.'.pdf')) {
+			readfile($target.'.pdf');
+		}
+	} /* }}} */
+
+	/**
+	 * Return file size preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean/integer size of preview image or false if image
+	 * does not exist
+	 */
+	public function getFilesize($object) { /* {{{ */
+		$target = $this->getFileName($object);
+		if($target && file_exists($target.'.pdf')) {
+			return(filesize($target.'.pdf'));
+		} else {
+			return false;
+		}
+
+	} /* }}} */
+
+	/**
+	 * Delete preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deletePreview($object) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$target = $this->getFileName($object);
+		if($target && file_exists($target.'.pdf')) {
+			return(unlink($target.'.pdf'));
+		} else {
+			return false;
+		}
+	} /* }}} */
+
+	static function recurseRmdir($dir) {
+		$files = array_diff(scandir($dir), array('.','..'));
+		foreach ($files as $file) {
+			(is_dir("$dir/$file")) ? SeedDMS_Preview_Previewer::recurseRmdir("$dir/$file") : unlink("$dir/$file");
+		}
+		return rmdir($dir);
+	}
+
+	/**
+	 * Delete all preview images belonging to a document
+	 *
+	 * This function removes the preview images of all versions and
+	 * files of a document including the directory. It actually just
+	 * removes the directory for the document in the cache.
+	 *
+	 * @param object $document instance of SeedDMS_Core_Document
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deleteDocumentPreviews($document) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$dir = $this->previewDir.'/'.$document->getDir();
+		if(file_exists($dir) && is_dir($dir)) {
+			return SeedDMS_Preview_Previewer::recurseRmdir($dir);
+		} else {
+			return false;
+		}
+
+	} /* }}} */
+}
+?>

SeedDMS_Preview/Preview/Previewer.php

@@ -22,75 +22,27 @@
  * @copyright  Copyright (C) 2011, Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_Preview_Previewer {
+class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
-	/**
-	 * @var string $cacheDir location in the file system where all the
-	 *      cached data like thumbnails are located. This should be an
-	 *      absolute path.
-	 * @access public
-	 */
-	public $previewDir;
-
 	/**
 	 * @var integer $width maximum width/height of resized image
 	 * @access protected
 	 */
 	protected $width;
 
-	/**
+	function __construct($previewDir, $width=40, $timeout=5) { /* {{{ */
-	 * @var integer $timeout maximum time for execution of external commands
+		parent::__construct($previewDir, $timeout);
-	 * @access protected
+		$this->converters = array(
-	 */
+			'image/png' => "convert -resize %wx '%f' '%o'",
-	protected $timeout;
+			'image/gif' => "convert -resize %wx '%f' '%o'",
-
+			'image/jpg' => "convert -resize %wx '%f' '%o'",
-	function __construct($previewDir, $width=40, $timeout=5) {
+			'image/jpeg' => "convert -resize %wx '%f' '%o'",
-		if(!is_dir($previewDir)) {
+			'image/svg+xml' => "convert -resize %wx '%f' '%o'",
-			if (!SeedDMS_Core_File::makeDir($previewDir)) {
+			'text/plain' => "convert -resize %wx '%f' '%o'",
-				$this->previewDir = '';
+			'application/pdf' => "convert -density 100 -resize %wx '%f[0]' '%o'",
-			} else {
+			'application/postscript' => "convert -density 100 -resize %wx '%f[0]' '%o'",
-				$this->previewDir = $previewDir;
+			'application/x-compressed-tar' => "tar tzvf '%f' | convert -density 100 -resize %wx text:-[0] '%o",
-			}
-		} else {
-			$this->previewDir = $previewDir;
-		}
-		$this->width = intval($width);
-		$this->timeout = intval($timeout);
-	}
-
-	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
-		$descriptorspec = array(
-			0 => array("pipe", "r"),
-			1 => array("pipe", "w"),
-			2 => array("pipe", "w")
 		);
-		$pipes = array();
+		$this->width = intval($width);
-	 
-	  $timeout += time();
-		$process = proc_open($cmd, $descriptorspec, $pipes);
-		if (!is_resource($process)) {
-			throw new Exception("proc_open failed on: " . $cmd);
-		}
-			 
-		$output = '';
-		$timeleft = $timeout - time();
-		$read = array($pipes[1]);
-		$write = NULL;
-		$exeptions = NULL;
-		do {
-			stream_select($read, $write, $exeptions, $timeleft, 200000);
-					 
-			if (!empty($read)) {
-				$output .= fread($pipes[1], 8192);
-													}
-			$timeleft = $timeout - time();
-		} while (!feof($pipes[1]) && $timeleft > 0);
- 
-		if ($timeleft <= 0) {
-			proc_terminate($process);
-			throw new Exception("command timeout on: " . $cmd);
-		} else {
-			return $output;
-		}
 	} /* }}} */
 
 	/**
@@ -154,6 +106,10 @@ class SeedDMS_Preview_Previewer {
 			$target = $this->previewDir.$dir.md5($infile).'-'.$width;
 		if($target != '' && (!file_exists($target.'.png') || filectime($target.'.png') < filectime($infile))) {
 			$cmd = '';
+			if(isset($this->converters[$mimetype])) {
+				$cmd = str_replace(array('%w', '%f', '%o'), array($width, $infile, $target.'.png'), $this->converters[$mimetype]);
+			}
+			/*
 			switch($mimetype) {
 				case "image/png":
 				case "image/gif":
@@ -173,6 +129,7 @@ class SeedDMS_Preview_Previewer {
 					$cmd = 'tar tzvf '.$infile.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target.'.png';
 					break;
 			}
+			 */
 			if($cmd) {
 				//exec($cmd);
 				try {
@@ -211,7 +168,6 @@ class SeedDMS_Preview_Previewer {
 		$file = $document->_dms->contentDir.$object->getPath();
 		$target = $this->getFileName($object, $width);
 		return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $width, $target);
-			
 	} /* }}} */
 
 	/**

SeedDMS_Preview/package.xml

@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-26</date>
+ <date>2016-11-07</date>
  <time>15:17:11</time>
  <version>
-  <release>1.1.9</release>
+  <release>1.2.0</release>
-  <api>1.1.9</api>
+  <api>1.2.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,11 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add more documentation
+add new previewer which converts document to pdf instead of png
-finish deletePreview()
-add new method deleteDocumentPreviews()
-fix calculation of timeout (Bug #269)
-check if cache dir exists before deleting it in deleteDocumentPreviews()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -216,5 +212,25 @@ set last parameter of stream_select() to 200000 micro sec. in case the timeout i
 pass variables to stream_select (required by php7)
    </notes>
   </release>
+  <release>
+   <date>2016-04-26</date>
+   <time>15:17:11</time>
+   <version>
+    <release>1.1.9</release>
+    <api>1.1.9</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add more documentation
+finish deletePreview()
+add new method deleteDocumentPreviews()
+fix calculation of timeout (Bug #269)
+check if cache dir exists before deleting it in deleteDocumentPreviews()
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.ClassSettings.php

@@ -203,6 +203,10 @@ class Settings { /* {{{ */
 	var $_previewWidthList = 40;
 	// Preview image width on document details page
 	var $_previewWidthDetail = 100;
+	// show full preview on document details page
+	var $_showFullPreview = false;
+	// convert to pdf for preview on document details page
+	var $_convertToPdf = false;
 	// Show form to submit missing translations at end of page
 	var $_showMissingTranslations = false;
 	// Extra Path to additional software, will be added to include path
@@ -384,6 +388,8 @@ class Settings { /* {{{ */
 			$this->_previewWidthList = intval($tab["previewWidthList"]);
 		if(isset($tab["previewWidthDetail"]))
 			$this->_previewWidthDetail = intval($tab["previewWidthDetail"]);
+		$this->_showFullPreview = Settings::boolVal($tab["showFullPreview"]);
+		$this->_convertToPdf = Settings::boolVal($tab["convertToPdf"]);
 
 		// XML Path: /configuration/site/edition
 		$node = $xml->xpath('/configuration/site/edition');
@@ -684,6 +690,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "theme", $this->_theme);
     $this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList);
     $this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail);
+    $this->setXMLAttributValue($node, "showFullPreview", $this->_showFullPreview);
+    $this->setXMLAttributValue($node, "convertToPdf", $this->_convertToPdf);
 
     // XML Path: /configuration/site/edition
     $node = $this->getXMLNode($xml, '/configuration/site', 'edition');

languages/ar_EG/lang.inc

@@ -1003,6 +1003,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
 'settings_contentOffsetDir_desc' => '',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => '',
@@ -1205,6 +1207,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1358,6 +1362,7 @@ URL: [url]',
 'sunday_abbr' => 'ح',
 'sv_SE' => 'السويدية',
 'switched_to' => 'تحويل الى',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/bg_BG/lang.inc

@@ -868,6 +868,8 @@ $text = array(
 'settings_contentDir_desc' => 'Къде да съхранява качените файлове (най-добре изберете папка, недостъпна за уеб-сървъра)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
 'settings_contentOffsetDir_desc' => 'За избягване проблеми с файловата система беше въведена нова структура на папките в каталоге с данните. Необходима е базова папка, откъдето да почнем. Впрочем, оставете тука всичко както си е, 1048576, но може да бъде всякакво числом или стринг, не съществуващ вече в папката с данните',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Cookie Life time',
 'settings_cookieLifetime_desc' => 'Животът на бисквитките в секунди. Ако е =0 бисквитката ще бъде изтрита при затваряне на браузъра.',
 'settings_coreDir' => 'Папка Core letoDMS',
@@ -1070,6 +1072,8 @@ $text = array(
 'settings_rootFolderID_desc' => 'ID на всяка корнева папка (може да не се променя)',
 'settings_SaveError' => 'Грешка при съхранение на конфигурацията',
 'settings_Server' => 'Настройки на сървъра',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1223,6 +1227,7 @@ $text = array(
 'sunday_abbr' => '',
 'sv_SE' => '',
 'switched_to' => '',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/ca_ES/lang.inc

@@ -873,6 +873,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
 'settings_contentOffsetDir_desc' => '',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'Core letoDMS directory',
@@ -1075,6 +1077,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1228,6 +1232,7 @@ URL: [url]',
 'sunday_abbr' => '',
 'sv_SE' => 'Suec',
 'switched_to' => '',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/cs_CZ/lang.inc

@@ -1012,6 +1012,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Místo, kde jsou nahrané soubory uloženy (nejlepší zvolit adresář, který není přístupný přes váš web-server)',
 'settings_contentOffsetDir' => '',
 'settings_contentOffsetDir_desc' => '',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Životnost "cookie"',
 'settings_cookieLifetime_desc' => 'Životnost "cookie" v sekundách. Pokud je nula, bude "cookie" odstraněno po zavření prohlížeče.',
 'settings_coreDir' => 'Core SeedDMS directory',
@@ -1214,6 +1216,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID of root-folder (mostly no need to change)',
 'settings_SaveError' => 'Configuration file save error',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Zobrazit chybějící překlady',
 'settings_showMissingTranslations_desc' => 'Vypsat všechny chybějící překlady na stránce v dolní části. Přihlášený uživatel bude moci předložit návrh na chybějící překlad, který bude uložen v souboru CSV. Nezapínejte tuto funkci v produkčním prostředí!',
 'settings_showSingleSearchHit' => '',
@@ -1367,6 +1371,7 @@ URL: [url]',
 'sunday_abbr' => 'Ne',
 'sv_SE' => 'Švédština',
 'switched_to' => 'Přepnuto na',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/de_DE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2326), dgrutsch (21)
+//    Translators: Admin (2331), dgrutsch (21)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1055,6 +1055,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Verzeichnis, in dem die Dokumente gespeichert werden. Sie sollten ein Verzeichnis wählen, das nicht durch den Web-Server erreichbar ist.',
 'settings_contentOffsetDir' => 'Content Offset Directory',
 'settings_contentOffsetDir_desc' => 'Die Dokumente werden nicht direkt im Content-Verzeichnis, sondern in einem Unterverzeichnis angelegt. Der Name dieses Verzeichnis ist beliebig, wird aber historisch bedingt oft auf \'1048576\' gesetzt.',
+'settings_convertToPdf' => 'Konvertiere Dokument für die Vorschau nach PDF',
+'settings_convertToPdf_desc' => 'Wenn das Dokumentenformat vom Browser nicht unterstützt wird, wird die PDF konvertierte Version angezeigt.',
 'settings_cookieLifetime' => 'Lebensdauer des Cookies',
 'settings_cookieLifetime_desc' => 'Die Lebensdauer des Cookies für die Sitzungsverwaltung. Wenn dieser Wert auf 0 gesetzt wird, dann wird der Cookie beim Schließen des Browsers gelöscht.',
 'settings_coreDir' => 'Core SeedDMS Verzeichnis',
@@ -1257,6 +1259,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'Id des Wurzelordners in SeedDMS (kann in der Regel unverändert bleiben)',
 'settings_SaveError' => 'Fehler beim Speichern der Konfiguration',
 'settings_Server' => 'Server-Einstellungen',
+'settings_showFullPreview' => 'Zeige gesamtes Dokument',
+'settings_showFullPreview_desc' => 'Anwählen, um auf der Dokumenten-Detail-Seite eine vollständige Vorschau des Dokuments anzuzeigen, sofern dies im Browser möglich ist.',
 'settings_showMissingTranslations' => 'Zeige fehlende Übersetzungen',
 'settings_showMissingTranslations_desc' => 'Listet die fehlenden Übersetzungen der Seite unterhalb der Fußzeile und erlaubt dem Benutzer Vorschläge einzureichen. Diese Vorschläge werden in einer CSV-Datei gespeichert. Diese Funktion sollte nicht in Produktionssystemen eingeschaltet sein.',
 'settings_showSingleSearchHit' => 'Springe direkt zu einem einzelnen Suchtreffer',
@@ -1410,6 +1414,7 @@ URL: [url]',
 'sunday_abbr' => 'So',
 'sv_SE' => 'Schwedisch',
 'switched_to' => 'Gewechselt zu',
+'takeOverAttributeValue' => 'Attributwert von vorheriger Version übernehmen',
 'takeOverGrpApprover' => 'Übernehme Gruppe von Freigebenden von letzter Version.',
 'takeOverGrpReviewer' => 'Übernehme Gruppe von Prüfern von letzter Version.',
 'takeOverIndApprover' => 'Übernehme Einzelfreigebende von letzter Version.',

languages/el_GR/lang.inc

@@ -879,6 +879,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
 'settings_contentOffsetDir_desc' => '',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => '',
@@ -1081,6 +1083,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1234,6 +1238,7 @@ URL: [url]',
 'sunday_abbr' => 'Κυ',
 'sv_SE' => '',
 'switched_to' => '',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/en_GB/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1460), dgrutsch (7), netixw (14)
+//    Translators: Admin (1465), dgrutsch (7), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1050,6 +1050,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Where the uploaded files are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
 'settings_contentOffsetDir_desc' => 'To work around limitations in the underlying file system, a new directory structure has been devised that exists within the content directory (Content Directory). This requires a base directory from which to begin. Usually leave this to the default setting, 1048576, but can be any number or string that does not already exist within (Content Directory)',
+'settings_convertToPdf' => 'Convert document to PDF for preview',
+'settings_convertToPdf_desc' => 'If a document cannot be natively displayed by the browser, a converted version to pdf will be shown.',
 'settings_cookieLifetime' => 'Cookie Life time',
 'settings_cookieLifetime_desc' => 'The life time of a cookie in seconds. If set to 0 the cookie will be removed when the browser is closed.',
 'settings_coreDir' => 'Core SeedDMS directory',
@@ -1252,6 +1254,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID of root-folder (mostly no need to change)',
 'settings_SaveError' => 'Configuration file save error',
 'settings_Server' => 'Server settings',
+'settings_showFullPreview' => 'Show complete document',
+'settings_showFullPreview_desc' => 'Enable/disable a full preview of the document on the details page, if the browser is capable to do so.',
 'settings_showMissingTranslations' => 'Show missing translations',
 'settings_showMissingTranslations_desc' => 'List all missing translations on the page at the bottom of the page. The logged in user will be able to submit a proposal for a missing translation which will be saved in a csv file. Do not turn this function on if in a production environment!',
 'settings_showSingleSearchHit' => 'Jump right to a single search hit',
@@ -1405,6 +1409,7 @@ URL: [url]',
 'sunday_abbr' => 'Su',
 'sv_SE' => 'Swedish',
 'switched_to' => 'Switched to',
+'takeOverAttributeValue' => 'Take over attribute value from last version',
 'takeOverGrpApprover' => 'Take over group of approvers from last version.',
 'takeOverGrpReviewer' => 'Take over group of reviewers from last version.',
 'takeOverIndApprover' => 'Take over individual approver from last version.',

languages/es_ES/lang.inc

@@ -1018,6 +1018,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Donde se almacenan los archivos subidos (es preferible seleccionar una carpeta que no sea accesible a través del servidor web)',
 'settings_contentOffsetDir' => 'Carpeta de contenidos de desplazamiento',
 'settings_contentOffsetDir_desc' => 'Para tratar las limitaciones del sistema de ficheros subyacentes, se ha ideado una estructura de carpetas dentro de la carpeta de contenido. Esto requiere una carpeta base desde la que comenzar. Normalmente puede dejar este valor por defecto, 1048576, pero puede ser cualquier número o cadena que no exista ya dentro de ella (carpeta de contenido).',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Tiempo de vida de las cookies',
 'settings_cookieLifetime_desc' => 'Tiempo de vida de las cookies en segundos. Si asigna 0 la cookie será eliminada cuando el navegador se cierre.',
 'settings_coreDir' => 'Carpeta de SeedDMS Core',
@@ -1220,6 +1222,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID de la carpeta raíz (normalmente no es necesario cambiar)',
 'settings_SaveError' => 'Error guardando archivo de configuración',
 'settings_Server' => 'Configuración del servidor',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Mostrar traducciones faltantes',
 'settings_showMissingTranslations_desc' => 'Listar todos los términos pendientes de traducción de esta página al final de la misma. En entorno productivo no activar esta función',
 'settings_showSingleSearchHit' => '',
@@ -1373,6 +1377,7 @@ URL: [url]',
 'sunday_abbr' => 'D',
 'sv_SE' => 'Sueco',
 'switched_to' => 'Cambiar a',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/fr_FR/lang.inc

@@ -1000,6 +1000,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Endroit ou les fichiers téléchargés sont stockés (il est préférable de choisir un répertoire qui n\'est pas accessible par votre serveur web)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
 'settings_contentOffsetDir_desc' => 'To work around limitations in the underlying file system, a new directory structure has been devised that exists within the content directory (Content Directory). This requires a base directory from which to begin. Usually leave this to the default setting, 1048576, but can be any number or string that does not already exist within (Content Directory)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Durée de vie des Cookies',
 'settings_cookieLifetime_desc' => 'La durée de vie d\'un cooke en secondes. Si réglée à 0, le cookie sera supprimé à la fermeture du navigateur.',
 'settings_coreDir' => 'Répertoire Core SeedDMS',
@@ -1202,6 +1204,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID du répertoire racine (la plupart du temps pas besoin de changer)',
 'settings_SaveError' => 'Erreur de sauvegarde du fichier de configuration',
 'settings_Server' => 'Paramètres serveur',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Afficher les traductions manquantes',
 'settings_showMissingTranslations_desc' => 'Lister toutes les traductions manquantes de la page dans le bas de la page. L\'utilisateur connecté pourra proposer une traduction manquante qui sera sauvegardée dans un fichier CSV. Ne pas activer cette fonction en production.',
 'settings_showSingleSearchHit' => '',
@@ -1355,6 +1359,7 @@ URL: [url]',
 'sunday_abbr' => 'Dim.',
 'sv_SE' => 'Suédois',
 'switched_to' => 'Connexion provisoire sous',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Récupérer le groupe d\'approbateurs de la dernière version.',
 'takeOverGrpReviewer' => 'Récupérer le groupe d\'examinateurs de la dernière version.',
 'takeOverIndApprover' => 'Récupérer les approbateurs de la dernière version.',

languages/hr_HR/lang.inc

@@ -1039,6 +1039,8 @@ Internet poveznica: [url]',
 'settings_contentDir_desc' => 'Gdje se spremaju učitane datoteke (najbolje da odaberete mapu koja nije dostupna kroz vaš web-server)',
 'settings_contentOffsetDir' => 'Offset mapa sadržaja',
 'settings_contentOffsetDir_desc' => 'Za zaobilaželje ograničenja unutar datotečnog sustava, nova struktura mapa je  a new directory structure je zasnovana i nalazi se unutar mape sadržaja. Ovo zahtjeva baznu mapu od koje se kreće. Uobičajeno da se ostavlja zadana postavka, 1048576, ali može biti bilo koji niz koji se već ne nalazi unutar mape sadržaja',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Životni vijek kolačića',
 'settings_cookieLifetime_desc' => 'Životni vijek kolačića u sekundama. Ako je postavljeno na 0, kolačić će biti uklonjen kada se zatvori pretraživač.',
 'settings_coreDir' => 'Mapa jezgre Core ProsperaDMS-a',
@@ -1241,6 +1243,8 @@ Internet poveznica: [url]',
 'settings_rootFolderID_desc' => 'ID root mape (većinom ne treba mijenjati)',
 'settings_SaveError' => 'Greška pri spremanju datoteke konfiguracije',
 'settings_Server' => 'Postavke servera',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Prikaži prijevode koji nedostaju',
 'settings_showMissingTranslations_desc' => 'Navedi sve prijevode koji nedostaju na stranici na dnu stranice. Prijavljeni korisnik će moći podnijeti prijedlog za prijevode koji nedostaju koji će biti pohranjen u csv datoteku. Ne uključujte ovu funkciju ako ste u proizvodnoj okolini!',
 'settings_showSingleSearchHit' => '',
@@ -1394,6 +1398,7 @@ Internet poveznica: [url]',
 'sunday_abbr' => 'Ne',
 'sv_SE' => 'Švedski',
 'switched_to' => 'Promjenjeno u',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Preuzimanje grupe odobravatelja iz zadnje verzije.',
 'takeOverGrpReviewer' => 'Preuzimanje grupe revizora iz zadnje verzije.',
 'takeOverIndApprover' => 'Preuzimanje pojedinačnog odobravatelja iz zadnje verzije.',

languages/hu_HU/lang.inc

@@ -1017,6 +1017,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Feltöltött állományok tárolási helye (olyan könyvtárat érdemes választani, amelyhez nem lehet a webszerveren keresztül hozzáférni)',
 'settings_contentOffsetDir' => 'Tartalom eltérési könyvtár',
 'settings_contentOffsetDir_desc' => 'Az alapul szolgáló fájlrendszer korlátozásainak kikerülésére új könyvtár struktúra került kialakításra amely úgy lett tervezve, hogy létezzen a tároló könyvtárban (Content Directory). Ehhez szükséges egy alap könyvtár ahonnan indul. Általában meg lehet hagyni az alapértelmezett értéket ami 1048576, de megadható bármilyen szám vagy karaktersorozat amely nem létezik a tartalom könyvtárban (Content Directory)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Süti élettartam',
 'settings_cookieLifetime_desc' => 'A süti élettartama másodpercben. Ha az értéke 0 akkor a süti a böngésző bezárásakor lesz törölve.',
 'settings_coreDir' => 'Alap SeedDMS könyvtár',
@@ -1219,6 +1221,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'Gyökér mappa azonosítója (általában nem kell módosítani)',
 'settings_SaveError' => 'Konfigurációs állomány mentési hiba',
 'settings_Server' => 'Kiszolgáló beállítások',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Jelenítse meg a hiányzó fordításokat',
 'settings_showMissingTranslations_desc' => 'Felsorolja az összes hiányzó fordítást a lap alján. A bejelentkezett felhasználó képes lesz arra, hogy javaslatot nyújtson be a hiányzó fordításokra, amelyek egy csv állományba kerülnek mentésre. Ne kapcsolja be ezt a funkciót élse környezetben!',
 'settings_showSingleSearchHit' => '',
@@ -1372,6 +1376,7 @@ URL: [url]',
 'sunday_abbr' => 'Va',
 'sv_SE' => 'Svéd',
 'switched_to' => 'Felhasználó váltás',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/it_IT/lang.inc

@@ -1051,6 +1051,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
 'settings_contentOffsetDir_desc' => 'Per supplire a limitazioni all\'utilizzo del filesystem è stata concepita una nuova struttura di cartelle all\'interno della cartella contenitore (Content Directory). Questa necessita di una cartella di partenza: di solito è sufficiente lasciare il nome di default, 1048576, ma può essere usato un qualsiasi numero o stringa che non esistano già all\'interno della cartella contenitore (Content Directory)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Tempo di vita del cookie',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
 'settings_coreDir' => 'Cartella principale dell\'applicazione',
@@ -1253,6 +1255,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID della cartella principale (non dovrebbe essere necessario modificarlo)',
 'settings_SaveError' => 'Errore di salvataggio del file di configurazione',
 'settings_Server' => 'Impostazioni Server',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Mostra traduzioni mancanti',
 'settings_showMissingTranslations_desc' => 'Elenca tutte le traduzioni mancanti alla fine della pagina. L\'utente collegato potrà sottoporre una proposta per le traduzioni mancanti che verrà salvata in un file .csv. Da non usarsi in un ambiente di produzione.',
 'settings_showSingleSearchHit' => '',
@@ -1406,6 +1410,7 @@ URL: [url]',
 'sunday_abbr' => 'Dom',
 'sv_SE' => 'Svedese',
 'switched_to' => 'Passato a',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Riprendi il gruppo degli approvatori dall\'ultima versione.',
 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.',
 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.',

languages/ko_KR/lang.inc

@@ -1032,6 +1032,8 @@ URL : [url]',
 'settings_contentDir_desc' => '업로드 된 파일의 저장 위치(웹 서버를 통해 액세스 할 수없는 디렉토리를 선택하는 것이 가장 좋습니다)',
 'settings_contentOffsetDir' => '내용 오프셋 디렉토리',
 'settings_contentOffsetDir_desc' => '기본 파일 시스템의 한계를 극복하기 위해, 새로운 디렉토리를 콘텐츠 디렉터리 내에 존재하도록 설계 되었습니다. (콘텐츠 디렉토리). 시작할시 기본 디렉토리가 필요하며 일반적으로 기본 설정을 1048576 이지만 이미 (콘텐츠 디렉토리) 내에 존재하지 않는 숫자 또는 문자열이 될 수도 있습니다 .',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '쿠키 활성 시간',
 'settings_cookieLifetime_desc' => '활성 시간을 0으로 설정하면 브라우저가 닫힐 때 마다 쿠키가 제거됩니다.',
 'settings_coreDir' => '코어 SeedDMS 디렉토리',
@@ -1234,6 +1236,8 @@ URL : [url]',
 'settings_rootFolderID_desc' => '루트 폴더 ID (대부분 변경은 필요 없음)',
 'settings_SaveError' => '구성 파일 오류를 저장',
 'settings_Server' => '서버 설정',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '누락된 번역보기',
 'settings_showMissingTranslations_desc' => '페이지 하단에 현재 페이지의 부족한 번역을 나열 합니다. 로그인 한 사용자는 부족한 번역을 제안 및 제출 할 수 있게 되며 CSV 파일로 저장됩니다. 프로덕션 환경의 경우이 기능을 이기능을 선택하지 마십시오!',
 'settings_showSingleSearchHit' => '',
@@ -1387,6 +1391,7 @@ URL : [url]',
 'sunday_abbr' => '일',
 'sv_SE' => '스웨덴어',
 'switched_to' => '전환',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '마지막 버전의 승인자의 그룹를 인수 합니다.',
 'takeOverGrpReviewer' => '최종 버전의 리뷰 그룹을 상속합니다.',
 'takeOverIndApprover' => '마지막 버전의 개별 승인자를 인수 합니다.',

languages/nl_NL/lang.inc

@@ -1045,6 +1045,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Waar de verzonden bestande opgeslagen worden (Kan het beste een map zijn die niet benaderbaar is voor de webserver.)',
 'settings_contentOffsetDir' => 'Inhouds Basis Map',
 'settings_contentOffsetDir_desc' => 'Om de beperkingen van het onderliggende bestandssysteem te omzeilen, is een nieuwe mappenstructuur bedacht dat binnen de inhoudsmap (Inhoudsmap) bestaat. Hiervoor is een map nodig als basis. Gebruikelijk is om dit de standaardwaarde te laten, 1048576, maar kan elke waarde of tekst bevatten dat nog niet bestaat binnen de (Inhoudsmap)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Cookie Life time',
 'settings_cookieLifetime_desc' => 'Hoe lang een cookie moet worden behouden. Indien ingesteld op 0 worden de cookies verwijderd bij het afsluiten van de browser.',
 'settings_coreDir' => 'Core letoDMS map',
@@ -1247,6 +1249,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID van basismap (meestal geen verandering nodig)',
 'settings_SaveError' => 'Opslagfout Configuratiebestand',
 'settings_Server' => 'Server instellingen',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Ontbrekende vertalingen weergeven',
 'settings_showMissingTranslations_desc' => 'Geef alle ontbrekende vertalingen onder aan de pagina weer. De gebruiker kan een verzoek tot vertaling indienen dat wordt opgeslagen als csv bestand. Let op! Zet deze functie niet aan in productieomgevingen!',
 'settings_showSingleSearchHit' => '',
@@ -1400,6 +1404,7 @@ URL: [url]',
 'sunday_abbr' => 'zo',
 'sv_SE' => 'Zweeds',
 'switched_to' => 'Overgeschakeld naar',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Onthoud de laatste groep goedkeurders',
 'takeOverGrpReviewer' => 'Onthoud de laatste groep herzieners',
 'takeOverIndApprover' => 'Onthoud de laatste groep individuele goedkeurders',

languages/pl_PL/lang.inc

@@ -997,6 +997,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Miejsce, gdzie będą przechowywane wczytane pliki (najlepien wybrać katalog, który nie jest dostępny dla serwera http)',
 'settings_contentOffsetDir' => 'Offset katalogu treści',
 'settings_contentOffsetDir_desc' => 'Aby obejść ograniczenia w bazowym systemie plików, zostanie w nim utworzona nowa struktura katalogów. To wymaga określenia katalogu początkowego. Zazwyczaj można zostawić domyślną wartość, 1048576, ale może też być dowolnym numerem lub słowem, które aktualnie nie istnieje w katalogu treści (Katalog treści)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Czas życia ciasteczka',
 'settings_cookieLifetime_desc' => 'Czas życia pliku cookie w sekundach. Jeśli wartość zostanie ustawione na 0, plik cookie zostanie usunięte po zamknięciu przeglądarki.',
 'settings_coreDir' => 'Katalog Core letoDMS',
@@ -1199,6 +1201,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID katalogu głównego (zazwyczaj nie trzeba tego zmieniać)',
 'settings_SaveError' => 'Błąd zapisu pliku konfiguracyjnego',
 'settings_Server' => 'Ustawienia serwera',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1352,6 +1356,7 @@ URL: [url]',
 'sunday_abbr' => 'Ni',
 'sv_SE' => 'szwedzki',
 'switched_to' => 'Przełączone na',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/pt_BR/lang.inc

@@ -1015,6 +1015,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Onde arquivos enviados são armazenados (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo',
 'settings_contentOffsetDir_desc' => 'Para contornar as limitações do sistema de arquivos subjacente, uma nova estrutura de diretórios foi concebida que existe dentro do diretório de conteúdo (Content Directory). Isso requer um diretório base para começar. Normalmente, deixe Isso para a configuração padrão, 1048576, mas pode ser qualquer número ou cadeia de caracteres que ainda não existe dentro (Diretório de conteúdo)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Tempo de Vida dos Cookies',
 'settings_cookieLifetime_desc' => 'O tempo de vida de um cookie em segundos. Se definido como 0, o cookie será removido quando o navegador é fechado.',
 'settings_coreDir' => 'Diretório Núcleo do SeedDMS',
@@ -1217,6 +1219,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID da pasta-raiz (na maioria das vezes não precisa ser mudado)',
 'settings_SaveError' => 'Erro no arquivo de configuração salvo',
 'settings_Server' => 'Configuraçoes do servidor',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Mostrar traduções em falta',
 'settings_showMissingTranslations_desc' => 'Listar todas as traduções faltando na página na parte inferior da página. O usuário conectado será capaz de apresentar uma proposta para uma tradução em falta que serão salvos em um arquivo CSV. Não ativar eáa função, se em um ambiente de produção!',
 'settings_showSingleSearchHit' => '',
@@ -1370,6 +1374,7 @@ URL: [url]',
 'sunday_abbr' => 'Su',
 'sv_SE' => 'Sueco',
 'switched_to' => 'Comutado para',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/ro_RO/lang.inc

@@ -1040,6 +1040,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
 'settings_contentOffsetDir_desc' => 'Pentru a lucra în jurul valorii de limităre în sistemul de fișiere de bază, o nouă structură director a fost concepută care există  in directorul conținut (Content Director). Acest lucru necesită un director de bază din care să se înceapă. De obicei, lăsați asta la setarea implicită, 1048576, dar se poate trece orice număr sau șir care nu este deja inclus (Content Director)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Timp de viață Cookie',
 'settings_cookieLifetime_desc' => 'Durata de viață a unui cookie în secunde. Dacă este setat la 0 cookie-ul va fi eliminat atunci când browser-ul este închis.',
 'settings_coreDir' => 'Director SeedDMS Core',
@@ -1242,6 +1244,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID-ul folder-ului rădăcină (de regulă nu este nevoie să se schimbe)',
 'settings_SaveError' => 'Eroare la salvarea fișierului de configurare',
 'settings_Server' => 'Setări server',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Arată traducerile lipsă',
 'settings_showMissingTranslations_desc' => 'Listează toate traducerile lipsă în partea de jos a paginii. Utilizatorul autentificat va putea să propună o traducere lipsă care va fi apoi salvată într-un fișier csv. Nu porniți această funcționalitate într-un mediu de producție!',
 'settings_showSingleSearchHit' => '',
@@ -1395,6 +1399,7 @@ URL: [url]',
 'sunday_abbr' => 'Du',
 'sv_SE' => 'Suedeză',
 'switched_to' => 'Comutat pe',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Preia grupul de aprobatori din ultima versiune.',
 'takeOverGrpReviewer' => 'Preia grupul de revizuitori din ultima versiune.',
 'takeOverIndApprover' => 'Preia aprobatorul individual din ultima versiune.',

languages/ru_RU/lang.inc

@@ -1047,6 +1047,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Куда сохраняются загруженные файлы (лучше выбрать каталог недоступный веб-серверу).',
 'settings_contentOffsetDir' => 'Базовый начальный каталог',
 'settings_contentOffsetDir_desc' => 'Во избежание проблем с файловой системой была введена новая структура каталогов в каталоге содержимого. Необходим базовый начальный каталог. Впрочем, оставьте тут все как есть, 1048576, но может быть любым числом или строкой, не существующей уже в каталоге содержимого.',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Время жизни куки',
 'settings_cookieLifetime_desc' => 'Время жизни куки в секундах. Если установлено 0, то куки будут удалены при закрытии браузера.',
 'settings_coreDir' => 'Каталог Core SeedDMS',
@@ -1249,6 +1251,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID каждого корневого каталога (можно не менять).',
 'settings_SaveError' => 'Ошибка при сохранении конфигурации',
 'settings_Server' => 'Настройки сервера',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Фразы которые нужно перевести',
 'settings_showMissingTranslations_desc' => 'Отображать внизу страницы фразы, которые нуждаются в переводе',
 'settings_showSingleSearchHit' => '',
@@ -1402,6 +1406,7 @@ URL: [url]',
 'sunday_abbr' => 'Вс',
 'sv_SE' => 'Swedish',
 'switched_to' => 'Переключён как',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Использовать группу утверждающих из прошлой версии',
 'takeOverGrpReviewer' => 'Использовать группу рецензентов из прошлой версии',
 'takeOverIndApprover' => 'Использовать утверждающих из прошлой версии',

languages/sk_SK/lang.inc

@@ -872,6 +872,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
 'settings_contentOffsetDir_desc' => '',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => '',
@@ -1074,6 +1076,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1227,6 +1231,7 @@ URL: [url]',
 'sunday_abbr' => '',
 'sv_SE' => 'Švédština',
 'switched_to' => '',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/sv_SE/lang.inc

@@ -1003,6 +1003,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Mappen där alla uppladdade filer kommer att sparas. (Det bästa är att välja en mapp som inte är tillgänglig från webbservern)',
 'settings_contentOffsetDir' => 'Innehåll offset-mapp',
 'settings_contentOffsetDir_desc' => 'För att undvika begränsningar i det underliggande filsystemet har en ny mappstruktur skapats inom innehållsmappen (Content Directory). Detta behöver en bas-mapp att utgå ifrån. Vanligtvis är default-inställningen 1048576 men det kan vara vilket nummer eller vilken sträng som helst som inte redan finns i mappen (Content Directory)',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Livslängd för cookies',
 'settings_cookieLifetime_desc' => 'Livslängd för en cookie i sekunder. Om värdet sätts till 0, kommer cookien att tas bort efter att webbläsaren har stängts ner.',
 'settings_coreDir' => 'LetoDMS_Core-mapp',
@@ -1205,6 +1207,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID för root-mappen (oftast behövs ingen ändring här)',
 'settings_SaveError' => 'Fel när konfigurationsfilen sparades',
 'settings_Server' => 'Server-inställningar',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Visa saknade översättningar',
 'settings_showMissingTranslations_desc' => 'Lista alla saknade översättningar längst ner på sidan. Den inloggade användaren får möjligheten att skicka in ett förslag för saknade översättningar som kommer sparas i en CSV fil. Sätt denna option inte på, på ett DMS som används i verksamheten.',
 'settings_showSingleSearchHit' => '',
@@ -1358,6 +1362,7 @@ URL: [url]',
 'sunday_abbr' => 'sö',
 'sv_SE' => 'svenska',
 'switched_to' => 'Bytt till',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/tr_TR/lang.inc

@@ -1019,6 +1019,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Yüklenecek dosyaların depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_contentOffsetDir' => 'İçerik Ofset Klasörü',
 'settings_contentOffsetDir_desc' => 'Dosya sistemindeki kısıtlamaları aşabilmek için mevcut içerik dizini içerisinde yeni bir dizin yapısı geliştirildi. Bu, başlangıç için temel bir dizin gerektirir. Genellikle bunu varsayılan değer olan 1048576 olarak bırakmanız önerilir fakat İçerik Dizininde mevcut olmayan herhangi bir sayı veya string olabilir.',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Çerez geçerlilik süresi',
 'settings_cookieLifetime_desc' => 'Çerezlerin saniye olarak geçerlilik süresi. 0 olarak ayarlanırsa tarayıcı kapatıldığında çerezler silinir.',
 'settings_coreDir' => 'Çekirdek (core) SeedDMS klasörü',
@@ -1221,6 +1223,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'Kök dizinin ID numarası(genelde değiştirilmesine gerek yok)',
 'settings_SaveError' => 'Konfigürasyon dosyası kaydedilemedi',
 'settings_Server' => 'Sunucu ayarları',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Eksik çevirileri göster',
 'settings_showMissingTranslations_desc' => 'Eksik çevirilerin tamamı sayfanın en altında listelenir. Giriş yapan kullanıclıar yapacakları çevirileri csv formatında gönderebilirler. Gerçekte kullanılan sistemlerde bunu açmamanız önerilir!',
 'settings_showSingleSearchHit' => '',
@@ -1374,6 +1378,7 @@ URL: [url]',
 'sunday_abbr' => 'Pa',
 'sv_SE' => 'İsveççe',
 'switched_to' => 'Yerine geçilen',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Bir önceki versiyon onayını yapan grubu al.',
 'takeOverGrpReviewer' => 'Bir önceki versiyon kontrolünü yapan grubu al.',
 'takeOverIndApprover' => 'Bir önceki versiyonu onaylayanı al.',

languages/uk_UA/lang.inc

@@ -1040,6 +1040,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Куди зберігаються завантажені файли (краще вибрати каталог, недоступний веб-серверові).',
 'settings_contentOffsetDir' => 'Базовий початковий каталог',
 'settings_contentOffsetDir_desc' => 'Для уникнення проблем з файловою системою було введено структуру каталогів у каталозі вмісту. Необхідний базовий початковий каталог. Втім, залиште тут все, як є, 1048576, але може бути будь-яким числом чи рядком, якого ще немає в каталозі вмісту.',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Час життя куки',
 'settings_cookieLifetime_desc' => 'Час життя куки в секундах. Якщо встановлено 0, то куки будуть видалені при закритті браузера.',
 'settings_coreDir' => 'Каталог Core SeedDMS',
@@ -1242,6 +1244,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID кожного кореневого каталогу (можна не змінювати).',
 'settings_SaveError' => 'Помилка при збереженні конфігурації',
 'settings_Server' => 'Налаштування сервера',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Фрази, як потребують перекладу',
 'settings_showMissingTranslations_desc' => 'Відображати внизу сторінки фрази, які потребують перекладу',
 'settings_showSingleSearchHit' => '',
@@ -1395,6 +1399,7 @@ URL: [url]',
 'sunday_abbr' => 'Нд',
 'sv_SE' => 'Swedish',
 'switched_to' => 'Переключено на',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => 'Використати групу затверджувачів з попередньої версії',
 'takeOverGrpReviewer' => 'Використати групу рецензентів з попередньої версії',
 'takeOverIndApprover' => 'Використати затверджувачів з попередньої версії',

languages/zh_CN/lang.inc

@@ -874,6 +874,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '内容偏移目录',
 'settings_contentOffsetDir_desc' => '要解决在底层文件系统的限制，一个新的目录结构已制定了内容目录（内容目录）中存在的。这需要从它开始一个基本目录。通常离开这个为默认设置，1048576，也可以是内（内容目录）不存在任何数字或字符串',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'SeedDMS核心目录',
@@ -1076,6 +1078,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '显示丢失的翻译',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1229,6 +1233,7 @@ URL: [url]',
 'sunday_abbr' => '',
 'sv_SE' => '瑞典语',
 'switched_to' => '登录为',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

languages/zh_TW/lang.inc

@@ -872,6 +872,8 @@ URL: [url]',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '內容偏移目錄',
 'settings_contentOffsetDir_desc' => '要解決在底層檔案系統的限制，一個新的目錄結構已制定了內容目錄（內容目錄）中存在的。這需要從它開始一個基本目錄。通常離開這個為默認設置，1048576，也可以是內（內容目錄）不存在任何數位或字串',
+'settings_convertToPdf' => '',
+'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => '',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'KME文檔系統核心目錄',
@@ -1074,6 +1076,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => '',
 'settings_SaveError' => '',
 'settings_Server' => '',
+'settings_showFullPreview' => '',
+'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
 'settings_showSingleSearchHit' => '',
@@ -1227,6 +1231,7 @@ URL: [url]',
 'sunday_abbr' => '',
 'sv_SE' => '瑞典語',
 'switched_to' => '',
+'takeOverAttributeValue' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',

op/op.Settings.php

@@ -62,6 +62,8 @@ if ($action == "saveSettings")
   $settings->_theme = $_POST["theme"];
   $settings->_previewWidthList = $_POST["previewWidthList"];
   $settings->_previewWidthDetail = $_POST["previewWidthDetail"];
+  $settings->_showFullPreview = getBoolValue("showFullPreview");
+  $settings->_convertToPdf = getBoolValue("convertToPdf");
 
   // SETTINGS - SITE - EDITION
   $settings->_strictFormCheck = getBoolValue("strictFormCheck");

op/op.UpdateDocument.php

@@ -369,6 +369,11 @@ if ($_FILES['userfile']['error'] == 0) {
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 			}
 		}
+		if($settings->_removeFromDropFolder) {
+			if(file_exists($userfiletmp)) {
+				unlink($userfiletmp);
+			}
+		}
 	}
 
 add_log_line("?documentid=".$documentid);

out/out.DocumentVersionDetail.php

@@ -74,6 +74,8 @@ if($view) {
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
 	$view->setParam('enableversionmodification', $settings->_enableVersionModification);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('showFullPreview', $settings->_showFullPreview);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);

out/out.ViewDocument.php

@@ -72,6 +72,8 @@ if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('showFullPreview', $settings->_showFullPreview);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);

views/bootstrap/class.DocumentVersionDetail.php

@@ -36,6 +36,48 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 
+	function preview() { /* {{{ */
+		$document = $this->params['document'];
+		$timeout = $this->params['timeout'];
+		$showfullpreview = $this->params['showFullPreview'];
+		$converttopdf = $this->params['convertToPdf'];
+		$cachedir = $this->params['cachedir'];
+		$version = $this->params['version'];
+		if(!$showfullpreview)
+			return;
+
+		switch($version->getMimeType()) {
+		case 'audio/mpeg':
+		case 'audio/mp3':
+		case 'audio/ogg':
+		case 'audio/wav':
+			$this->contentHeading(getMLText("preview"));
+?>
+		<audio controls style="width: 100%;">
+		<source  src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $version->getVersion(); ?>" type="audio/mpeg">
+		</audio>
+<?php
+			break;
+		case 'application/pdf':
+			$this->contentHeading(getMLText("preview"));
+?>
+			<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
+<?php
+			break;
+		default:
+			break;
+		}
+		if($converttopdf) {
+			$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
+			if($pdfpreviewer->hasConverter($version->getMimeType())) {
+				$this->contentHeading(getMLText("preview"));
+?>
+				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$document->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
+<?php
+			}
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -59,7 +101,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 ?>
 <div class="row-fluid">
-<div class="span3">
+<div class="span4">
 <?php
 		$this->contentHeading(getMLText("document_infos"));
 		$this->contentContainerStart();
@@ -138,9 +180,10 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 </table>
 <?php
 		$this->contentContainerEnd();
+		$this->preview();
 ?>
 </div>
-<div class="span9">
+<div class="span8">
 <?php
 
 		// verify if file exists
@@ -360,6 +403,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 </div>
+</div>
 <?php
 		$this->contentEnd();
 		$this->htmlEndPage();

views/bootstrap/class.DropFolderChooser.php

@@ -97,6 +97,8 @@ $('.folderselect').click(function(ev) {
 				echo "</tbody>\n";
 				echo "</table>\n";
 				echo '<script src="../out/out.DropFolderChooser.php?action=js&'.$_SERVER['QUERY_STRING'].'"></script>'."\n";
+			} else {
+				echo "<div class=\"alert alert-danger\">".getMLText('invalid_dropfolder_folder')."</div>";
 			}
 		}
 	} /* }}} */

views/bootstrap/class.Settings.php

@@ -174,6 +174,14 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_previewWidthDetail");?>:</td>
 				<td><?php $this->showTextField("previewWidthDetail", $settings->_previewWidthDetail); ?></td>
       </tr>
+      <tr title="<?php printMLText("settings_showFullPreview_desc");?>">
+        <td><?php printMLText("settings_showFullPreview");?>:</td>
+        <td><input name="showFullPreview" type="checkbox" <?php if ($settings->_showFullPreview) echo "checked" ?> /></td>
+      </tr>
+      <tr title="<?php printMLText("settings_convertToPdf_desc");?>">
+        <td><?php printMLText("settings_convertToPdf");?>:</td>
+        <td><input name="convertToPdf" type="checkbox" <?php if ($settings->_convertToPdf) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - SITE - EDITION

views/bootstrap/class.ViewDocument.php

@@ -167,9 +167,17 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 	function preview() { /* {{{ */
 		$document = $this->params['document'];
+		$timeout = $this->params['timeout'];
+		$showfullpreview = $this->params['showFullPreview'];
+		$converttopdf = $this->params['convertToPdf'];
+		$cachedir = $this->params['cachedir'];
+		if(!$showfullpreview)
+			return;
+
 		$latestContent = $document->getLatestContent();
 		switch($latestContent->getMimeType()) {
 		case 'audio/mpeg':
+		case 'audio/mp3':
 		case 'audio/ogg':
 		case 'audio/wav':
 			$this->contentHeading(getMLText("preview"));
@@ -179,6 +187,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</audio>
 <?php
 			break;
+		case 'application/pdf':
+			$this->contentHeading(getMLText("preview"));
+?>
+			<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
+<?php
+			break;
+		default:
+			break;
+		}
+		if($converttopdf) {
+			$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
+			if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
+				$this->contentHeading(getMLText("preview"));
+?>
+				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
+<?php
+			}
 		}
 	} /* }}} */
 
@@ -258,7 +283,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 
 <div class="row-fluid">
-<div class="span3">
+<div class="span4">
 <?php
 		$this->contentHeading(getMLText("document_infos"));
 		$this->contentContainerStart();
@@ -387,10 +412,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if(is_string($txt))
 			echo $txt;
 		$this->contentContainerEnd();
-//		$this->preview();
+		$this->preview();
 ?>
 </div>
-<div class="span9">
+<div class="span8">
     <ul class="nav nav-tabs" id="docinfotab">
 		  <li class="<?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
 			<?php if (count($versions)>1) { ?>
@@ -413,7 +438,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 ?>
 		  <li class="<?php if($currenttab == 'attachments') echo 'active'; ?>"><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
-		  <li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
+			<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
 		</ul>
 		<div class="tab-content">
 		  <div class="tab-pane <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>" id="docinfo">
@@ -1276,7 +1301,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 ?>
-		  </div>
+			</div>
 		</div>
 <?php
 		if($user->isAdmin()) {