From 0b69ddb4398d109571b8faf4118bc0ca7e305d34 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:06:41 +0200
Subject: [PATCH 01/76] callbacks can have more than one user function

---
 SeedDMS_Core/Core/inc.ClassDMS.php      | 36 ++++++++++++++++++-------
 SeedDMS_Core/Core/inc.ClassDocument.php | 12 +++++----
 SeedDMS_Core/Core/inc.ClassFolder.php   | 22 ++++++++-------
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 06d7a6d13..45e93971f 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -271,6 +271,7 @@ class SeedDMS_Core_DMS {
 		$this->maxDirID = 0; //31998;
 		$this->enableConverting = false;
 		$this->convertFileTypes = array();
+		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
 			$this->version = '4.3.26';
@@ -1291,8 +1292,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddUser' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddUser'])) {
-			$callback = $this->_dms->callbacks['onPostUser'];
-			if(!call_user_func($callback[0], $callback[1], $user)) {
+			foreach($this->_dms->callbacks['onPostUser'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $user)) {
+				}
 			}
 		}
 
@@ -1391,8 +1393,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddGroup' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddGroup'])) {
-			$callback = $this->_dms->callbacks['onPostAddGroup'];
-			if(!call_user_func($callback[0], $callback[1], $group)) {
+			foreach($this->_dms->callbacks['onPostAddGroup'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $group)) {
+				}
 			}
 		}
 
@@ -1479,8 +1482,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddKeywordCategory' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddKeywordCategory'])) {
-			$callback = $this->_dms->callbacks['onPostAddKeywordCategory'];
-			if(!call_user_func($callback[0], $callback[1], $category)) {
+			foreach($this->_dms->callbacks['onPostAddKeywordCategory'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $category)) {
+				}
 			}
 		}
 
@@ -1554,8 +1558,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddDocumentCategory' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddDocumentCategory'])) {
-			$callback = $this->_dms->callbacks['onPostAddDocumentCategory'];
-			if(!call_user_func($callback[0], $callback[1], $category)) {
+			foreach($this->_dms->callbacks['onPostAddDocumentCategory'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $category)) {
+				}
 			}
 		}
 
@@ -2272,7 +2277,20 @@ class SeedDMS_Core_DMS {
 	 */
 	function setCallback($name, $func, $params=null) { /* {{{ */
 		if($name && $func)
-			$this->callbacks[$name] = array($func, $params);
+			$this->callbacks[$name] = array(array($func, $params));
+	} /* }}} */
+
+	/**
+	 * Add a callback function
+	 *
+	 * @param string $name internal name of callback
+	 * @param mixed $func function name as expected by {call_user_method}
+	 * @param mixed $params parameter passed as the first argument to the
+	 *        callback
+	 */
+	function addCallback($name, $func, $params=null) { /* {{{ */
+		if($name && $func)
+			$this->callbacks[$name][] = array($func, $params);
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index bdf0e33cb..d37252c67 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1787,9 +1787,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		/* Check if 'onPreRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveDocument'])) {
-			$callback = $this->_dms->callbacks['onPreRemoveDocument'];
-			if(!call_user_func($callback[0], $callback[1], $this)) {
-				return false;
+			foreach($this->_dms->callbacks['onPreRemoveDocument'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $this)) {
+					return false;
+				}
 			}
 		}
 
@@ -1874,8 +1875,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		/* Check if 'onPostRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPostRemoveDocument'])) {
-			$callback = $this->_dms->callbacks['onPostRemoveDocument'];
-			if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+			foreach($this->_dms->callbacks['onPostRemoveDocument'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+				}
 			}
 		}
 
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 7d9a004f1..1155f3706 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -484,8 +484,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPostAddSubFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddSubFolder'])) {
-			$callback = $this->_dms->callbacks['onPostAddSubFolder'];
-			if(!call_user_func($callback[0], $callback[1], $newFolder)) {
+			foreach($this->_dms->callbacks['onPostAddSubFolder'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $newFolder)) {
+				}
 			}
 		}
 
@@ -802,8 +803,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPostAddDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddDocument'])) {
-			$callback = $this->_dms->callbacks['onPostAddDocument'];
-			if(!call_user_func($callback[0], $callback[1], $document)) {
+			foreach($this->_dms->callbacks['onPostAddDocument'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $document)) {
+				}
 			}
 		}
 
@@ -822,9 +824,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPreRemoveFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveFolder'])) {
-			$callback = $this->_dms->callbacks['onPreRemoveFolder'];
-			if(!call_user_func($callback[0], $callback[1], $this)) {
-				return false;
+			foreach($this->_dms->callbacks['onPreRemoveFolder'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $this)) {
+					return false;
+				}
 			}
 		}
 
@@ -880,8 +883,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPostRemoveFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPostRemoveFolder'])) {
-			$callback = $this->_dms->callbacks['onPostRemoveFolder'];
-			if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+			foreach($this->_dms->callbacks['onPostRemoveFolder'] as $callback) {
+				if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+				}
 			}
 		}
 

From 127ae5c48779187150c0e1c2e624bc54eaf065b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:07:17 +0200
Subject: [PATCH 02/76] start new version 4.3.27

---
 SeedDMS_Core/package.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 967a0e018..05443f7de 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-04</date>
- <time>07:38:23</time>
+ <date>2016-04-26</date>
+ <time>12:04:59</time>
  <version>
-  <release>4.3.26</release>
-  <api>4.3.26</api>
+  <release>4.3.27</release>
+  <api>4.3.27</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- add more callbacks
+callbacks can have more then one user function
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -984,5 +984,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - fix setting multi value attributes for versions
    </notes>
   </release>
+  <release>
+   <date>2016-04-04</date>
+   <time>07:38:23</time>
+   <version>
+    <release>4.3.26</release>
+    <api>4.3.26</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add more callbacks
+   </notes>
+  </release>
  </changelog>
 </package>

From b2186874e6a079b196e71b29b0e43a6f2ee0bf21 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:07:39 +0200
Subject: [PATCH 03/76] lots of documentation, new methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

deleteDocumentPreviews() removeѕ all previews of a document,
finisch deletePreview()
---
 SeedDMS_Preview/Preview/Previewer.php | 166 ++++++++++++++++++--------
 1 file changed, 113 insertions(+), 53 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 24d41baae..76d878854 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -93,13 +93,13 @@ class SeedDMS_Preview_Previewer {
 	} /* }}} */
 
 	/**
-	 * Retrieve the physical filename of the preview image on disk
+	 * Return the physical filename of the preview image on disk
 	 *
 	 * @param object $object document content or document file
 	 * @param integer $width width of preview image
 	 * @return string file name of preview image
 	 */
-	protected function getFileName($object, $width) { /* }}} */
+	protected function getFileName($object, $width) { /* {{{ */
 		if(!$object)
 			return false;
 
@@ -121,10 +121,18 @@ class SeedDMS_Preview_Previewer {
 	/**
 	 * Create a preview image for a given file
 	 *
+	 * This method creates a preview image in png 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.png (if set) or md5($infile)-$width.png.
+	 * The $mimetype is used to select the propper conversion programm.
+	 * An already existing preview image 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 integer $width width of generated preview image
+	 * @param string $target optional name of preview image (without extension)
 	 * @return boolean true on success, false on failure
 	 */
 	public function createRawPreview($infile, $dir, $mimetype, $width=0, $target='') { /* {{{ */
@@ -177,6 +185,19 @@ class SeedDMS_Preview_Previewer {
 			
 	} /* }}} */
 
+	/**
+	 * 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
+	 * @param integer $width desired width of preview image
+	 * @return boolean true on success, false on failure
+	 */
 	public function createPreview($object, $width=0) { /* {{{ */
 		if(!$object)
 			return false;
@@ -189,58 +210,19 @@ 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);
-
-		if($width == 0)
-			$width = $this->width;
-		else
-			$width = intval($width);
-		if(!$this->previewDir)
-			return false;
-		$document = $object->getDocument();
-		$dir = $this->previewDir.'/'.$document->getDir();
-		if(!is_dir($dir)) {
-			if (!SeedDMS_Core_File::makeDir($dir)) {
-				return false;
-			}
-		}
-		$file = $document->_dms->contentDir.$object->getPath();
-		if(!file_exists($file))
-			return false;
-		$target = $this->getFileName($object, $width);
-		if($target !== false && (!file_exists($target.'.png') || filectime($target.'.png') < $object->getDate())) {
-			$cmd = '';
-			switch($object->getMimeType()) {
-				case "image/png":
-				case "image/gif":
-				case "image/jpeg":
-				case "image/jpg":
-				case "image/svg+xml":
-					$cmd = 'convert -resize '.$width.'x '.$file.' '.$target.'.png';
-					break;
-				case "application/pdf":
-				case "application/postscript":
-					$cmd = 'convert -density 100 -resize '.$width.'x '.$file.'[0] '.$target.'.png';
-					break;
-				case "text/plain":
-					$cmd = 'convert -resize '.$width.'x '.$file.'[0] '.$target.'.png';
-					break;
-				case "application/x-compressed-tar":
-					$cmd = 'tar tzvf '.$file.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target.'.png';
-					break;
-			}
-			if($cmd) {
-				//exec($cmd);
-				try {
-					self::execWithTimeout($cmd, $this->timeout);
-				} catch(Exception $e) {
-				}
-			}
-			return true;
-		}
-		return true;
 			
 	} /* }}} */
 
+	/**
+	 * 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
+	 * @param integer $width desired width of preview image
+	 * @return boolean true if preview exists, otherwise false
+	 */
 	public function hasRawPreview($infile, $dir, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -255,6 +237,16 @@ class SeedDMS_Preview_Previewer {
 		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
+	 * @param integer $width desired width of preview image
+	 * @return boolean true if preview exists, otherwise false
+	 */
 	public function hasPreview($object, $width=0) { /* {{{ */
 		if(!$object)
 			return false;
@@ -272,6 +264,16 @@ class SeedDMS_Preview_Previewer {
 		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
+	 * @param integer $width desired width of preview image
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
 	public function getRawPreview($infile, $dir, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -286,6 +288,16 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	/**
+	 * 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
+	 * @param integer $width desired width of preview image
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
 	public function getPreview($object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -300,6 +312,15 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	/**
+	 * Return file size preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean/integer size of preview image or false if image
+	 * does not exist
+	 */
 	public function getFilesize($object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -314,8 +335,15 @@ class SeedDMS_Preview_Previewer {
 
 	} /* }}} */
 
-
-	public function deletePreview($document, $object, $width=0) { /* {{{ */
+	/**
+	 * Delete preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deletePreview($object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
 		else
@@ -324,6 +352,38 @@ class SeedDMS_Preview_Previewer {
 			return false;
 
 		$target = $this->getFileName($object, $width);
+		if($target && file_exists($target.'.png')) {
+			return(unlink($target.'.png'));
+		} else {
+			return false;
+		}
+	} /* }}} */
+
+	/**
+	 * 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;
+
+		function recurseRmdir($dir) {
+			$files = array_diff(scandir($dir), array('.','..'));
+			foreach ($files as $file) {
+				(is_dir("$dir/$file")) ? recurseRmdir("$dir/$file") : unlink("$dir/$file");
+			}
+			return rmdir($dir);
+		}
+
+		$dir = $this->previewDir.'/'.$document->getDir();
+		return recurseRmdir($dir);
+
 	} /* }}} */
 }
 ?>

From 8ee518e69b0f9593d0beab0140dccc551c4ae2a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:08:35 +0200
Subject: [PATCH 04/76] new version 1.1.9

---
 SeedDMS_Preview/package.xml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index ee7067f3a..26f2e7a37 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-05</date>
+ <date>2016-04-26</date>
  <time>15:17:11</time>
  <version>
-  <release>1.1.8</release>
-  <api>1.1.8</api>
+  <release>1.1.9</release>
+  <api>1.1.9</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,9 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-pass variables to stream_select (required by php7)
+add more documentation
+finished deletePreview()
+add new method deleteDocumentPreviews()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -196,5 +198,21 @@ check if object passed to createPreview(), hasPreview() is not null
 set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
    </notes>
   </release>
+  <release>
+   <date>2016-04-05</date>
+   <time>15:17:11</time>
+   <version>
+    <release>1.1.8</release>
+    <api>1.1.8</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+pass variables to stream_select (required by php7)
+   </notes>
+  </release>
  </changelog>
 </package>

From 97e28a8fef07af6778cf9661269c2131c9dfc2c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:12:13 +0200
Subject: [PATCH 05/76] delete preview images

---
 op/op.RemoveDocument.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index eb6897322..44368683f 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -52,6 +52,11 @@ if($document->isLocked()) {
 
 $folder = $document->getFolder();
 
+/* Remove all preview images. */
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$previewer->deleteDocumentPreviews($document);
+
 /* Get the notify list before removing the document */
 $dnl =	$document->getNotifyList();
 $fnl =	$folder->getNotifyList();

From 1a515c9dfd269389478a4818e97f7f5f1320119f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:12:39 +0200
Subject: [PATCH 06/76] delete preview image, remove old code

---
 op/op.RemoveDocumentFile.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php
index 4c9c988ea..8e706c959 100644
--- a/op/op.RemoveDocumentFile.php
+++ b/op/op.RemoveDocumentFile.php
@@ -55,26 +55,18 @@ if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
+/* Remove preview image. */
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$previewer->deletePreview($file, $settings->_previewWidthDetail);
+
 if (!$document->removeDocumentFile($fileid)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 } else {
 	// Send notification to subscribers.
 	if($notifier) {
 		$notifyList = $document->getNotifyList();
-/*
-		$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("removed_file_email");
-		$message = getMLText("removed_file_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$document->getName()."\r\n".
-			getMLText("file").": ".$file->getOriginalFileName()."\r\n".
-			getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".	
-			"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-		$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
-		foreach ($document->_notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message);
-		}
-*/
 		$subject = "removed_file_email_subject";
 		$message = "removed_file_email_body";
 		$params = array();

From 6f16d606472e01abc0bd7b9327593f14c9896062 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:14:59 +0200
Subject: [PATCH 07/76] add another callback which removes preview images of
 documents

also remove some old code
---
 op/op.RemoveFolder.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index a0f375c09..ab75b3757 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -68,25 +68,21 @@ if($settings->_enableFullSearch) {
 		$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', array($index, $indexconf));
 }
 
+function removePreviews($arr, $document) {
+	$previewer = $arr[0];
+
+	$previewer->deleteDocumentPreviews($document);
+	return true;
+}
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
+
 $nl =	$folder->getNotifyList();
 $foldername = $folder->getName();
 if ($folder->remove()) {
 	// Send notification to subscribers.
 	if ($notifier) {
-/*
-		$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_deleted_email");
-		$message = getMLText("folder_deleted_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$folder->getName()."\r\n".
-			getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-			getMLText("comment").": ".$folder->getComment()."\r\n".
-			"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
-
-		$notifier->toList($user, $folder->_notifyList["users"], $subject, $message);
-		foreach ($folder->_notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message);
-		}
-*/
 		$subject = "folder_deleted_email_subject";
 		$message = "folder_deleted_email_body";
 		$params = array();

From 43633620e850dd203562e596ec5157e4c93da823 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:15:56 +0200
Subject: [PATCH 08/76] remove preview images, remove some old code

---
 op/op.RemoveVersion.php | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index f297ac074..c1d8390cd 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -58,37 +58,16 @@ if (!is_object($version)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 if (count($document->getContent())==1) {
+	$previewer->deleteDocumentPreviews($document);
 	$nl = $document->getNotifyList();
 	$docname = $document->getName();
 	if (!$document->remove()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {
 		if ($notifier){
-/*
-			$path = "";
-			$folder = $document->getFolder();
-			$folderPath = $folder->getPath();
-			for ($i = 0; $i  < count($folderPath); $i++) {
-				$path .= $folderPath[$i]->getName();
-				if ($i +1 < count($folderPath))
-					$path .= " / ";
-			}
-		
-			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_deleted_email");
-			$message = getMLText("document_deleted_email")."\r\n";
-			$message .= 
-				getMLText("document").": ".$document->getName()."\r\n".
-				getMLText("folder").": ".$path."\r\n".
-				getMLText("comment").": ".$document->getComment()."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
-
-			// Send notification to subscribers.
-			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
-			foreach ($document->_notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/
 			$subject = "document_deleted_email_subject";
 			$message = "document_deleted_email_body";
 			$params = array();
@@ -131,6 +110,8 @@ else {
 		}
 	}
 
+	$previewer->deletePreview($version, $settings->_previewWidthDetail);
+	$previewer->deletePreview($version, $settings->_previewWidthList);
 	if (!$document->removeContent($version)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {

From fcf85a88e0e1a58b6a86434ff608b50f3ff6e059 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 12:16:29 +0200
Subject: [PATCH 09/76] move inclusion of "SeedDMS/Preview.php" into view

---
 out/out.ViewDocument.php               | 5 -----
 views/bootstrap/class.ViewDocument.php | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index f908d23ba..731b7413a 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -27,11 +27,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1]);
 if(!$view) {
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 59d226395..7d885416b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ViewDocument view
  *

From 7e3cd7d6c4feafa403e724b8a62d5774a825f38d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 13:43:02 +0200
Subject: [PATCH 10/76] move inclusion SeedDMS/Preview.php into view

---
 out/out.ApprovalSummary.php                     | 5 -----
 out/out.AttributeMgr.php                        | 5 -----
 out/out.DocumentVersionDetail.php               | 5 -----
 out/out.DropFolderChooser.php                   | 5 -----
 out/out.GroupMgr.php                            | 5 -----
 out/out.ManageNotify.php                        | 5 -----
 out/out.MyDocuments.php                         | 5 -----
 out/out.ReviewSummary.php                       | 5 -----
 out/out.Search.php                              | 5 -----
 out/out.Timeline.php                            | 5 -----
 out/out.ViewFolder.php                          | 5 -----
 out/out.WorkflowSummary.php                     | 5 -----
 views/bootstrap/class.ApprovalSummary.php       | 5 +++++
 views/bootstrap/class.AttributeMgr.php          | 5 +++++
 views/bootstrap/class.DocumentVersionDetail.php | 5 +++++
 views/bootstrap/class.DropFolderChooser.php     | 5 +++++
 views/bootstrap/class.GroupMgr.php              | 5 +++++
 views/bootstrap/class.ManageNotify.php          | 5 +++++
 views/bootstrap/class.MyDocuments.php           | 5 +++++
 views/bootstrap/class.ReviewSummary.php         | 5 +++++
 views/bootstrap/class.Search.php                | 5 +++++
 views/bootstrap/class.Timeline.php              | 5 +++++
 views/bootstrap/class.ViewFolder.php            | 5 +++++
 views/bootstrap/class.WorkflowSummary.php       | 5 +++++
 24 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index d2a838a64..487a4ffeb 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -24,11 +24,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php
index 87a8bcc7a..14d60bb36 100644
--- a/out/out.AttributeMgr.php
+++ b/out/out.AttributeMgr.php
@@ -25,11 +25,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index 6342e6092..ff6923114 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -26,11 +26,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php
index 34e45e243..da71f6c1a 100644
--- a/out/out.DropFolderChooser.php
+++ b/out/out.DropFolderChooser.php
@@ -24,11 +24,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]);
 
 if(substr($settings->_dropFolderDir, -1, 1) == DIRECTORY_SEPARATOR)
diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index 2ab0b2cd0..f6816cd10 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -25,11 +25,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index 327ca07ad..a427dba23 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -22,11 +22,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 4fdc2a0ed..379ae1a8e 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -24,11 +24,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index 7c6567105..075a50672 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -25,11 +25,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
diff --git a/out/out.Search.php b/out/out.Search.php
index fca8c96c2..f9736c2e8 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -26,11 +26,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 function getTime() {
 	if (function_exists('microtime')) {
 		$tm = microtime();
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index 2130ff2ad..bad3862ec 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -23,11 +23,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 1ff3e02f6..011a842a2 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -25,11 +25,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index b0247a6c0..6d2dbc4a9 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -25,11 +25,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 6e2e513c4..55c6926f9 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ApprovalSummary view
  *
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 5f3878916..057777cbb 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for AttributeMgr view
  *
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 41bfbd713..185375f18 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for DocumentVersionDetail view
  *
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 4882c6782..f9c883710 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for CategoryChooser view
  *
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 0ba3cdb86..08b373b54 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for GroupMgr view
  *
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index c4acc49df..06a2874e8 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ManageNotify view
  *
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index d4020c532..35e162c25 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for MyDocuments view
  *
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 95a3dd819..879cdc3e0 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ReviewSummary view
  *
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 023c2d0e6..aa35708bc 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for Search result view
  *
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 4832ffb61..2ef72a7bf 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for Timeline view
  *
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 934c4691c..5c2cddc39 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ViewFolder view
  *
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 1014d677e..ba482b8c0 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for WorkflowSummary view
  *

From 20920d9cecdbd24869a695e60bd3cce7b4d31d56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 13:47:42 +0200
Subject: [PATCH 11/76] start changelog for 4.3.27

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f4f648dbe..0c3391f2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.27
+--------------------------------------------------------------------------------
+- remove preview images when document or document content is removed (Closes #262)
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26
 --------------------------------------------------------------------------------

From 24e30529ab168f9e612ec0aed197e6b2d545d0b0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 18:20:22 +0200
Subject: [PATCH 12/76] fix html markup

---
 views/bootstrap/class.ViewDocument.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 7d885416b..4949113d6 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -417,7 +417,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
 			}
 		}
-		print "</ul>\n";
+		print "</ul></td>\n";
 
 		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
 
@@ -599,7 +599,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
+				print "</tr>\n";
 			}
 		}
 
@@ -668,7 +668,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul>";
-				print "</td>\n";	
 				print "</td>\n</tr>\n";
 			}
 		}
@@ -946,7 +945,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
 					}
 				}
-				print "</ul>\n";
+				print "</ul></td>\n";
 				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";
 				print "<td>";
@@ -1030,7 +1029,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$responsibleUser->getEmail()."\">".htmlspecialchars($responsibleUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($file->getDate())."</li>";
-
+				print "</ul></td>";
 				print "<td>".htmlspecialchars($file->getComment())."</td>";
 			
 				print "<td><ul class=\"unstyled actions\">";

From 42c68e0b1e08fc13894e5ddf8e5cf01d5ca8086f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Apr 2016 20:34:44 +0200
Subject: [PATCH 13/76] remove class 'table' from table

this turns of the lines
---
 views/bootstrap/class.AttributeMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 057777cbb..731291cea 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -167,7 +167,7 @@ $(document).ready( function() {
 <?php
 		}
 ?>
-				<table class="table table-condensed">
+				<table class="table-condensed">
 					<tr>
 						<td>
 								<?php printMLText("attrdef_name");?>:

From 5d25720ec989d61615246607240a0ad990686383 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 07:51:42 +0200
Subject: [PATCH 14/76] add new operation to clear cache completely

---
 CHANGELOG                            |  1 +
 op/op.ClearCache.php                 | 36 +++++++++++++++++
 out/out.ClearCache.php               | 40 +++++++++++++++++++
 views/bootstrap/class.Bootstrap.php  |  1 +
 views/bootstrap/class.ClearCache.php | 60 ++++++++++++++++++++++++++++
 5 files changed, 138 insertions(+)
 create mode 100644 op/op.ClearCache.php
 create mode 100644 out/out.ClearCache.php
 create mode 100644 views/bootstrap/class.ClearCache.php

diff --git a/CHANGELOG b/CHANGELOG
index 0c3391f2d..9ca8e4a24 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
 - remove preview images when document or document content is removed (Closes #262)
+- add clear cache operation in admin tools
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26
diff --git a/op/op.ClearCache.php b/op/op.ClearCache.php
new file mode 100644
index 000000000..b5c00e5f0
--- /dev/null
+++ b/op/op.ClearCache.php
@@ -0,0 +1,36 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('clearcache')) {
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+}
+
+$cmd = 'rm -rf '.$settings->_cacheDir.'/*';
+system($cmd);
+add_log_line("");
+
+header("Location:../out/out.AdminTools.php");
+
diff --git a/out/out.ClearCache.php b/out/out.ClearCache.php
new file mode 100644
index 000000000..578464b35
--- /dev/null
+++ b/out/out.ClearCache.php
@@ -0,0 +1,40 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Version.php");
+include("../inc/inc.Settings.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+if($view) {
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d2d0398ef..74151ceaa 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -573,6 +573,7 @@ $(document).ready(function () {
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ObjectCheck.php\">".getMLText("objectcheck")."</a></li>\n";
+		echo "      <li><a href=\"../out/out.ClearCache.php\">".getMLText("clear_cache")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Info.php\">".getMLText("version_info")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
new file mode 100644
index 000000000..b00043c62
--- /dev/null
+++ b/views/bootstrap/class.ClearCache.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Implementation of ClearCache view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for ClearCache view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->contentHeading(getMLText("clear_cache"));
+		$this->contentContainerStart('warning');
+
+?>
+<form action="../op/op.ClearCache.php" name="form1" method="post">
+<?php echo createHiddenFieldWithKey('clearcache'); ?>
+<p>
+<?php printMLText("confirm_clear_cache", array('cache_dir'=>$cachedir));?>
+</p>
+<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("clear_cache");?></button></p>
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From b86132a45c2e2d297a9ef684d12f386f45e10575 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 10:42:13 +0200
Subject: [PATCH 15/76] pass variables to stream_select()

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 2a90a39b1..874bfd149 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -42,7 +42,9 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		do {
 			$timeleft = $timeout - time();
 			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
+			$write = NULL;
+			$exeptions = NULL;
+			stream_select($read, $write, $exeptions, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);

From 2fc6f6aa7883339f5251e5b3201ac2fcbd1e683e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 10:42:52 +0200
Subject: [PATCH 16/76] new version 1.1.9

---
 SeedDMS_Lucene/package.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index c37770104..dc9fc8a20 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-03-29</date>
+ <date>2016-04-28</date>
  <time>08:11:19</time>
  <version>
-  <release>1.1.8</release>
+  <release>1.1.9</release>
   <api>1.1.7</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+pass variables to stream_select() to fullfill strict standards.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -218,5 +218,21 @@ run external commands with a timeout
 add command for indexing postѕcript files
    </notes>
   </release>
+  <release>
+   <date>2016-03-29</date>
+   <time>08:11:19</time>
+   <version>
+    <release>1.1.8</release>
+    <api>1.1.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+   </notes>
+  </release>
  </changelog>
 </package>

From 9af830c8144a6b9b844b3d62befde8eb57ec5e4f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 10:43:35 +0200
Subject: [PATCH 17/76] add note to 4.3.27

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9ca8e4a24..30495e49a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools
+- fix strict standard error in SeedDMS_Lucene (Closes #263)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26

From 4dbe07871c1e074548de80f8d9a2724ec1a6b2c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 12:04:09 +0200
Subject: [PATCH 18/76] check for dependency on seeddms

disable extension if dependency not met
---
 inc/inc.Extension.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index b3f6eaf26..b8f5f4def 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -13,6 +13,8 @@
 
 require "inc.ClassExtensionMgr.php";
 require_once "inc.ClassExtBase.php";
+require_once "inc.Version.php";
+require_once "inc.Utils.php";
 
 $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 $extconffile = $extMgr->getExtensionsConfFile();
@@ -22,7 +24,17 @@ if(!file_exists($extconffile)) {
 $EXT_CONF = array();
 include($extconffile);
 
+$version = new SeedDMS_Version;
+
 foreach($EXT_CONF as $extname=>$extconf) {
+	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
+		/* check for requirements */
+		if(!empty($extconf['constraints']['depends']['seeddms'])) {
+			$t = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
+			if(cmpVersion($t[0], $version->version()) > 0 || ($t[1] && cmpVersion($t[1], $version->version()) < 0))
+				$extconf['disable'] = true;
+		}
+	}
 	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 		$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
 		if(file_exists($classfile)) {

From 2fb96d94bfb25a293e269018568d24b2fe1a89fe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 12:04:53 +0200
Subject: [PATCH 19/76] also check for dependencies on other extensions

---
 views/bootstrap/class.ExtensionMgr.php | 44 ++++++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 5be43b04d..59d91df1b 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -47,24 +47,40 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		print "</tr></thead>\n";
 		$errmsgs = array();
 		foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) {
+			$errmsgs = array();
 			if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 				/* check dependency on specific seeddms version */
-				if(isset($extconf['constraints']['depends']['seeddms'])) {
-					$tmp = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
-					if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
-						$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
-				} else {
+				if(!isset($extconf['constraints']['depends']['seeddms']))
 					$errmsgs[] = "Missing dependency on SeedDMS";
+				if(!isset($extconf['constraints']['depends']['php']))
+					$errmsgs[] = "Missing dependency on PHP";
+
+				if(isset($extconf['constraints']['depends'])) {
+					foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
+						switch($dkey) {
+						case 'seeddms':
+							$tmp = explode('-', $dval, 2);
+							if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
+								$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
+							break;
+						case 'php':
+							$tmp = explode('-', $dval, 2);
+							if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
+								$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
+							break;
+						default:
+							$tmp = explode('-', $dval, 2);
+							if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
+								if(cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
+									$errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
+							} else {
+								$errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
+							}
+							break;
+						}
+					}
 				}
 
-				/* check dependency on specific php version */
-				if(isset($extconf['constraints']['depends']['php'])) {
-					$tmp = explode('-', $extconf['constraints']['depends']['php'], 2);
-					if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
-						$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
-				} else {
-					$errmsgs[] = "Missing dependency on PHP";
-				}
 				if($errmsgs)
 					echo "<tr class=\"error\">";
 				else
@@ -77,7 +93,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>".$extconf['title']."<br /><small>".$extconf['description']."</small>";
 			if($errmsgs)
-				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br />', $errmsgs)."</div>";
+				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
 			echo "</td>";
 			echo "<td>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small></td>";
 			echo "<td><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";

From eb3f20c78bca9ad68dca63385b1f270864d8c5e3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Apr 2016 12:07:07 +0200
Subject: [PATCH 20/76] add changes in 5.0.4

---
 CHANGELOG | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cbf7fbacc..8b2f90f86 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.4
+--------------------------------------------------------------------------------
+- merged changes from 4.3.27
+- much better dependency checking for extensions, turn off extensions which
+  do not match seeddms version dependency
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.3
 --------------------------------------------------------------------------------
@@ -24,6 +31,10 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.27
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26
 --------------------------------------------------------------------------------

From ea14c50838a119d29f8185a32f0f7f483df102c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Apr 2016 08:09:37 +0200
Subject: [PATCH 21/76] mark jqtree element on hover

---
 styles/bootstrap/application.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index d050492ab..38ea66652 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -163,6 +163,10 @@ div.splash {
 	display: none;
 }
 
+ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
+    background-color: #E0E0E0;
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;

From fa413d03369eee2b93cef703bfd007f9e34d4fff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Apr 2016 08:10:10 +0200
Subject: [PATCH 22/76] no action if folder is droped on itself

---
 styles/bootstrap/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 220e326ed..f7a2002bf 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -665,7 +665,7 @@ $(document).ready(function() {
 
 			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
 //			document.location = url;
-		} else if(source_type == 'folder') {
+		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
 				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",
@@ -814,7 +814,7 @@ $(document).ready(function() {
 
 			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
 //			document.location = url;
-		} else if(source_type == 'folder') {
+		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
 				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",

From 1640df6d4fe59e8f943201d033d84443223529bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 May 2016 09:34:12 +0200
Subject: [PATCH 23/76] do not claim that the default for maxDirID is 32670

---
 conf/settings.xml.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index 32afc7468..d43aa3ff6 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -267,7 +267,7 @@
        -                   directory ($_contentDir). 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 $_contentDir.
-       - maxDirID: Maximum number of sub-directories per parent directory. Default: 32700.
+       - maxDirID: Maximum number of sub-directories per parent directory. Default: 0.
        - updateNotifyTime: users are notified about document-changes that took place within the last "updateNotifyTime" seconds
        - extraPath: XXX
        - maxExecutionTime: XXX

From 11d63555477539203fb3e8dc0fee7a570941877e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 May 2016 10:08:39 +0200
Subject: [PATCH 24/76] fix typo

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 30495e49a..6e29dafaa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,7 +22,7 @@
 --------------------------------------------------------------------------------
 - much more consistent drag & drop
 - various translation updates
-- take out file deletion because it was (and probabbly never has been) useful
+- take out file deletion because it was not (and probabbly never has been) useful
 - send notification if folder is deleted by ajax call
 - add page ImportFS for mass importing files from drop folder
 - add initial version for editing text files online

From 9fb4dfaa9b4451e317101e39b40db87601b43b84 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 06:44:50 +0200
Subject: [PATCH 25/76] start new version 5.0.4

---
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 25 ++++++++++++++++++++-----
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 97be48904..d76f54390 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.0.3
+VERSION=5.0.4
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c1e6d1c62..a047733f7 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -312,7 +312,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.0.3';
+			$this->version = '5.0.4';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 75077d574..79f2645bb 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-04</date>
+ <date>2016-05-03</date>
  <time>08:56:33</time>
  <version>
-  <release>5.0.3</release>
-  <api>5.0.3</api>
+  <release>5.0.4</release>
+  <api>5.0.4</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,8 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
-- all changes from 4.3.26 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1074,5 +1072,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.25 merged
 	 </notes>
   </release>
+  <release>
+   <date>2016-04-04</date>
+   <time>08:56:33</time>
+   <version>
+    <release>5.0.3</release>
+    <api>5.0.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- all changes from 4.3.26 merged
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 95f0bc97e..21244c76c 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.0.3";
+	public $_number = "5.0.4";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 6c1ddb38d..3c413a0b4 100644
--- a/install/install.php
+++ b/install/install.php
@@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.0.3");
+define("SEEDDMS_VERSION", "5.0.4");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 553a29bd29a65fb85951c550a9b0b726c7ecbb22 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 07:03:31 +0200
Subject: [PATCH 26/76] remove some old code

---
 inc/inc.Authentication.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index d300504b7..38c3d8bd6 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -76,19 +76,9 @@ if($settings->_enableEmail) {
 	$notifier->addService(new SeedDMS_EmailNotify($dms));
 }
 
-/* Include the language file as specified in the session. If that is not
- * available use the language from the settings
+/* Include additional language file for view
+ * This file must set $LANG[xx][]
  */
-/*
-if(file_exists($settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc")) {
-	include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
-	$session->setLanguage($resArr["language"]);
-} else {
-	include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
-	$session->setLanguage($settings->_language);
-}
-*/
-
 if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc")) {
 	include $settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc";
 }

From 1b8e0052e8b35625de5ed874ef49f621f6697c3e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 07:03:47 +0200
Subject: [PATCH 27/76] use contentHeading() instead of plain html

---
 views/bootstrap/class.ForcePasswordChange.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ForcePasswordChange.php b/views/bootstrap/class.ForcePasswordChange.php
index dde4f3ea4..d48443479 100644
--- a/views/bootstrap/class.ForcePasswordChange.php
+++ b/views/bootstrap/class.ForcePasswordChange.php
@@ -75,7 +75,7 @@ $(document).ready( function() {
 		$this->htmlStartPage(getMLText("sign_in"), "forcepasswordchange");
 		$this->globalBanner();
 		$this->contentStart();
-		echo "<h3>".getMLText('password_expiration')."</h3>";
+		$this->contentHeading(getMLText('password_expiration'));
 		echo "<div class=\"alert\">".getMLText('password_expiration_text')."</div>";
 		$this->contentContainerStart();
 ?>

From 30a18f81c559525d5b7b16d325186a0afb220552 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 07:12:24 +0200
Subject: [PATCH 28/76] $strictformset isn't needed

---
 views/bootstrap/class.ForcePasswordChange.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/views/bootstrap/class.ForcePasswordChange.php b/views/bootstrap/class.ForcePasswordChange.php
index d48443479..06553cf4e 100644
--- a/views/bootstrap/class.ForcePasswordChange.php
+++ b/views/bootstrap/class.ForcePasswordChange.php
@@ -32,8 +32,6 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
-		$strictformcheck = $this->params['strictformcheck'];
-
 		header('Content-Type: application/javascript');
 ?>
 function checkForm()

From ecf6c13fe46ce7e728c87a36abeba89976fbf704 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 08:36:06 +0200
Subject: [PATCH 29/76] make recurseRmdir() static

---
 SeedDMS_Preview/Preview/Previewer.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 76d878854..ef37f82a4 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -359,6 +359,14 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	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
 	 *
@@ -373,16 +381,8 @@ class SeedDMS_Preview_Previewer {
 		if(!$this->previewDir)
 			return false;
 
-		function recurseRmdir($dir) {
-			$files = array_diff(scandir($dir), array('.','..'));
-			foreach ($files as $file) {
-				(is_dir("$dir/$file")) ? recurseRmdir("$dir/$file") : unlink("$dir/$file");
-			}
-			return rmdir($dir);
-		}
-
 		$dir = $this->previewDir.'/'.$document->getDir();
-		return recurseRmdir($dir);
+		return SeedDMS_Preview_Previewer::recurseRmdir($dir);
 
 	} /* }}} */
 }

From 0501900a28c54c950114ce7c0ff663a9b6512406 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 May 2016 08:14:04 +0200
Subject: [PATCH 30/76] various improvements

---
 doc/README.Synology.txt | 106 ++++++++++++++++++++++++++++++----------
 1 file changed, 80 insertions(+), 26 deletions(-)

diff --git a/doc/README.Synology.txt b/doc/README.Synology.txt
index 0326d4504..d878c7dd3 100644
--- a/doc/README.Synology.txt
+++ b/doc/README.Synology.txt
@@ -1,14 +1,16 @@
 *********************************************
-How to set up SeedDMS Preview on Synology NAS
+How to set up a Synology NAS to run SeedDMS
 *********************************************
 
+**This guide has been updated and tested to work on Synology DSM 6.0. It should as well work with older DMS versions, however some steps or paths may be different.**
+
 Introduction
 ############
-SeedDMS provides a function creating a preview of each document which is displayed on the document page.
+SeedDMS is a feature rich and lightweight document management system. Unfortunately, some of the tools which are part of many Linux distros, have not been made available by
+Synology and therefore require additional steps to bring them to your Synology.
 
-Synology stations do not support the creation of the previews by default due to a missing Ghostscript implementation. Therefore
-loading of a document page can use a lot of time because SeedDMS tries to create the missing preview images each time the document
-page is being loaded.
+This guide covers the installation of the required tools to have all features of SeedDMS available. It does not cover the installation of 3rd party programs (like OPKG). It
+does not cover the installation of SeedDMS as well, please refer to the separate README.Install.md file.
 
 Prerequisites
 #############
@@ -20,7 +22,7 @@ In order to complete the steps outlined below, you must be able to carry out the
 To complete the installation, the following prerequisites on your Synology must be met:
 
 * IPKG or OPKG (OPKG preferred) installed
-* Pear Package SeedDMS_Preview already installed
+* PEAR installed from the Synology Package Center
 
 Installation and configuration
 ##############################
@@ -31,8 +33,8 @@ must be done on the terminal.
 Install Ghostscript
 ***************************
 
-The first step is to install Ghostscript to make ImageMagick capable of converting PDF files to images. Use IPKG or OPKG to complete this
-step.
+The first step is to install Ghostscript to make ImageMagick capable of converting PDF files to images which are then used for previews.
+Use IPKG or OPKG to complete this step.
 
 Make Ghostscript available to PHP
 *****************************************
@@ -42,21 +44,10 @@ use phpinfo and find **_SERVER["PATH"]**. If you can't find /opt inside, PHP can
 update the paths or just make a symlink.
 To create the symlink, cd to /usr/bin and type *ln -s /opt/bin/gs gs*. Verify the created symlink.
 
-Fix Ghostscript package bug
-****************************************
-
-Unfortunately the version delivered by OPKG has a bug, making Ghostscript failing to work properly. The bug requries fixing at the time
-of the writing are the following:
-
-* Resource path pointing to a wrong version (9.10 instead of 9.16)
-
-First, fix the resource path. Go to /opt/bin and find **gs** in there. Open the file with VI. Change the GS_LIB path from */opt/share/ghostscript/9.10/Resource*
-to */opt/share/ghostscript/9.16/Resource*. This will now allow Ghostscript to find it's files in the proper path.
-
 Fix ImageMagick
 ********************
 
-Not only Ghostscript is affected by bugs, the default configuration files are missing. Unfortunately some work is required here as well.
+Not only Ghostscript is affected by bugs, the default configuration files for ImageMagick are missing. Unfortunately some work is required here as well.
 
 To check where ImageMagick looks for it's files, invoke the command *convert -debug configure logo: null:*. You will see some paths shown, these
 are the paths where ImageMagic tries to locate it's configuration files. The first path shown will point to */usr/share/ImageMagick-6* followed by the
@@ -99,11 +90,74 @@ If you want to test Ghostcript as well, invoke the follwing command:
 
 This command should go through without any errors and as well output a png file.
 
-If the tests above are successful, you are ready to use SeedDMS Preview. Go to your SeedDMS Installation and open a folder. For the first test you
-may take a folder with less files in it. Be patient while the previews are generated. You may check the process using *top* on the terminal.
+If the tests above are successful, you are ready to use SeedDMS Preview.
 
-At the end your document page should show the previews like shown below:
+Install PEAR packages
+*********************
 
-.. figure:: preview.png
-   :alt: Document previews
-   :scale: 75%
+This step is similar to the installation on other Linux distros. Once you installed PEAR from the Package Center you can call it from the command line.
+
+The following packages are required by SeedDMS:
+
+* Auth_SASL
+* HTTP_WebDAV_Server
+* Log
+* Mail
+* Net_SMTP
+
+Install these packages, then go to the next step.
+
+Install additional packages
+***************************
+
+SeedDMS uses other small tools (for example the Slim Framework) to add some additional functionality. At the moment (Version 5.0.x) the list contains the following
+tools:
+
+* FeedWriter
+* Slim
+* parsedown
+
+Copy the tools to a folder on your Synology. Using the console, copy the tools to **/volume1/@appstore/PEAR**.
+Copy the whole folders as they are and do not change the structure. As the PEAR directory is already within
+the PHP include path, no further configuration is required to get them working.
+
+Fulltext Index
+***************
+
+If you do not intend to use the fulltext index, please skip this section and continue with the readme file to
+install SeedDMS.
+
+To create the fulltext index, SeedDMS needs to be able to convert the documents to text files to read the terms
+out. Pdftotext is already available by default, so we just need to take care of the Microsoft Office formats.
+
+For this guide, the following two tools have been selected:
+
+docx2txt available from http://docx2txt.sourceforge.net/
+
+xlsx2csv available from http://github.com/dilshod/xlsx2csv
+
+Copy both files to your Synology.
+
+**docx2txt**
+
+This program runs without any kind of installation. Create a folder on your Synology and extract the contents of the archive.
+
+In SeedDMS you can now configure the setting for Word documents to the path where you extracted the files in the step before. Point
+to the docx2txt.sh file and you are done.
+
+To make the configuration more simple you can add a symlink in **/usr/bin**. This will allow you to call docx2txt from any location of your Synology.
+The symlink must point to docx2txt.sh to get it working. In SeedDMS you can now just configure docx2txt followed by any additional commands.
+
+**xlsx2csv**
+
+This one must be installed to get it working. The installation script is written in Python, so you need to get Python installed on your Synology.
+As the version available from Synology does not properly work (you can't install PIP) it is strongly recommended to use OPKG or IPKG to install Python.
+
+Install Python and PIP. Once completed, point to the directory where you copied xlsx2csv. Unpack the archive, then execute the installer (pip install xlsx2csv).
+
+Once completed, xlsx2csv is available and can be configured within SeedDMS.
+
+Complete the installation
+*************************
+
+Now you are ready to install SeedDMS and configure the database. Follow the README file to install SeedDMS.
\ No newline at end of file

From 058acc313ac12e6a689c2ffc6b1edf2e9c77ab6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 May 2016 13:09:13 +0200
Subject: [PATCH 31/76] fix mass import from file system

---
 op/op.ImportFS.php                 | 42 +++++++++++++++++++-----------
 views/bootstrap/class.ImportFS.php |  4 +--
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php
index 162633fc3..e8bb3fa00 100644
--- a/op/op.ImportFS.php
+++ b/op/op.ImportFS.php
@@ -13,8 +13,7 @@ if (!isset($_GET["targetid"]) || !is_numeric($_GET["targetid"]) || $_GET["target
 $targetid = $_GET["targetid"];
 $folder = $dms->getFolder($targetid);
 if (!is_object($folder)) {
-	echo "Could not find specified folder\n";
-	exit(1);
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_target_folder"));
 }
 
 if ($folder->getAccessMode($user) < M_READWRITE) {
@@ -30,7 +29,7 @@ if(!is_dir($dirname)) {
 }
 
 function import_folder($dirname, $folder) { /* {{{ */
-	global $user;
+	global $user, $doccount, $foldercount;
 
 	$d = dir($dirname);
 	$sequence = 1;
@@ -56,27 +55,40 @@ function import_folder($dirname, $folder) { /* {{{ */
 				if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = ".";
 				else $filetype = substr($path, $lastDotIndex);
 
-				echo $mimetype." - ".$filetype." - ".$path."\n";
-				$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
+//				echo $mimetype." - ".$filetype." - ".$path."\n";
+				if($res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
 																		$categories, $filetmp, $name,
 																		$filetype, $mimetype, $sequence, $reviewers,
-																		$approvers, $reqversion, $version_comment);
-
-				if (is_bool($res) && !$res) {
-					echo "Could not add document to folder\n";
-					exit(1);
+																		$approvers, $reqversion, $version_comment)) {
+					$doccount++;
+				} else {
+					return false;
 				}
-				set_time_limit(1200);
+				set_time_limit(30);
 			} elseif(is_dir($path)) {
 				$name = basename($path);
-				$newfolder = $folder->addSubFolder($name, '', $user, $sequence);
-				import_folder($path, $newfolder);
+				if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) {
+					$foldercount++;
+					if(!import_folder($path, $newfolder))
+						return false;
+				} else {
+					return false;
+				}
 			}
 			$sequence++;
 		}
 	}
+	return true;
 } /* }}} */
 
-header("Content-Type: text/plain");
-import_folder($dirname, $folder);
+$foldercount = $doccount = 0;
+if($newfolder = $folder->addSubFolder($_GET["dropfolderfileform1"], '', $user, 1)) {
+	if(!import_folder($dirname, $newfolder))
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
+	else
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_importfs', array('docs'=>$doccount, 'folders'=>$foldercount))));
+} else {
+	$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
+}
 
+header("Location:../out/out.ViewFolder.php?folderid=".$newfolder->getID());
diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 3da3e13e1..192e95fc1 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -52,12 +52,12 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 
 		print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
-		print "<div class=\"control-group\"><label class=\"control-label\"></label><div class=\"controls\">";
+		print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
 		$this->printFolderChooserHtml("form1",M_READWRITE);
 		print "</div></div>";
 		if($dropfolderdir) {
 			print "<div class=\"control-group\"><label class=\"control-label\">";
-			printMLText("dropfolder_file");
+			printMLText("dropfolder_folder");
 			echo ": ";
 			print "</label><div class=\"controls\">";
 			/* Setting drop folder dir to "" will force to take the default from settings.xml */

From b9faf8e5eb15378f58535b7278f0be769243d604 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 May 2016 13:09:56 +0200
Subject: [PATCH 32/76] new phrases and translation for catan

---
 languages/ar_EG/lang.inc |  5 +++
 languages/bg_BG/lang.inc |  5 +++
 languages/ca_ES/lang.inc | 79 +++++++++++++++++++++-------------------
 languages/cs_CZ/lang.inc |  5 +++
 languages/de_DE/lang.inc |  7 +++-
 languages/en_GB/lang.inc |  7 +++-
 languages/es_ES/lang.inc |  5 +++
 languages/fr_FR/lang.inc |  5 +++
 languages/hr_HR/lang.inc |  5 +++
 languages/hu_HU/lang.inc |  5 +++
 languages/it_IT/lang.inc |  5 +++
 languages/ko_KR/lang.inc |  5 +++
 languages/nl_NL/lang.inc |  5 +++
 languages/pl_PL/lang.inc |  5 +++
 languages/pt_BR/lang.inc |  5 +++
 languages/ro_RO/lang.inc |  5 +++
 languages/ru_RU/lang.inc |  5 +++
 languages/sk_SK/lang.inc |  5 +++
 languages/sv_SE/lang.inc |  5 +++
 languages/tr_TR/lang.inc |  5 +++
 languages/uk_UA/lang.inc |  5 +++
 languages/zh_CN/lang.inc |  5 +++
 languages/zh_TW/lang.inc |  5 +++
 23 files changed, 154 insertions(+), 39 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 77b324f5f..fe8538991 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -221,6 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'اختر اجراء مسار عمل',
 'choose_workflow_state' => 'اختر حالة مسار عمل',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => 'لوحة القصاصات',
@@ -361,6 +362,7 @@ URL: [url]',
 'draft_pending_review' => 'مسودة - قيد المراجعة',
 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!',
 'dropfolder_file' => 'ملف من مجلد التجميع',
+'dropfolder_folder' => '',
 'dropupload' => 'رفع سريع',
 'drop_files_here' => 'أفلت الملفات هنا!',
 'dump_creation' => 'انشاء مستخرج من قاعدة البيانات',
@@ -399,6 +401,7 @@ URL: [url]',
 'error' => 'خطأ',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'لم يتم اختيار مستند',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
 'error_occured' => 'حدث خطأ',
@@ -501,6 +504,7 @@ URL: [url]',
 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
@@ -1235,6 +1239,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 784a068ac..11767daeb 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -206,6 +206,7 @@ $text = array(
 'choose_workflow_action' => 'Изберете workflow действие',
 'choose_workflow_state' => 'Изберете състояние на workflow',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => '',
@@ -316,6 +317,7 @@ $text = array(
 'draft_pending_review' => 'Чернова - очаква рецензия',
 'drag_icon_here' => 'Провлачи икона или папка, или документ ТУК!',
 'dropfolder_file' => 'Файл от drop папка',
+'dropfolder_folder' => '',
 'dropupload' => '',
 'drop_files_here' => '',
 'dump_creation' => 'Създаване дъмп на БД',
@@ -354,6 +356,7 @@ $text = array(
 'error' => 'Грешка',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Няма избрани документи',
 'error_no_folder_selected' => 'Няма избрани папки',
 'error_occured' => 'Стана грешка',
@@ -432,6 +435,7 @@ $text = array(
 'identical_version' => 'Новата версия е идентична с текущата.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
@@ -1100,6 +1104,7 @@ $text = array(
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 144cc7db5..a89331017 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/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 (662)
+//    Translators: Admin (698)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -36,7 +36,7 @@ $text = array(
 'access_permission_changed_email_body' => '',
 'access_permission_changed_email_subject' => '',
 'according_settings' => '',
-'action' => '',
+'action' => 'Acció',
 'actions' => 'Accions',
 'action_approve' => '',
 'action_complete' => '',
@@ -62,7 +62,7 @@ $text = array(
 'add_revision' => '',
 'add_role' => '',
 'add_subfolder' => 'Afegir subdirectori',
-'add_to_clipboard' => '',
+'add_to_clipboard' => 'Emmagatzemar al portapapers',
 'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Afegir nou usuari',
@@ -106,7 +106,7 @@ URL: [url]',
 'april' => 'Abril',
 'archive_creation' => 'Creació d\'arxiu',
 'archive_creation_warning' => 'Amb aquesta operació pot crear un arxiu que contingui els fitxers de les carpetes del DMS complet. Després de crear-lo, l\'arxiu es guardarà a la carpeta de dades del servidor. <br>ATENCIÓ: un fitxer creat com llegible per humans no es podrà usar com a còpia de seguretat del servidor.',
-'ar_EG' => '',
+'ar_EG' => 'Àrab',
 'assign_approvers' => 'Assignar aprovadors',
 'assign_reviewers' => 'Assignar revisors',
 'assign_user_property_to' => 'Assignar propietats d\'usuari a',
@@ -155,7 +155,7 @@ URL: [url]',
 'backup_remove' => 'Eliminar fitxer de còpia de seguretat',
 'backup_tools' => 'Eines de còpia de seguretat',
 'between' => 'entre',
-'bg_BG' => '',
+'bg_BG' => 'Búlgar',
 'browse' => '',
 'calendar' => 'Calendari',
 'calendar_week' => '',
@@ -176,7 +176,7 @@ URL: [url]',
 'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
-'ca_ES' => '',
+'ca_ES' => 'Català',
 'change_assignments' => 'Canviar assignacions',
 'change_password' => '',
 'change_password_message' => '',
@@ -211,9 +211,10 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
-'clipboard' => '',
+'clipboard' => 'Portapapers',
 'close' => 'Tancar',
 'comment' => 'Comentaris',
 'comment_changed_email' => '',
@@ -244,7 +245,7 @@ URL: [url]',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Creació',
-'cs_CZ' => '',
+'cs_CZ' => 'Txec',
 'current_password' => '',
 'current_quota' => '',
 'current_state' => '',
@@ -261,7 +262,7 @@ URL: [url]',
 'delete' => 'Eliminar',
 'details' => 'Detalls',
 'details_version' => 'Detalls de la versió: [version]',
-'de_DE' => '',
+'de_DE' => 'Alemany',
 'disclaimer' => 'Aquesta és una àrea restringida. Només es permet l\'accés a usuaris autoritzats. Qualsevol intrusió es perseguirà d\'acord amb les lleis internacionals.',
 'discspace' => '',
 'document' => 'Document',
@@ -319,10 +320,11 @@ URL: [url]',
 'draft' => '',
 'draft_pending_approval' => 'Esborrany - pendent d\'aprovació',
 'draft_pending_review' => 'Esborrany - pendent de revisió',
-'drag_icon_here' => '',
+'drag_icon_here' => 'Arrossegui aquí una icona de carpeta o document',
 'dropfolder_file' => '',
-'dropupload' => '',
-'drop_files_here' => '',
+'dropfolder_folder' => '',
+'dropupload' => 'Pujada ràpida',
+'drop_files_here' => 'Dugui arxius aquí',
 'dump_creation' => 'Creació de bolcat de BDD',
 'dump_creation_warning' => 'Amb aquesta operació es crearà un bolcat a fitxer del contingut de la base de dades. Després de la creació del bolcat, el fitxer es guardarà a la carpeta de dades del seu servidor.',
 'dump_list' => 'Fitxers de bolcat existents',
@@ -354,17 +356,18 @@ URL: [url]',
 'email_not_given' => '',
 'empty_folder_list' => '',
 'empty_notify_list' => 'No hi ha entrades',
-'en_GB' => '',
+'en_GB' => 'Anglès (Regne Unit)',
 'equal_transition_states' => '',
 'error' => '',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Ha succeït un error',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
-'es_ES' => '',
+'es_ES' => 'Castellà',
 'event_details' => 'Detalls de l\'event',
 'exclude_items' => '',
 'expired' => 'Caducat',
@@ -404,7 +407,7 @@ URL: [url]',
 'friday' => 'Divendres',
 'friday_abbr' => '',
 'from' => 'Des de',
-'fr_FR' => '',
+'fr_FR' => 'Francès',
 'fullsearch' => '',
 'fullsearch_hint' => '',
 'fulltext_info' => '',
@@ -430,18 +433,19 @@ URL: [url]',
 'hook_name' => '',
 'hourly' => 'Hourly',
 'hours' => '',
-'hr_HR' => '',
+'hr_HR' => 'Croat',
 'human_readable' => 'Arxiu llegible per humans',
-'hu_HU' => '',
+'hu_HU' => 'Hongarès',
 'id' => 'ID',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
 'index_converters' => '',
-'index_folder' => '',
+'index_folder' => 'Carpeta d\'índex',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
 'inherited' => '',
@@ -474,7 +478,7 @@ URL: [url]',
 'in_workflow' => '',
 'is_disabled' => '',
 'is_hidden' => 'Amagar de la llista d\'usuaris',
-'it_IT' => '',
+'it_IT' => 'Italià',
 'january' => 'Gener',
 'js_no_approval_group' => 'Si us plau, seleccioneu grup d\'aprovació',
 'js_no_approval_status' => 'Si us plau, seleccioneu l\'estat d\'aprovació',
@@ -499,7 +503,7 @@ URL: [url]',
 'keywords' => 'Mots clau',
 'keywords_loading' => '',
 'keyword_exists' => 'El mot clau ja existeix',
-'ko_KR' => '',
+'ko_KR' => 'Coreà',
 'language' => 'Llenguatge',
 'lastaccess' => '',
 'last_update' => 'Última modificació',
@@ -576,7 +580,7 @@ URL: [url]',
 'new_subfolder_email_subject' => '',
 'new_user_image' => 'Nova imatge',
 'next_state' => '',
-'nl_NL' => '',
+'nl_NL' => 'Holandès',
 'no' => 'No',
 'notify_added_email' => 'Se us ha afegit a la llista de notificació',
 'notify_added_email_body' => '',
@@ -646,7 +650,7 @@ URL: [url]',
 'pending_reviews' => '',
 'pending_workflows' => '',
 'personal_default_keywords' => 'Mots clau personals',
-'pl_PL' => '',
+'pl_PL' => 'Polonès',
 'possible_substitutes' => '',
 'preview' => '',
 'preview_converters' => '',
@@ -654,7 +658,7 @@ URL: [url]',
 'preview_plain' => '',
 'previous_state' => '',
 'previous_versions' => 'Versions anteriors',
-'pt_BR' => '',
+'pt_BR' => 'Portuguès',
 'quota' => '',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
@@ -746,11 +750,11 @@ URL: [url]',
 'role_name' => '',
 'role_type' => '',
 'role_user' => 'User',
-'ro_RO' => '',
+'ro_RO' => 'Romanès',
 'run_subworkflow' => '',
 'run_subworkflow_email_body' => '',
 'run_subworkflow_email_subject' => '',
-'ru_RU' => '',
+'ru_RU' => 'Rus',
 'saturday' => 'Dissabte',
 'saturday_abbr' => '',
 'save' => 'Guardar',
@@ -1084,9 +1088,9 @@ URL: [url]',
 'sign_in' => 'sign in',
 'sign_out' => 'desconnectar',
 'sign_out_user' => '',
-'sk_SK' => '',
+'sk_SK' => 'Eslovac',
 'space_used_on_data_folder' => 'Espai utilitzat a la carpeta de dades',
-'splash_added_to_clipboard' => '',
+'splash_added_to_clipboard' => 'Emmagatzemat al portapapers',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
@@ -1097,14 +1101,15 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
-'splash_document_locked' => '',
-'splash_document_unlocked' => '',
+'splash_document_locked' => 'Document blocat',
+'splash_document_unlocked' => 'Document desblocat',
 'splash_edit_attribute' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
@@ -1112,8 +1117,8 @@ URL: [url]',
 'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
-'splash_rm_document' => '',
-'splash_rm_folder' => '',
+'splash_rm_document' => 'Document esborrat',
+'splash_rm_folder' => 'Carpeta esborrada',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
 'splash_rm_role' => '',
@@ -1154,14 +1159,14 @@ URL: [url]',
 'submit_revision' => '',
 'submit_userinfo' => '',
 'substitute_to_user' => '',
-'substitute_user' => '',
+'substitute_user' => 'Canviar usuari',
 'success_add_aro' => '',
 'success_add_permission' => '',
 'success_remove_permission' => '',
 'success_toogle_permission' => '',
 'sunday' => 'Diumenge',
 'sunday_abbr' => '',
-'sv_SE' => '',
+'sv_SE' => 'Suec',
 'switched_to' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
@@ -1202,12 +1207,12 @@ URL: [url]',
 'transmittal_size' => '',
 'tree_loading' => 'Espereu mentre l\'arbre de documents es carrega...',
 'trigger_workflow' => '',
-'tr_TR' => '',
+'tr_TR' => 'Turc',
 'tuesday' => 'Dimarts',
 'tuesday_abbr' => '',
 'type_of_hook' => '',
 'type_to_search' => '',
-'uk_UA' => '',
+'uk_UA' => 'Ucraïnès',
 'under_folder' => 'A carpeta',
 'unknown_attrdef' => '',
 'unknown_command' => 'Ordre no reconeguda.',
@@ -1290,7 +1295,7 @@ URL: [url]',
 'workflow_user_summary' => '',
 'year_view' => 'Vista d\'any',
 'yes' => 'Sí',
-'zh_CN' => '',
-'zh_TW' => '',
+'zh_CN' => 'Xinès (Xina)',
+'zh_TW' => 'Xina (Taiwan)',
 );
 ?>
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 4dab36009..11700687b 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Zvolte akci pracovního postupu',
 'choose_workflow_state' => 'Zvolit akci pracovního postupu',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Vyčistit schránku',
 'clear_password' => '',
 'clipboard' => 'Schránka',
@@ -368,6 +369,7 @@ URL: [url]',
 'draft_pending_review' => 'Návrh - čeká na kontrolu',
 'drag_icon_here' => 'Přetáhnout ikonu složky nebo dokumentu sem!',
 'dropfolder_file' => 'Soubor z "přetažené" složky',
+'dropfolder_folder' => '',
 'dropupload' => 'Rychlý upload',
 'drop_files_here' => 'Soubory dát sem!',
 'dump_creation' => 'Vytvoření zálohy databáze',
@@ -406,6 +408,7 @@ URL: [url]',
 'error' => 'Error',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Není vybrán žádný dokument.',
 'error_no_folder_selected' => 'Není vybrána žádná složka',
 'error_occured' => 'Vyskytla se chyba',
@@ -508,6 +511,7 @@ URL: [url]',
 'identical_version' => 'Nová verze je identická s verzí současnou',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
@@ -1244,6 +1248,7 @@ URL: [url]',
 'splash_edit_user' => 'Uživatel uložen',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Změny složky uloženy',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Neplatné ID složky',
 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 65c8543c2..9411a3ea2 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (2229), dgrutsch (21)
+//    Translators: Admin (2234), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Workflow-Aktion wählen',
 'choose_workflow_state' => 'Workflow-Status wählen',
 'class_name' => 'Klassenname',
+'clear_cache' => 'Cache löschen',
 'clear_clipboard' => 'Zwischenablage leeren',
 'clear_password' => 'Passwort löschen',
 'clipboard' => 'Zwischenablage',
@@ -373,6 +374,7 @@ URL: [url]',
 'draft_pending_review' => 'Entwurf - bevorstehende Prüfung',
 'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!',
 'dropfolder_file' => 'Datei aus Ablageordner',
+'dropfolder_folder' => 'Ordner aus Ablageordner',
 'dropupload' => 'Direkt Hochladen',
 'drop_files_here' => 'Dateien hier hin ziehen!',
 'dump_creation' => 'DB dump erzeugen',
@@ -411,6 +413,7 @@ URL: [url]',
 'error' => 'Fehler',
 'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt',
 'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung',
+'error_importfs' => 'Fehler beim Importieren aus dem Dateisystem',
 'error_no_document_selected' => 'Kein Dokument ausgewählt',
 'error_no_folder_selected' => 'Kein Ordner ausgewählt',
 'error_occured' => 'Ein Fehler ist aufgetreten. Bitte Administrator benachrichtigen.',
@@ -513,6 +516,7 @@ URL: [url]',
 'identical_version' => 'Neue Version ist identisch zu aktueller Version.',
 'import' => 'Importiere',
 'importfs' => 'Importiere aus Dateisystem',
+'import_fs' => 'Aus Dateisystem importieren',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
@@ -1281,6 +1285,7 @@ URL: [url]',
 'splash_edit_user' => 'Benutzer gespeichert',
 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste',
 'splash_folder_edited' => 'Änderungen am Ordner gespeichert',
+'splash_importfs' => '[docs] Dokumente und [folders] Ordner importiert',
 'splash_invalid_folder_id' => 'Ungültige Ordner-ID',
 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 4346e9e50..6d34a89d7 100644
--- a/languages/en_GB/lang.inc
+++ b/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 (1375), dgrutsch (7), netixw (14)
+//    Translators: Admin (1380), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Choose workflow action',
 'choose_workflow_state' => 'Choose workflow state',
 'class_name' => 'Name of class',
+'clear_cache' => 'Clear cache',
 'clear_clipboard' => 'Clear clipboard',
 'clear_password' => 'Clear password',
 'clipboard' => 'Clipboard',
@@ -373,6 +374,7 @@ URL: [url]',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Drag icon of folder or document here!',
 'dropfolder_file' => 'File from drop folder',
+'dropfolder_folder' => 'Folder from drop folder',
 'dropupload' => 'Fast upload',
 'drop_files_here' => 'Drop files here!',
 'dump_creation' => 'DB dump creation',
@@ -411,6 +413,7 @@ URL: [url]',
 'error' => 'Error',
 'error_add_aro' => 'Error while adding access request object',
 'error_add_permission' => 'Error while add permission',
+'error_importfs' => 'Error while importing form file system',
 'error_no_document_selected' => 'No document selected',
 'error_no_folder_selected' => 'No folder selected',
 'error_occured' => 'An error has occurred',
@@ -513,6 +516,7 @@ URL: [url]',
 'identical_version' => 'New version is identical to current version.',
 'import' => 'Import',
 'importfs' => 'Import from Filesystem',
+'import_fs' => 'Import from filesystem',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@@ -1282,6 +1286,7 @@ URL: [url]',
 'splash_edit_user' => 'User saved',
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
 'splash_folder_edited' => 'Save folder changes',
+'splash_importfs' => 'Imported [docs] documents and [folders] folders',
 'splash_invalid_folder_id' => 'Invalid folder ID',
 'splash_invalid_searchterm' => 'Invalid search term',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index b5145360c..85ab828bc 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleccione acción del flujo de trabajo',
 'choose_workflow_state' => 'Seleccione estado del flujo de trabajo',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Limpiar portapapeles',
 'clear_password' => '',
 'clipboard' => 'Portapapeles',
@@ -368,6 +369,7 @@ URL: [url]',
 'draft_pending_review' => 'Borrador - pendiente de revisión',
 'drag_icon_here' => 'Arrastre carpeta o documento aquí!',
 'dropfolder_file' => 'Fichero de la carpeta destino',
+'dropfolder_folder' => '',
 'dropupload' => 'Carga Rapida',
 'drop_files_here' => 'Arrastre archivos aquí!',
 'dump_creation' => 'Creación de volcado de BDD',
@@ -406,6 +408,7 @@ URL: [url]',
 'error' => 'Error',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Ningún documento seleccionado',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
 'error_occured' => 'Ha ocurrido un error',
@@ -508,6 +511,7 @@ URL: [url]',
 'identical_version' => 'La nueva versión es idéntica a la actual.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
@@ -1250,6 +1254,7 @@ URL: [url]',
 'splash_edit_user' => 'Usuario guardado',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Cambios a la carpeta guardados',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID de carpeta inválido',
 'splash_invalid_searchterm' => 'Término de búsqueda inválido',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a7e19d55b..a5a9c0f00 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Choose une action de workflow',
 'choose_workflow_state' => 'Choisir un état de workflow',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Vider le presse-papier',
 'clear_password' => '',
 'clipboard' => 'Presse-papier',
@@ -368,6 +369,7 @@ URL: [url]',
 'draft_pending_review' => 'Ebauche - En cours de correction',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
 'dropfolder_file' => 'Fichier du dossier déposé',
+'dropfolder_folder' => '',
 'dropupload' => 'Téléchargement rapide',
 'drop_files_here' => 'Glissez fichiers ici!',
 'dump_creation' => 'création sauvegarde BD',
@@ -406,6 +408,7 @@ URL: [url]',
 'error' => 'Erreur',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Aucun document sélectionné',
 'error_no_folder_selected' => 'Aucun dossier sélectionné',
 'error_occured' => 'Une erreur s\'est produite',
@@ -508,6 +511,7 @@ URL: [url]',
 'identical_version' => 'Nouvelle version identique à l\'actuelle.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
@@ -1226,6 +1230,7 @@ URL: [url]',
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
 'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 947ea9fb3..15ec56d40 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -233,6 +233,7 @@ Internet poveznica: [url]',
 'choose_workflow_action' => 'Odaberite radnju toka rada',
 'choose_workflow_state' => 'Odaberite status toka rada',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Očistite međuspremnik',
 'clear_password' => '',
 'clipboard' => 'Međuspremnik',
@@ -373,6 +374,7 @@ Internet poveznica: [url]',
 'draft_pending_review' => 'Skica - čeka pregled',
 'drag_icon_here' => 'Ovdje povuci ikonu mape ili dokumenta!',
 'dropfolder_file' => 'Datoteka iz padajuće mape',
+'dropfolder_folder' => '',
 'dropupload' => 'Zona za brzo učitavanje',
 'drop_files_here' => 'Ovdje ispusti datoteku!',
 'dump_creation' => 'Izrada odlagališta baze podataka',
@@ -411,6 +413,7 @@ Internet poveznica: [url]',
 'error' => 'Greška',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nije odabran dokument',
 'error_no_folder_selected' => 'Nije odabrana mapa',
 'error_occured' => 'Dogodila se greška',
@@ -513,6 +516,7 @@ Internet poveznica: [url]',
 'identical_version' => 'Nova verzija je identična trenutnoj verziji.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
@@ -1271,6 +1275,7 @@ Internet poveznica: [url]',
 'splash_edit_user' => 'Korisnik pohranjen',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Pohrani izmjene mape',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Nevažeći ID mape',
 'splash_invalid_searchterm' => 'Nevažeći traženi pojam',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 0367d9b3f..6106ab820 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Válasszon munkafolyamat műveletet',
 'choose_workflow_state' => 'Válasszon munkafolyamat állapotot',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Vágólap törlése',
 'clear_password' => '',
 'clipboard' => 'Vágólap',
@@ -368,6 +369,7 @@ URL: [url]',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
 'dropfolder_file' => 'Állomány a dropfolder-ből',
+'dropfolder_folder' => '',
 'dropupload' => 'Gyors feltöltés',
 'drop_files_here' => 'Húzz ide egy fájlt',
 'dump_creation' => 'Adatbázis mentés létrehozása',
@@ -406,6 +408,7 @@ URL: [url]',
 'error' => 'Hiba',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nincs kijelölt dokumentum',
 'error_no_folder_selected' => 'Nincs kijelölt mappa',
 'error_occured' => 'Hiba történt',
@@ -508,6 +511,7 @@ URL: [url]',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
@@ -1249,6 +1253,7 @@ URL: [url]',
 'splash_edit_user' => 'Felhasználó mentve',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Mappa változásainak mentése',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító',
 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 995441683..e41f7271c 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -234,6 +234,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleziona l\'azione del flusso di lavoro',
 'choose_workflow_state' => 'Seleziona lo stato del flusso di lavoro',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Cancella appunti',
 'clear_password' => '',
 'clipboard' => 'Appunti',
@@ -374,6 +375,7 @@ URL: [url]',
 'draft_pending_review' => 'Bozza - in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
 'dropfolder_file' => 'Scegli file dal server',
+'dropfolder_folder' => '',
 'dropupload' => 'Caricamento Rapido',
 'drop_files_here' => 'Trascina qui il file',
 'dump_creation' => 'Creazione del DB dump',
@@ -412,6 +414,7 @@ URL: [url]',
 'error' => 'Errore',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nessun documento selezionato',
 'error_no_folder_selected' => 'Nessuna cartella selezionata',
 'error_occured' => 'Ooops... Si è verificato un errore',
@@ -514,6 +517,7 @@ URL: [url]',
 'identical_version' => 'La nuova versione è identica a quella attuale.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
@@ -1273,6 +1277,7 @@ URL: [url]',
 'splash_edit_user' => 'Utente modificato',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Cartella modificata',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID cartella non valido',
 'splash_invalid_searchterm' => 'Termine di ricerca non valido',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index c99713149..be202de64 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -235,6 +235,7 @@ URL: [url]',
 'choose_workflow_action' => '워크플로우 작업 선택',
 'choose_workflow_state' => '워크플로우 상태 선택',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '클립 보드 제거',
 'clear_password' => '',
 'clipboard' => '클립보드',
@@ -373,6 +374,7 @@ URL: [url]',
 'draft_pending_review' => '초안 - 검토 대기',
 'drag_icon_here' => '여기에 폴더 나 문서의 아이콘을 끌어!',
 'dropfolder_file' => '드롭 폴더 파일',
+'dropfolder_folder' => '',
 'dropupload' => '빠른 업로드',
 'drop_files_here' => '이곳에 파일을 올려놓으세요!',
 'dump_creation' => 'DB 덤프 생성',
@@ -411,6 +413,7 @@ URL: [url]',
 'error' => '오류',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '선택되지 문서는',
 'error_no_folder_selected' => '어떤 폴더를 선택하지',
 'error_occured' => '오류가 발생했습니다',
@@ -513,6 +516,7 @@ URL: [url]',
 'identical_version' => '새 버전은 최신 버전으로 동일하다.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '서브 디렉토리를 포함',
@@ -1264,6 +1268,7 @@ URL : [url]',
 'splash_edit_user' => '사용자 저장',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '저장 폴더 변경',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '잘못된 폴더 ID',
 'splash_invalid_searchterm' => '잘못된 검색 범위',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index a0dcdf713..4ce8ffa3e 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -226,6 +226,7 @@ URL: [url]',
 'choose_workflow_action' => 'Kies workflow actie',
 'choose_workflow_state' => 'kiest workflowstatus',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Vrijgeven klembord',
 'clear_password' => '',
 'clipboard' => 'Klembord',
@@ -366,6 +367,7 @@ URL: [url]',
 'draft_pending_review' => 'Draft - in afwachting van controle',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
 'dropfolder_file' => 'Bestand van dropfolder',
+'dropfolder_folder' => '',
 'dropupload' => 'Snel toevoegen',
 'drop_files_here' => 'Sleep bestanden hierheen!',
 'dump_creation' => 'DB dump aanmaken',
@@ -404,6 +406,7 @@ URL: [url]',
 'error' => 'Fout',
 'error_add_aro' => 'Verzoek om toegang toegevoegd',
 'error_add_permission' => 'Voeg permissie toe',
+'error_importfs' => '',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
 'error_occured' => 'Er is een fout opgetreden',
@@ -506,6 +509,7 @@ URL: [url]',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
@@ -1277,6 +1281,7 @@ URL: [url]',
 'splash_edit_user' => 'Gebruiker opgeslagen',
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 7d3142eb6..ebb5048de 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -221,6 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Wybierz działanie procesu',
 'choose_workflow_state' => 'Wybierz stan obiegu',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Oczyść schowek',
 'clear_password' => '',
 'clipboard' => 'Schowek',
@@ -361,6 +362,7 @@ URL: [url]',
 'draft_pending_review' => 'Szkic - w oczekiwaniu na opinię',
 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!',
 'dropfolder_file' => 'Plik z folderu rozwijanego',
+'dropfolder_folder' => '',
 'dropupload' => 'Szybki upload',
 'drop_files_here' => 'Przeciągnij tu pliki!',
 'dump_creation' => 'Utworzenie zrzutu bazy danych',
@@ -399,6 +401,7 @@ URL: [url]',
 'error' => 'Błąd',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Brak wybranych dokumentów',
 'error_no_folder_selected' => 'Brak wybranych katalogów',
 'error_occured' => 'Wystąpił błąd',
@@ -501,6 +504,7 @@ URL: [url]',
 'identical_version' => 'Nowa wersja jest identyczna z obecną',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
@@ -1229,6 +1233,7 @@ URL: [url]',
 'splash_edit_user' => 'Zapisano użytkownika',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Zapisz zmiany folderu',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu',
 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index d67ef7d1d..a3fc5767d 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Escolha a ação de fluxo de trabalho',
 'choose_workflow_state' => 'Escolha um estado de fluxo de trabalho',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Limpar área de transferência',
 'clear_password' => '',
 'clipboard' => 'Área de transferência',
@@ -367,6 +368,7 @@ URL: [url]',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
+'dropfolder_folder' => '',
 'dropupload' => 'Upload rápido',
 'drop_files_here' => 'Solte os arquivos aqui!',
 'dump_creation' => 'DB dump creation',
@@ -405,6 +407,7 @@ URL: [url]',
 'error' => 'Erro',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nenhum documento selecionado',
 'error_no_folder_selected' => 'Nenhuma pasta selecionada',
 'error_occured' => 'Ocorreu um erro',
@@ -507,6 +510,7 @@ URL: [url]',
 'identical_version' => 'Nova versão é idêntica à versão atual.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@@ -1247,6 +1251,7 @@ URL: [url]',
 'splash_edit_user' => 'Usuário salvo',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Salvar modificação de pastas',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID de pasta inválida',
 'splash_invalid_searchterm' => 'Termo de pesquisa inválido',
 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index e52db2a16..8d9c915c8 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Alege acțiune workflow',
 'choose_workflow_state' => 'Alege stare workflow',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Goleste clipboard',
 'clear_password' => '',
 'clipboard' => 'Clipboard',
@@ -373,6 +374,7 @@ URL: [url]',
 'draft_pending_review' => 'Proiect - în așteptarea revizuirii',
 'drag_icon_here' => 'Trageți iconul de folder sau document aici!',
 'dropfolder_file' => 'Fișiere din folderele aruncate (File from drop folder)',
+'dropfolder_folder' => '',
 'dropupload' => 'Încărcare rapidă',
 'drop_files_here' => 'Aruncă fișierele aici!',
 'dump_creation' => 'Creare fisier imagine baza de date',
@@ -411,6 +413,7 @@ URL: [url]',
 'error' => 'Eroare',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nici un document selectat',
 'error_no_folder_selected' => 'Nici un folder selectat',
 'error_occured' => 'An error has occured',
@@ -513,6 +516,7 @@ URL: [url]',
 'identical_version' => 'Noua versiune este identică cu versiunea curentă.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
@@ -1272,6 +1276,7 @@ URL: [url]',
 'splash_edit_user' => 'Utilizator salvat',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Salvați modificările folderului',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID folder invalid',
 'splash_invalid_searchterm' => 'Termen de căutare invalid',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 866fb5f51..9ab65dcb6 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Выберите действие процесса',
 'choose_workflow_state' => 'Выберите статус процесса',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Очистить буфер обмена',
 'clear_password' => '',
 'clipboard' => 'Буфер обмена',
@@ -373,6 +374,7 @@ URL: [url]',
 'draft_pending_review' => '<b>Черновик</b> — ожидает рецензии',
 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.',
 'dropfolder_file' => 'Файл из проходного каталога',
+'dropfolder_folder' => '',
 'dropupload' => 'Быстрая загрузка',
 'drop_files_here' => 'Переместите файлы сюда',
 'dump_creation' => 'Создать дамп БД',
@@ -411,6 +413,7 @@ URL: [url]',
 'error' => 'Ошибка',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Нет выбранных документов',
 'error_no_folder_selected' => 'Нет выбранных каталогов',
 'error_occured' => 'Произошла ошибка',
@@ -513,6 +516,7 @@ URL: [url]',
 'identical_version' => 'Новая версия идентична текущей.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
@@ -1279,6 +1283,7 @@ URL: [url]',
 'splash_edit_user' => 'Пользователь сохранён',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Изменения каталога сохранены',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Неверный идентификатор каталога',
 'splash_invalid_searchterm' => 'Неверный поисковый запрос',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index eabead7b7..5bc5df98d 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -210,6 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => 'Schránka',
@@ -320,6 +321,7 @@ URL: [url]',
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument',
 'dropfolder_file' => '',
+'dropfolder_folder' => '',
 'dropupload' => 'Rýchlo nahraj',
 'drop_files_here' => 'Sem vložte súbory!',
 'dump_creation' => 'Vytvorenie výstupu DB',
@@ -358,6 +360,7 @@ URL: [url]',
 'error' => 'Chyba',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Vyskytla sa chyba',
@@ -436,6 +439,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
@@ -1104,6 +1108,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 57ba94b2a..6ea04e272 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -221,6 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Välj åtgärd för arbetsflödet',
 'choose_workflow_state' => 'Välj status för arbetsflödet',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Rensa urklipp',
 'clear_password' => '',
 'clipboard' => 'Urklipp',
@@ -361,6 +362,7 @@ URL: [url]',
 'draft_pending_review' => 'Utkast: väntar på granskning',
 'drag_icon_here' => 'Dra ikon av mappen eller dokument hit!',
 'dropfolder_file' => 'Fil från mellanlagrings-mappen',
+'dropfolder_folder' => '',
 'dropupload' => 'Snabb uppladdning',
 'drop_files_here' => 'Släpp filer här!',
 'dump_creation' => 'Skapa DB-dump',
@@ -399,6 +401,7 @@ URL: [url]',
 'error' => 'Fel',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Inget dokument har valts',
 'error_no_folder_selected' => 'Ingen katalog har valts',
 'error_occured' => 'Ett fel har inträffat.',
@@ -501,6 +504,7 @@ URL: [url]',
 'identical_version' => 'Ny version är lika med den aktuella versionen.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
@@ -1235,6 +1239,7 @@ URL: [url]',
 'splash_edit_user' => 'Användare sparat',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Spara katalog ändringar',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Ogiltigt katalog ID',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuella katalogen',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 37fe960a3..647400bb7 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -227,6 +227,7 @@ URL: [url]',
 'choose_workflow_action' => 'İş akış eylemi seçiniz',
 'choose_workflow_state' => 'İş akış durumunu seçiniz',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Panoyu temizle',
 'clear_password' => '',
 'clipboard' => 'Pano',
@@ -367,6 +368,7 @@ URL: [url]',
 'draft_pending_review' => 'Taslak - kontrol bekliyor',
 'drag_icon_here' => 'Klasör veya dokümanın ikonunu buraya sürükleyin!',
 'dropfolder_file' => 'Sürüklenen klasörden dosya',
+'dropfolder_folder' => '',
 'dropupload' => 'Hızlı yükleme',
 'drop_files_here' => 'Dosyaları buraya sürükleyin!',
 'dump_creation' => 'Veritabanı dump oluşturma',
@@ -405,6 +407,7 @@ URL: [url]',
 'error' => 'Hata',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Hiçbir doküman seçilmedi',
 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi',
 'error_occured' => 'Bir hata oluştu',
@@ -507,6 +510,7 @@ URL: [url]',
 'identical_version' => 'Yeni versiyon güncel versiyonla aynı.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
@@ -1251,6 +1255,7 @@ URL: [url]',
 'splash_edit_user' => 'Kullanıcı kaydedildi',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Klasör değişiklikleri kaydedildi',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Hatalı klasör ID',
 'splash_invalid_searchterm' => 'Hatalı arama terimi',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 427db7e91..bf2b3ae13 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Оберіть дію процесу',
 'choose_workflow_state' => 'Оберіть статус процесу',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Очистити буфер обміну',
 'clear_password' => '',
 'clipboard' => 'Буфер обміну',
@@ -373,6 +374,7 @@ URL: [url]',
 'draft_pending_review' => '<b>Чернетка</b> — Очікує на рецензію',
 'drag_icon_here' => 'Перетягніть сюди значок документа чи каталогу',
 'dropfolder_file' => 'Файл з прохідного каталогу',
+'dropfolder_folder' => '',
 'dropupload' => 'Швидке завантаження',
 'drop_files_here' => 'Перемістіть файли сюди',
 'dump_creation' => 'Створити дамп БД',
@@ -411,6 +413,7 @@ URL: [url]',
 'error' => 'Помилка',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Немає вибраних документів',
 'error_no_folder_selected' => 'Немає вибраних каталогів',
 'error_occured' => 'Виникла помилка',
@@ -513,6 +516,7 @@ URL: [url]',
 'identical_version' => 'Нова версія ідентична поточній.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
@@ -1272,6 +1276,7 @@ URL: [url]',
 'splash_edit_user' => 'Користувача збережено',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Зміни каталогу збережено',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталогу',
 'splash_invalid_searchterm' => 'Невірний пошуковий запит',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 22a8c05e8..1fcb4b71a 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -210,6 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '清除粘贴板',
 'clear_password' => '',
 'clipboard' => '剪切板',
@@ -322,6 +323,7 @@ URL: [url]',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
 'dropfolder_file' => '所选文件夹的文件',
+'dropfolder_folder' => '',
 'dropupload' => '快速上传',
 'drop_files_here' => '拖入这里',
 'dump_creation' => '转储数据',
@@ -360,6 +362,7 @@ URL: [url]',
 'error' => '错误',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
 'error_occured' => '出错',
@@ -438,6 +441,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
@@ -1106,6 +1110,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index c2fc5c10b..77d55aeb6 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -210,6 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '選擇流程行為',
 'choose_workflow_state' => '選擇流程狀態',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '清除剪貼簿',
 'clear_password' => '',
 'clipboard' => '剪貼簿',
@@ -320,6 +321,7 @@ URL: [url]',
 'draft_pending_review' => '待校對',
 'drag_icon_here' => '拖動圖示到這裡',
 'dropfolder_file' => '',
+'dropfolder_folder' => '',
 'dropupload' => '快速上傳',
 'drop_files_here' => '拖入這裡',
 'dump_creation' => '轉儲數據',
@@ -358,6 +360,7 @@ URL: [url]',
 'error' => '',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '請選擇文檔',
 'error_no_folder_selected' => '請選擇資料夾',
 'error_occured' => '出錯',
@@ -436,6 +439,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
 'include_content' => '',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',
@@ -1104,6 +1108,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',

From 1c09327bc0d71f9a284215d9cee4f75cfed79a84 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 May 2016 08:21:21 +0200
Subject: [PATCH 33/76] add preview function for audio files (not activated)

---
 views/bootstrap/class.ViewDocument.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 4949113d6..565b48f87 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -127,6 +127,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->printDocumentChooserJs("form1");
 	} /* }}} */
 
+	function preview() { /* {{{ */
+		$document = $this->params['document'];
+		$latestContent = $document->getLatestContent();
+		switch($latestContent->getMimeType()) {
+		case 'audio/mpeg':
+		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 $latestContent->getVersion(); ?>" type="audio/mpeg">
+		</audio>
+<?php
+			break;
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -313,6 +330,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</table>
 <?php
 		$this->contentContainerEnd();
+//		$this->preview();
 ?>
 </div>
 <div class="span9">

From f894ac441a1c9560ab922bd336e643b2463d3409 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 May 2016 10:18:41 +0200
Subject: [PATCH 34/76] add methods get[Folder|Document]Attributes

---
 restapi/index.php | 57 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 1cb64a9e3..a2b17da90 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -215,6 +215,29 @@ function getFolderPath($id) { /* {{{ */
 	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
+function getFolderAttributes($id) { /* {{{ */
+	global $app, $dms, $userobj;
+	$folder = $dms->getFolder($id);
+
+	if($folder) {
+		if ($folder->getAccessMode($userobj) >= M_READ) {
+			$recs = array();
+			$attributes = $folder->getAttributes();
+			foreach($attributes as $attribute) {
+				$recs[] = array(
+					'id'=>$attribute->getId(),
+					'value'=>$attribute->getValue(),
+					'name'=>$attribute->getAttributeDefinition()->getName(),
+				);
+			}
+			$app->response()->header('Content-Type', 'application/json');
+			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+		} else {
+			$app->response()->status(404);
+		}
+	}
+} /* }}} */
+
 function getFolderChildren($id) { /* {{{ */
 	global $app, $dms, $userobj;
 	if($id == 0) {
@@ -649,6 +672,29 @@ function getDocumentLinks($id) { /* {{{ */
 	}
 } /* }}} */
 
+function getDocumentAttributes($id) { /* {{{ */
+	global $app, $dms, $userobj;
+	$document = $dms->getDocument($id);
+
+	if($document) {
+		if ($document->getAccessMode($userobj) >= M_READ) {
+			$recs = array();
+			$attributes = $document->getAttributes();
+			foreach($attributes as $attribute) {
+				$recs[] = array(
+					'id'=>$attribute->getId(),
+					'value'=>$attribute->getValue(),
+					'name'=>$attribute->getAttributeDefinition()->getName(),
+				);
+			}
+			$app->response()->header('Content-Type', 'application/json');
+			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+		} else {
+			$app->response()->status(404);
+		}
+	}
+} /* }}} */
+
 function getAccount() { /* {{{ */
 	global $app, $dms, $userobj;
 	if($userobj) {
@@ -838,8 +884,7 @@ function doSearchByAttr() { /* {{{ */
 	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
 } /* }}} */
 
-function checkIfAdmin()
-{
+function checkIfAdmin() { /* {{{ */
     global $app, $dms, $userobj;
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
@@ -853,8 +898,7 @@ function checkIfAdmin()
     }
 
     return true;
-}
-
+} /* }}} */
 
 function createAccount() { /* {{{ */
     global $app, $dms, $userobj;
@@ -1063,7 +1107,7 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
 
 function addUserToGroup($id) { /* {{{ */
     changeGroupMembership($id, 'add');
-}
+} /* }}} */
 
 function removeUserFromGroup($id) { /* {{{ */
     changeGroupMembership($id, 'remove');   
@@ -1231,7 +1275,6 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
-
 function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1289,6 +1332,7 @@ $app->delete('/folder/:id', 'deleteFolder');
 $app->get('/folder/:id/children', 'getFolderChildren');
 $app->get('/folder/:id/parent', 'getFolderParent');
 $app->get('/folder/:id/path', 'getFolderPath');
+$app->get('/folder/:id/attributes', 'getFolderAttributes');
 $app->post('/folder/:id/createfolder', 'createFolder');
 $app->put('/folder/:id/document', 'uploadDocument');
 $app->get('/document/:id', 'getDocument');
@@ -1300,6 +1344,7 @@ $app->get('/document/:id/version/:version', 'getDocumentVersion');
 $app->get('/document/:id/files', 'getDocumentFiles');
 $app->get('/document/:id/file/:fileid', 'getDocumentFile');
 $app->get('/document/:id/links', 'getDocumentLinks');
+$app->get('/document/:id/attributes', 'getDocumentAttributes');
 $app->put('/account/fullname', 'setFullName');
 $app->put('/account/email', 'setEmail');
 $app->get('/account/locked', 'getLockedDocuments');

From 0006416b7e48c00c53c18b8c0fa82e7a2eaf335b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 May 2016 09:19:46 +0200
Subject: [PATCH 35/76] add class table-hover to table

---
 views/bootstrap/class.Search.php     | 2 +-
 views/bootstrap/class.ViewFolder.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index aa35708bc..b9ba05620 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -450,7 +450,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 
-			print "<table class=\"table\">";
+			print "<table class=\"table table-hover\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";
 			print "<th>".getMLText("name")."</th>\n";
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 5c2cddc39..907a7863f 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -248,7 +248,7 @@ function folderSelected(id, name) {
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
 		if ((count($subFolders) > 0)||(count($documents) > 0)){
-			print "<table id=\"viewfolder-table\" class=\"table\">";
+			print "<table id=\"viewfolder-table\" class=\"table table-hover\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";	
 			print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"&orderby=s":"&orderby=n")."\">".getMLText("name")."</a></th>\n";

From 66039b6df2e8ee7281c492883aa3979d284d90f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 May 2016 09:20:05 +0200
Subject: [PATCH 36/76] add thead and tbody

---
 views/bootstrap/class.SubstituteUser.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index b5bb37f37..72cc53412 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -48,7 +48,10 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 ?>
 	<table class="table table-condensed">
-	  <tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
+		<thead>
+		<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
+		</thead>
+		<tbody>
 <?php
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
@@ -76,6 +79,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "</tr>";
 		}
+		echo "</tbody>";
 		echo "</table>";
 		$this->contentContainerEnd();
 

From 563dd3d22410ba73fdb8d8e468d5ebd520b0f7c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 12:29:14 +0200
Subject: [PATCH 37/76] add some missing translations

---
 languages/tr_TR/lang.inc | 10 +++++-----
 languages/zh_CN/lang.inc |  4 ++--
 languages/zh_TW/lang.inc | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 647400bb7..dfbc7d431 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/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 (1032), aydin (83)
+//    Translators: Admin (1036), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -52,7 +52,7 @@ URL: [url]',
 'add_approval' => 'Onay ver',
 'add_document' => 'Doküman ekle',
 'add_document_link' => 'Link ekle',
-'add_document_notify' => '',
+'add_document_notify' => 'Hatırlatma ekte',
 'add_doc_reviewer_approver_warning' => 'NOT: Dokümanlara onay veren veya gözden geçiren kimse atanmamışsa otomatik olarak yayınlanırlar.',
 'add_doc_workflow_warning' => 'NOT: Dokümanlara iş akışı atanmamışsa otomatik olarak yayınlanırlar.',
 'add_event' => 'Etkinlik ekle',
@@ -571,7 +571,7 @@ URL: [url]',
 'keep' => 'Değiştirmeyin',
 'keep_doc_status' => 'Doküman durumunu değiştirme',
 'keywords' => 'Anahtar kelimeler',
-'keywords_loading' => '',
+'keywords_loading' => 'Anahtar sözcük listesi yüklenene kadar lütfen bekleyin...',
 'keyword_exists' => 'Anahtar kelime zaten mevcut',
 'ko_KR' => 'Korece',
 'language' => 'Dil',
@@ -929,12 +929,12 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Gruplar için hatırlatma seçmek için tıklayın',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Bireysel onaylanı seçmek için tıklayın',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Bireysel hatırlatma seçmek için tıklayın',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
 'select_ind_revisors' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 1fcb4b71a..2374fcf79 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/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 (632), fengjohn (5)
+//    Translators: Admin (633), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -882,7 +882,7 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '开启邮件',
 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒',
-'settings_enableFolderTree' => '',
+'settings_enableFolderTree' => '开启目录树',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '允许全文搜索',
 'settings_enableFullSearch_desc' => '允许全文搜索',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 77d55aeb6..49031bad4 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/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 (2355)
+//    Translators: Admin (2359)
 
 $text = array(
 'accept' => '接受',
@@ -125,12 +125,12 @@ URL: [url]',
 'attrdef_objtype' => '類別',
 'attrdef_regex' => '規則運算式',
 'attrdef_type' => '類型',
-'attrdef_type_boolean' => '',
+'attrdef_type_boolean' => '布林數',
 'attrdef_type_date' => '日期',
 'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
+'attrdef_type_float' => '浮點數',
+'attrdef_type_int' => '整數',
+'attrdef_type_string' => '字串',
 'attrdef_type_url' => '',
 'attrdef_valueset' => '屬性值',
 'attributes' => '屬性',

From 6ba8013d40a6c19a330c86de55a63b48d046bc01 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 13:15:50 +0200
Subject: [PATCH 38/76] add option to unlink file in drop folder once uploaded

---
 inc/inc.ClassSettings.php          | 4 ++++
 languages/ar_EG/lang.inc           | 2 ++
 languages/bg_BG/lang.inc           | 2 ++
 languages/ca_ES/lang.inc           | 2 ++
 languages/cs_CZ/lang.inc           | 2 ++
 languages/de_DE/lang.inc           | 4 +++-
 languages/en_GB/lang.inc           | 4 +++-
 languages/es_ES/lang.inc           | 2 ++
 languages/fr_FR/lang.inc           | 2 ++
 languages/hr_HR/lang.inc           | 2 ++
 languages/hu_HU/lang.inc           | 2 ++
 languages/it_IT/lang.inc           | 2 ++
 languages/ko_KR/lang.inc           | 2 ++
 languages/nl_NL/lang.inc           | 2 ++
 languages/pl_PL/lang.inc           | 2 ++
 languages/pt_BR/lang.inc           | 2 ++
 languages/ro_RO/lang.inc           | 2 ++
 languages/ru_RU/lang.inc           | 2 ++
 languages/sk_SK/lang.inc           | 2 ++
 languages/sv_SE/lang.inc           | 2 ++
 languages/tr_TR/lang.inc           | 2 ++
 languages/uk_UA/lang.inc           | 2 ++
 languages/zh_CN/lang.inc           | 2 ++
 languages/zh_TW/lang.inc           | 2 ++
 op/op.AddDocument.php              | 5 +++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 27 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 787eab059..af8c14ccc 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -85,6 +85,8 @@ class Settings { /* {{{ */
 	var $_luceneDir = null;
 	// Where the drop folders are located
 	var $_dropFolderDir = null;
+	// enable removal of file from dropfolder after success import
+	var $_removeFromDropFolder = false;
 	// Where the stop word file is located
 	var $_stopWordsFile = null;
 	// enable/disable lucene fulltext search
@@ -529,6 +531,7 @@ class Settings { /* {{{ */
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 		$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
 		$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
+		$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
 
 		// XML Path: /configuration/advanced/notification
 		$node = $xml->xpath('/configuration/advanced/notification');
@@ -795,6 +798,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
     $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
+    $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);
 
     // XML Path: /configuration/advanced/notification
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'notification');
diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index fe8538991..a547b2981 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1144,6 +1144,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 11767daeb..8b1223ded 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -1009,6 +1009,8 @@ $text = array(
 'settings_printDisclaimer_desc' => 'Ако е включено, то дисклаймер из lang.inc ще се показва под всяка страница',
 'settings_quota' => 'Квота за потребител',
 'settings_quota_desc' => 'Максималният брой байтове, които всеки потребител може да заема на диска. 0 за неограничено използване на диска. Тази стойност може да бъде презаписана за всяко използване на профила.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ограничен достъп',
 'settings_restricted_desc' => 'Разреши вход за потребители, само ако имат съотв. запис в БД (независимо от успешния вход чрез LDAP)',
 'settings_rootDir' => 'Корнева папка',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index a89331017..147b5c3cf 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1014,6 +1014,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 11700687b..2aa2773fb 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1153,6 +1153,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => 'Kvóta uživatele',
 'settings_quota_desc' => 'Maximální počet bytů na disku, který může uživatel použít. Nula znamená neomezený prostor. Tato hodnota může být přepsána pro každé použití jeho profilu.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Restricted access',
 'settings_restricted_desc' => '',
 'settings_rootDir' => 'Root directory',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 9411a3ea2..4f4d5b855 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (2234), dgrutsch (21)
+//    Translators: Admin (2236), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -1190,6 +1190,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Anwählen, um die rechtlichen Hinweise am Ende jeder Seite anzuzeigen.',
 'settings_quota' => 'User\'s quota',
 'settings_quota_desc' => 'Die maximale Anzahl Bytes, die ein Benutzer belegen darf. Setzen Sie diesen Wert auf 0 für unbeschränkten Plattenplatz. Dieser Wert kann individuell in den Benutzereinstellungen überschrieben werden.',
+'settings_removeFromDropFolder' => 'Datei aus Ablageordner nach erfolgreichem Hochladen löschen',
+'settings_removeFromDropFolder_desc' => 'Schalten Sie dies ein, wenn eine Datei aus dem Ablageordner nach erfolgreichem Hochladen gelöscht werden soll.',
 'settings_restricted' => 'Beschränkter Zugriff',
 'settings_restricted_desc' => 'Nur Benutzer, die einen Eintrag in der Benutzerdatenbank haben dürfen sich anmelden (unabhängig von einer erfolgreichen Authentifizierung über LDAP)',
 'settings_rootDir' => 'Wurzelverzeichnis',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 6d34a89d7..92b6a81d5 100644
--- a/languages/en_GB/lang.inc
+++ b/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 (1380), dgrutsch (7), netixw (14)
+//    Translators: Admin (1383), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -1191,6 +1191,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page',
 'settings_quota' => 'User\'s quota',
 'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each user in his profile.',
+'settings_removeFromDropFolder' => 'Remove file from drop folder after successful upload',
+'settings_removeFromDropFolder_desc' => 'Enable this, if a file taken from the drop folder shall be deleted after successful upload.',
 'settings_restricted' => 'Restricted access',
 'settings_restricted_desc' => 'Only allow users to log in if they have an entry in the local database (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root directory',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 85ab828bc..8a389e807 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1159,6 +1159,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Si es Verdadero el mensaje de renuncia de los ficheros lang.inc se mostratá al final de la página',
 'settings_quota' => 'Cuota de usuario',
 'settings_quota_desc' => 'El número máximo de bytes que el usuario puede ocupar en disco. Asignar 0 para no limitar el espacio de disco. Este valor puede ser sobreescrito por cada uso en su perfil.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Acceso restringido',
 'settings_restricted_desc' => 'Solo permitir conectar a usuarios si tienen alguna entrada en la base de datos local (independientemente de la autenticación correcta con LDAP)',
 'settings_rootDir' => 'Carpeta raíz',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a5a9c0f00..2bd724143 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1135,6 +1135,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'If true the disclaimer message the lang.inc files will be print on the bottom of the page',
 'settings_quota' => 'Quota de l\'utilisateur',
 'settings_quota_desc' => 'Le maximum de bytes qu\'un utilisateur peut utiliser sur le disque. Définir à 0 pour un espace illimité. Cette valeur peut être outrepasser pour chaque utilisation dans son profile.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Accès restreint',
 'settings_restricted_desc' => 'Autoriser les utilisateurs à se connecter seulement s\'ils ont une entrée dans la BD locale (independamment d\'une authentification réussie avec LDAP)',
 'settings_rootDir' => 'Répertoire racine',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 15ec56d40..c0dcd7f9a 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -1180,6 +1180,8 @@ Internet poveznica: [url]',
 'settings_printDisclaimer_desc' => 'Ako je omogućeno, poruka odricanja od odgovornosti će se ispisati na dnu svake stranice',
 'settings_quota' => 'Korisnička kvota',
 'settings_quota_desc' => 'Maksimalni broj bajtova na disku koji korisnik može koristiti. Postavite na 0 za neograničeni prostor na disku. Ova vrijednost može biti postavljena svakom korisniku u njegovom profilu.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ograničeni pristup',
 'settings_restricted_desc' => 'Omogući prijavu korisnicima samo ako imaju pristup u lokalnu bazu podataka (bez obzira na uspješnu autentifikaciju s LDAP-om)',
 'settings_rootDir' => 'Root mapa',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 6106ab820..c3a105f52 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1158,6 +1158,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Ha igaz a nyilatkozat üzenet a lang.inc állományok lesznek kiíratva a lap alján',
 'settings_quota' => 'Felhasználói kvóta',
 'settings_quota_desc' => 'A felhasználó által a lemezen használható bájtok legnagyobb száma. Állítsa 0-ra a korlátlan lemezterülethez. Ez az érték felülírható valamennyi felhasználó saját profiljában.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Korlátozott hozzáférés',
 'settings_restricted_desc' => 'Kizárólag azok a felhasználók jelentkezhetnek be, akik a helyi adatbázisban vannak (függetlenül a sikeres LDAP azonosítástól)',
 'settings_rootDir' => 'Gyökérkönyvtár',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index e41f7271c..d77d0a918 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1182,6 +1182,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.',
 'settings_quota' => 'Quota utente',
 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Accesso limitato',
 'settings_restricted_desc' => 'Permette agli utenti di entrare nel sistema soltanto se hanno un record nel database locale (ignora l\'autenticazione positiva attraverso LDAP)',
 'settings_rootDir' => 'Cartella principale',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index be202de64..fbbb78c4f 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1173,6 +1173,8 @@ URL : [url]',
 'settings_printDisclaimer_desc' => '활성인 경우 메시지 내역이 모든 페이지의 하단에 출력됩니다',
 'settings_quota' => '사용자의 할당량',
 'settings_quota_desc' => '사용자가 디스크를 사용할 수 있습니다 최대 바이트 수. 무제한 디스크 공간 사용시 0으로 설정합니다. 각각 자신의 프로필에 사용을 위해이 값은 변경 할 수 있습니다.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '제한된 액세스',
 'settings_restricted_desc' => '로컬 데이터베이스에 항목이있는 경우만 사용자가 로그인 할 수 있습니다. (LDAP 인증에 관계없이 )',
 'settings_rootDir' => '루트 디렉토리',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 4ce8ffa3e..f553a0b7f 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -1186,6 +1186,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
 'settings_quota' => 'Gebruikersquotum',
 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Beperkte toegang',
 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)',
 'settings_rootDir' => 'Basismap',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index ebb5048de..7a46bbc55 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1138,6 +1138,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Zaznaczenie tej opcji spowoduje, że na dole strony będzie wyświetlany komunikat zrzeczenia się zawarty w pliku lang.inc.',
 'settings_quota' => 'Przydział dysku użytkownika',
 'settings_quota_desc' => 'Maksymalna liczba bajtów jaką użytkownik może wykorzystać na dysku. Ustaw na 0 dla nieograniczonej przestrzeni dyskowej. Wartość ta może być zastąpiona dla każdego zastosowania w swoim profilu.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ograniczony dostęp',
 'settings_restricted_desc' => 'Mogą zalogować się tylko ci użytkownicy, którzy mają swoje wpisy w lokalnej bazie danych (niezależnie od pomyślnego uwierzytelnienia w LDAP)',
 'settings_rootDir' => 'Katalog główny',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index a3fc5767d..5ac68dbb9 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1156,6 +1156,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Se for verdade a mensagem de aviso de isenção os arquivos lang.inc será impresso na parte inferior da página',
 'settings_quota' => 'Quota do Usuário',
 'settings_quota_desc' => 'O número máximo de bytes que um utilizador pode usar no disco. Defina para 0 para o espaço em disco ilimitado. Este valor pode ser substituído para cada uso em seu perfil.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'acesso restrito',
 'settings_restricted_desc' => 'Só permitir que os usuários façam login se eles têm uma entrada no banco de dados local (independentemente de autenticação bem-sucedida com LDAP)',
 'settings_rootDir' => 'Diretório raiz',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 8d9c915c8..165a0e065 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1181,6 +1181,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Dacă este setat, mesajul de Disclaimer din fișierele lang.inc va fi printat în partea de jos a paginii',
 'settings_quota' => 'Spatiu alocat utilizator',
 'settings_quota_desc' => 'Numărul maxim de bytes pe care un utilizator  îi poate folosi pe disc. Setați această opțiune pe 0 pentru spatiu pe disc nelimitat. Această valoare poate fi suprascrisă în profilul fiecărui utilizăr.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Acces restricționat',
 'settings_restricted_desc' => 'Permite utilizatorilor să se autentifice doar dacă au o intrare în baza de date locală (indiferent de autentificarea cu succes folosind LDAP)',
 'settings_rootDir' => 'Director rădăcină',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 9ab65dcb6..772003095 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1188,6 +1188,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.',
 'settings_quota' => 'Квота пользователя',
 'settings_quota_desc' => 'Максимально количество байт, которые пользователь может использовать на дисковом пространстве. Значение 0 снимает ограничение на используемое дисковое пространство. Это значение может быть указано отдельно для каждого пользователя в его профиле.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ограниченный доступ',
 'settings_restricted_desc' => 'Разрешать вход пользователям, только если у них есть соответствующая учётная запись в БД (независимо от успешного входа через LDAP).',
 'settings_rootDir' => 'Корневой каталог',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 5bc5df98d..c5fae7449 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1013,6 +1013,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 6ea04e272..7dd6dd4b1 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -1144,6 +1144,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Om denna inställning sätts till ja, används meddelande som finns i lang.inc-filen och skrivs ut på slutet av sidan',
 'settings_quota' => 'Användarens kvot',
 'settings_quota_desc' => 'Maximala storlek av minnet i bytes som en användare har tillgång till. Storlek 0 bytes betyder obegränsad minne. Detta värde kan sättas individuellt för varje användare i dess profil.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Begränsad behörighet',
 'settings_restricted_desc' => 'Tillåt användare att logga in bara om det finns en inloggning för användaren i den lokala databasen (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root-mapp',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index dfbc7d431..cfcc6bb4f 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1160,6 +1160,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Seçildiğinde sayfanın en altında lang.inc dosyasındaki gizlilik notu yazılacak',
 'settings_quota' => 'Kullanıcı kotası',
 'settings_quota_desc' => 'Kullanıcının yükleyebileceği maksimum dosya boyutu (byte cinsinden). Sınırsız kota için 0 girilir.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Kısıtlı erişim',
 'settings_restricted_desc' => '(LDAP kullanıcısı olarak giriş yapılmış olunsa da) Sadece yerel veritabanında kullanıcı hesabı olanların girişine izin verilir.',
 'settings_rootDir' => 'Kök dizin',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index bf2b3ae13..7ca16f376 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1181,6 +1181,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Якщо увімкнено, то попередження з lang.inc буде виводитися внизу кожної сторінки.',
 'settings_quota' => 'Квота користувача',
 'settings_quota_desc' => 'Максимальна кількість байт, Які користувач може використовувати на дисковому просторі. Значення 0 знімає обмеження на дисковий простір. Це значення може бути вказано окремо для кожного користувача в його профілі.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Обмежений доступ',
 'settings_restricted_desc' => 'Дозволити вхід користувачам, тільки якщо в них є відповідний обліковий запис в БД (незалежно від успішного входу через LDAP).',
 'settings_rootDir' => 'Кореневий каталог',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 2374fcf79..0710830ce 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1015,6 +1015,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '如果开启，这个免责声明信息将在每个页面的底部显示',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 49031bad4..ae3b51289 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -1013,6 +1013,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 0771abee3..f01652a95 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -426,6 +426,11 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 				}
 			}
 		}
+		if($settings->_removeFromDropFolder) {
+			if(file_exists($userfiletmp)) {
+				unlink($userfiletmp);
+			}
+		}
 	}
 	
 	add_log_line("?name=".$name."&folderid=".$folderid);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index f39679ef6..e152e0545 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -154,6 +154,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
   $settings->_overrideMimeType = getBoolValue("overrideMimeType");
+  $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");
 
   // SETTINGS - ADVANCED - NOTIFICATION
   $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 2fe5a9ebf..2d15782b9 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -562,6 +562,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_overrideMimeType");?>:</td>
         <td><input name="overrideMimeType" type="checkbox" <?php if ($settings->_overrideMimeType) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_removeFromDropFolder_desc");?>">
+        <td><?php printMLText("settings_removeFromDropFolder");?>:</td>
+        <td><input name="removeFromDropFolder" type="checkbox" <?php if ($settings->_removeFromDropFolder) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION

From 3574bc884c9320a699b19aff41a6cb53669e987d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 13:17:09 +0200
Subject: [PATCH 39/76] add entry for 4.3.27

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6e29dafaa..e37d0c2ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
+- file from drop folder can be removed after successful upload
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools
 - fix strict standard error in SeedDMS_Lucene (Closes #263)

From 9bbf1cc519fa8084bf813c184b45214c77e21798 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 13:57:51 +0200
Subject: [PATCH 40/76] no need to include Utils.php

---
 out/out.Login.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/out/out.Login.php b/out/out.Login.php
index a67b5ab88..306a65680 100644
--- a/out/out.Login.php
+++ b/out/out.Login.php
@@ -23,7 +23,6 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.Utils.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 

From 239b750223b47ccbab2ba396e8b894f7393972ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 13:58:42 +0200
Subject: [PATCH 41/76] include Utils.php early

---
 out/out.Login.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.Login.php b/out/out.Login.php
index 306a65680..b0463848d 100644
--- a/out/out.Login.php
+++ b/out/out.Login.php
@@ -19,6 +19,7 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");

From 281ea0df9cc869911f70b397d2fcd043b54ed9c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 14:05:26 +0200
Subject: [PATCH 42/76] fix inclusion of files

---
 out/out.BackupTools.php | 2 +-
 out/out.ClearCache.php  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php
index a5b97aad5..7226858e4 100644
--- a/out/out.BackupTools.php
+++ b/out/out.BackupTools.php
@@ -17,11 +17,11 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.Utils.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
diff --git a/out/out.ClearCache.php b/out/out.ClearCache.php
index 578464b35..6d96b7e8b 100644
--- a/out/out.ClearCache.php
+++ b/out/out.ClearCache.php
@@ -18,12 +18,14 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Version.php");
 include("../inc/inc.Settings.php");
-include("../inc/inc.DBInit.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.ClassUI.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
 
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));

From 4a327be6184fbdf8b82922f8cc247d255fcf1794 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 May 2016 07:46:34 +0200
Subject: [PATCH 43/76] put warning for missing translation into container and
 row

---
 views/bootstrap/class.Bootstrap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 74151ceaa..518431160 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -139,6 +139,8 @@ $(document).ready(function () {
 	function missingḺanguageKeys() { /* {{{ */
 		global $MISSING_LANG, $LANG;
 		if($MISSING_LANG) {
+			echo '<div class="container-fluid">'."\n";
+			echo '<div class="row-fluid">'."\n";
 			echo '<div class="alert alert-error">'."\n";
 			echo "<p><strong>This page contains missing translations in the selected language. Please help to improve SeedDMS and provide the translation.</strong></p>";
 			echo "</div>";
@@ -149,6 +151,8 @@ $(document).ready(function () {
 			}
 			echo "</table>";
 			echo "<div class=\"splash\" data-type=\"error\" data-timeout=\"5500\"><b>There are missing translations on this page!</b><br />Please check the bottom of the page.</div>\n";
+			echo "</div>\n";
+			echo "</div>\n";
 		}
 	} /* }}} */
 

From 483d082c4409e8ddc248daa5ed9fa4447a8fc009 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 May 2016 07:50:43 +0200
Subject: [PATCH 44/76] fix warning in list of missing translations

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 518431160..b9d53bf96 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -147,7 +147,7 @@ $(document).ready(function () {
 			echo "<table class=\"table table-condensed\">";
 			echo "<tr><th>Key</th><th>engl. Text</th><th>Your translation</th></tr>\n";
 			foreach($MISSING_LANG as $key=>$lang) {
-				echo "<tr><td>".$key."</td><td>".$LANG['en_GB'][$key]."</td><td><div class=\"input-append send-missing-translation\"><input name=\"missing-lang-key\" type=\"hidden\" value=\"".$key."\" /><input name=\"missing-lang-lang\" type=\"hidden\" value=\"".$lang."\" /><input type=\"text\" class=\"input-xxlarge\" name=\"missing-lang-translation\" placeholder=\"Your translation in '".$lang."'\"/><a class=\"btn\">Submit</a></div></td></tr>";
+				echo "<tr><td>".$key."</td><td>".(isset($LANG['en_GB'][$key]) ? $LANG['en_GB'][$key] : '')."</td><td><div class=\"input-append send-missing-translation\"><input name=\"missing-lang-key\" type=\"hidden\" value=\"".$key."\" /><input name=\"missing-lang-lang\" type=\"hidden\" value=\"".$lang."\" /><input type=\"text\" class=\"input-xxlarge\" name=\"missing-lang-translation\" placeholder=\"Your translation in '".$lang."'\"/><a class=\"btn\">Submit</a></div></td></tr>";
 			}
 			echo "</table>";
 			echo "<div class=\"splash\" data-type=\"error\" data-timeout=\"5500\"><b>There are missing translations on this page!</b><br />Please check the bottom of the page.</div>\n";

From b89023d99d3dbe6767df3da8d013a790be3cd453 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 May 2016 07:55:04 +0200
Subject: [PATCH 45/76] use class folderselect instead of id

previously only the first folder in the list could be selected
---
 views/bootstrap/class.DropFolderChooser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index f9c883710..e26c9276b 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -43,7 +43,7 @@ $('.fileselect').click(function(ev) {
 	attr_filename = $(ev.currentTarget).attr('filename');
 	fileSelected(attr_filename);
 });
-$('#folderselect').click(function(ev) {
+$('.folderselect').click(function(ev) {
 	attr_foldername = $(ev.currentTarget).attr('foldername');
 	folderSelected(attr_foldername);
 });
@@ -89,7 +89,7 @@ $('#folderselect').click(function(ev) {
 						} elseif($showfolders) {
 							echo "<tr>";
 							echo "<td></td>";
-							echo "<td><span style=\"cursor: pointer;\" id=\"folderselect\" foldername=\"".$entry."\" >".$entry."</span></td><td align=\"right\"></td><td></td>";
+							echo "<td><span style=\"cursor: pointer;\" class=\"folderselect\" foldername=\"".$entry."\" >".$entry."</span></td><td align=\"right\"></td><td></td>";
 							echo "</tr>\n";
 						}
 					}

From a64a961ea6c524c48eb0232d5a9ed3bc46e14331 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 May 2016 07:58:09 +0200
Subject: [PATCH 46/76] add entry for 4.3.27

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index e37d0c2ad..15d304a25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
+- fix selection of imported folder in ImportFS
 - file from drop folder can be removed after successful upload
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools

From ba786d52b9ea496988169d4f17990964f24f2828 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 May 2016 10:45:14 +0200
Subject: [PATCH 47/76] add hidden field to attributes

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b9d53bf96..ff5897f2c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1075,6 +1075,7 @@ $('#acceptkeywords').click(function(ev) {
 			break;
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
+				echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
 				echo "<select name=\"".$fieldname."[".$attrdef->getId()."]";
 				if($attrdef->getMultipleValues()) {
 					echo "[]\" multiple";

From 4bfc47f063b02b11b3341ebb94264a7817e0a3ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 May 2016 10:45:40 +0200
Subject: [PATCH 48/76] check if minimum number of attribute values is set

---
 op/op.AddDocument.php    |  5 ++++-
 op/op.EditAttributes.php | 12 +++++++++++-
 op/op.UpdateDocument.php |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index f01652a95..d808ed727 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -82,6 +82,8 @@ foreach($attributes as $attrdefid=>$attribute) {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
+	} elseif($attrdef->getMinValues() > 0) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 	}
 }
 
@@ -105,10 +107,11 @@ foreach($attributes_version as $attrdefid=>$attribute) {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
+	} elseif($attrdef->getMinValues() > 0) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 	}
 }
 
-
 $reqversion = (int)$_POST["reqversion"];
 if ($reqversion<1) $reqversion=1;
 
diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index bd9e33c72..88168de52 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -65,7 +65,15 @@ if($attributes) {
 		if($attribute) {
 			if($attrdef->getRegex()) {
 				if(!preg_match($attrdef->getRegex(), $attribute)) {
-					UI::exitError(getMLText("folder_title", array("foldername" => $document->getName())),getMLText("attr_no_regex_match"));
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match"));
+				}
+				if(is_array($attribute)) {
+					if($attrdef->getMinValues() > count($attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+					}
+					if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+					}
 				}
 			}
 			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
@@ -97,6 +105,8 @@ if($attributes) {
 					}
 				}
 			}
+		} elseif($attrdef->getMinValues() > 0) {
+			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 		} elseif(isset($oldattributes[$attrdefid])) {
 			if(!$version->removeAttribute($dms->getAttributeDefinition($attrdefid)))
 				UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("error_occured"));
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 0aa0cd557..18d060cc6 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -219,6 +219,8 @@ if ($_FILES['userfile']['error'] == 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 					}
 				}
+			} elseif($attrdef->getMinValues() > 0) {
+				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
 	} else {

From 23a982d750c165d079b873a7fb3742b6880cce3b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 May 2016 10:46:25 +0200
Subject: [PATCH 49/76] add entry for 4.3.27

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 15d304a25..eb974ca4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
+- check for minimum number of attribute values for each attribute type
 - fix selection of imported folder in ImportFS
 - file from drop folder can be removed after successful upload
 - remove preview images when document or document content is removed (Closes #262)

From ba85d4d59c6c6f77033d8cfe91c66e819afc29d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 20:44:31 +0200
Subject: [PATCH 50/76] add some translations

---
 languages/ar_EG/lang.inc | 5 +++--
 languages/bg_BG/lang.inc | 5 +++--
 languages/ca_ES/lang.inc | 5 +++--
 languages/cs_CZ/lang.inc | 5 +++--
 languages/de_DE/lang.inc | 5 +++--
 languages/en_GB/lang.inc | 9 +++++----
 languages/es_ES/lang.inc | 5 +++--
 languages/fr_FR/lang.inc | 5 +++--
 languages/hr_HR/lang.inc | 5 +++--
 languages/hu_HU/lang.inc | 5 +++--
 languages/it_IT/lang.inc | 5 +++--
 languages/ko_KR/lang.inc | 5 +++--
 languages/nl_NL/lang.inc | 5 +++--
 languages/pl_PL/lang.inc | 5 +++--
 languages/pt_BR/lang.inc | 5 +++--
 languages/ro_RO/lang.inc | 5 +++--
 languages/ru_RU/lang.inc | 5 +++--
 languages/sk_SK/lang.inc | 5 +++--
 languages/sv_SE/lang.inc | 5 +++--
 languages/tr_TR/lang.inc | 5 +++--
 languages/uk_UA/lang.inc | 5 +++--
 languages/zh_CN/lang.inc | 5 +++--
 languages/zh_TW/lang.inc | 5 +++--
 23 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index a547b2981..b9cc9688a 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/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 (1266)
+//    Translators: Admin (1267)
 
 $text = array(
 'accept' => 'وافق',
@@ -229,6 +229,7 @@ URL: [url]',
 'comment' => 'تعليق',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'تعليق على الاصدار',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'نعم: اود اعادة انشاء فهرس للنص الكامل !',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -580,7 +581,7 @@ URL: [url]',
 'local_file' => 'ملف محلي',
 'locked_by' => 'محمي بواسطة',
 'lock_document' => 'حماية',
-'lock_message' => 'هذا الملف محمي بواسطة <a href="mailto:[email]">[username]</a>. فقط المستخدمين المصرح لهم يمكنهم تعديله.',
+'lock_message' => 'هذا الملف محمي بواسطة [username]. فقط المستخدمين المصرح لهم يمكنهم تعديله.',
 'lock_status' => 'حالة',
 'login' => 'دخول',
 'login_disabled_text' => 'حسابك معطل, غالبا بسبب المحاولات العديدة الخاطئة للدخول',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8b1223ded..15aad9dde 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/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 (784)
+//    Translators: Admin (785)
 
 $text = array(
 'accept' => 'Приеми',
@@ -214,6 +214,7 @@ $text = array(
 'comment' => 'Коментар',
 'comment_changed_email' => 'Коментарите са изменени',
 'comment_for_current_version' => 'Коментар за версията',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Да, пресъздай пълнотекстов индекс!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -511,7 +512,7 @@ $text = array(
 'local_file' => 'Локален файл',
 'locked_by' => 'Блокиран',
 'lock_document' => 'Блокирай',
-'lock_message' => 'Документът е блокиран <a href="mailto:[email]">[username]</a>. Само имащите права могат да го разблокират.',
+'lock_message' => 'Документът е блокиран [username]. Само имащите права могат да го разблокират.',
 'lock_status' => 'Статус',
 'login' => 'Име',
 'login_disabled_text' => 'Вашия акаунт е забранен, вероятно заради прекалено много погрешни опити за влизане.',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 147b5c3cf..1bd6f01bc 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/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 (698)
+//    Translators: Admin (699)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -219,6 +219,7 @@ URL: [url]',
 'comment' => 'Comentaris',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentari de la versió actual',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -516,7 +517,7 @@ URL: [url]',
 'local_file' => 'Arxiu local',
 'locked_by' => 'Locked by',
 'lock_document' => 'Bloquejar',
-'lock_message' => 'Aquest document ha estat bloquejat per <a href="mailto:[email]">[username]</a>.<br />Només els usuaris autoritzats poden desbloquejar aquest document (vegeu al final de la pàgina).',
+'lock_message' => 'Aquest document ha estat bloquejat per [username]. Només els usuaris autoritzats poden desbloquejar aquest document (vegeu al final de la pàgina).',
 'lock_status' => 'Estat',
 'login' => '',
 'login_disabled_text' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 2aa2773fb..be3e86302 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/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 (706), kreml (455)
+//    Translators: Admin (707), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -236,6 +236,7 @@ URL: [url]',
 'comment' => 'Komentář',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentář k aktuální verzi',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ano, chci znovu vytvořit fulltext indes!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -587,7 +588,7 @@ URL: [url]',
 'local_file' => 'Lokální soubor',
 'locked_by' => 'Zamčeno kým',
 'lock_document' => 'Zamknout',
-'lock_message' => 'Tento dokument zamknul <a href="mailto:[email]">[username]</a>.<br>Pouze oprávnění uživatelé ho mohou odemknout (viz konec stránky).',
+'lock_message' => 'Tento dokument zamknul [username]. Pouze oprávnění uživatelé ho mohou odemknout (viz konec stránky).',
 'lock_status' => 'Stav',
 'login' => 'Login',
 'login_disabled_text' => 'Váš účet je zakázán, pravděpodobně z důvodu příliš mnoha neúspěšných přihlášení.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 4f4d5b855..3a4a8e446 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (2236), dgrutsch (21)
+//    Translators: Admin (2238), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -241,6 +241,7 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar zur aktuellen Version',
+'confirm_clear_cache' => 'Wollen Sie wirklich den Cache löschen? Dies entfernt alle vorberechneten Vorschaubilder.',
 'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltextindex neu erzeugen!.',
 'confirm_move_document' => 'Dokument wirklich verschieben?',
 'confirm_move_folder' => 'Ordner wirklich verschieben?',
@@ -592,7 +593,7 @@ URL: [url]',
 'local_file' => 'Lokale Datei',
 'locked_by' => 'Gesperrt von',
 'lock_document' => 'Sperren',
-'lock_message' => 'Dieses Dokument ist durch <a href="mailto:[email]">[username]</a> gesperrt. Nur authorisierte Benutzer können diese Sperrung aufheben.',
+'lock_message' => 'Dieses Dokument ist durch [username] gesperrt. Nur authorisierte Benutzer können diese Sperrung aufheben.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Ihr Konto ist gesperrt. Der Grund sind möglicherweise zu viele gescheiterte Anmeldeversuche.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 92b6a81d5..16ebb1bca 100644
--- a/languages/en_GB/lang.inc
+++ b/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 (1383), dgrutsch (7), netixw (14)
+//    Translators: Admin (1387), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -163,8 +163,8 @@ URL: [url]',
 'attribute_value' => 'Value of attribute',
 'attr_malformed_email' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.',
 'attr_malformed_url' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.',
-'attr_max_values' => 'The maximum number of required values for attributes [attrname] is exceeded.',
-'attr_min_values' => 'The minimum number of required values for attributes [attrname] is not reached.',
+'attr_max_values' => 'The maximum number of required values for attribute [attrname] is exceeded.',
+'attr_min_values' => 'The minimum number of required values for attribute [attrname] is not reached.',
 'attr_no_regex_match' => 'The attribute value \'[value]\' for attribute \'[attrname]\' does not match the regular expression \'[regex]\'',
 'at_least_n_users_of_group' => 'At least [number_of_users] users of [group]',
 'august' => 'August',
@@ -241,6 +241,7 @@ URL: [url]',
 'comment' => 'Comment',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
+'confirm_clear_cache' => 'Would you really like to clear the cache? This will remove all precalculated preview images.',
 'confirm_create_fulltext_index' => 'Yes, I would like to recreate the fulltext index!',
 'confirm_move_document' => 'Please confirm moving the document.',
 'confirm_move_folder' => 'Please confirm moving the folder.',
@@ -592,7 +593,7 @@ URL: [url]',
 'local_file' => 'Local file',
 'locked_by' => 'Locked by',
 'lock_document' => 'Lock',
-'lock_message' => 'This document is locked by <a href="mailto:[email]">[username]</a>. Only authorized users can unlock this document.',
+'lock_message' => 'This document is locked by [username]. Only authorized users can unlock this document.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Your account is disabled, probably because of too many failed logins.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 8a389e807..34e1a51fe 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/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: acabello (20), Admin (991), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (992), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -236,6 +236,7 @@ URL: [url]',
 'comment' => 'Comentarios',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentario de la versión actual',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '¡Sí, quiero regenerar el índice te texto completo¡',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -587,7 +588,7 @@ URL: [url]',
 'local_file' => 'Fichero local',
 'locked_by' => 'Bloqueado por',
 'lock_document' => 'Bloquear',
-'lock_message' => 'Este documento ha sido bloqueado por <a href="mailto:[email]">[username]</a>.<br />Sólo usuarios autorizados pueden desbloquear este documento (vea el final de la página).',
+'lock_message' => 'Este documento ha sido bloqueado por [username]. Sólo usuarios autorizados pueden desbloquear este documento (vea el final de la página).',
 'lock_status' => 'Estado',
 'login' => 'Iniciar sesión',
 'login_disabled_text' => 'Su cuenta está deshabilitada, probablemente es debido a demasiados intentos de acceso fallidos.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 2bd724143..7f953d998 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/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 (1029), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1030), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -236,6 +236,7 @@ URL: [url]',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de texte intégral!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -587,7 +588,7 @@ URL: [url]',
 'local_file' => 'Fichier local',
 'locked_by' => 'Verrouillé par',
 'lock_document' => 'Verrouiller',
-'lock_message' => 'Ce document a été verrouillé par <a href="mailto:[email]">[username]</a>.<br> Seuls les utilisateurs autorisés peuvent déverrouiller ce document (voir fin de page).',
+'lock_message' => 'Ce document a été verrouillé par [username]. Seuls les utilisateurs autorisés peuvent déverrouiller ce document (voir fin de page).',
 'lock_status' => 'Statut',
 'login' => 'Identifiant',
 'login_disabled_text' => 'Votre compte est désactivé, sans doute à cause de trop nombreuses connexions qui ont échoué.',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index c0dcd7f9a..a7a34766b 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/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 (1185), marbanas (16)
+//    Translators: Admin (1186), marbanas (16)
 
 $text = array(
 'accept' => 'Prihvati',
@@ -241,6 +241,7 @@ Internet poveznica: [url]',
 'comment' => 'Komentar',
 'comment_changed_email' => 'Promjena komentara',
 'comment_for_current_version' => 'Verzija komentara',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Da, želim ponovo indeksirati cijeli tekst!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -592,7 +593,7 @@ Internet poveznica: [url]',
 'local_file' => 'Lokalna datoteka',
 'locked_by' => 'Zaključao',
 'lock_document' => 'Zaključaj',
-'lock_message' => 'Ovaj dokument je zaključao <a href="mailto:[email]">[username]</a>. Samo ovlašteni korisnici mogu otključati ovaj dokument.',
+'lock_message' => 'Ovaj dokument je zaključao [username]. Samo ovlašteni korisnici mogu otključati ovaj dokument.',
 'lock_status' => 'Status',
 'login' => 'Prijava',
 'login_disabled_text' => 'Vaš korisnički račun je onemogućen, vjerojatno zbog previše neispravnih prijava.',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index c3a105f52..c0e0b2495 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/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 (586), ribaz (1019)
+//    Translators: Admin (587), ribaz (1019)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -236,6 +236,7 @@ URL: [url]',
 'comment' => 'Megjegyzés',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Megjegyzés az aktuális verzióhoz',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Igen, szeretném újra létrehozni a teljes szöveg indexet!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -587,7 +588,7 @@ URL: [url]',
 'local_file' => 'Helyi állomány',
 'locked_by' => 'Zárolta',
 'lock_document' => 'Zárol',
-'lock_message' => 'Ezt a dokumentumot <a href="mailto:[email]">[username]</a> zárolta.<br>Csak az arra jogosult felhasználó törölheti a zárolást (Lásd: lap alja).',
+'lock_message' => 'Ezt a dokumentumot [username] zárolta. Csak az arra jogosult felhasználó törölheti a zárolást (Lásd: lap alja).',
 'lock_status' => 'Állapot',
 'login' => 'Bejelentkezés',
 'login_disabled_text' => 'Fiókja letiltásra került, valószínűleg a túl sok érvénytelen bejelentkezési kísérlet miatt.',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index d77d0a918..bdfe6e984 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/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 (1525), s.pnt (26)
+//    Translators: Admin (1526), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -242,6 +242,7 @@ URL: [url]',
 'comment' => 'Commento',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commento per la versione',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -593,7 +594,7 @@ URL: [url]',
 'local_file' => 'File locale',
 'locked_by' => 'Bloccato da',
 'lock_document' => 'Blocca',
-'lock_message' => 'Questo documento è bloccato da <a href="mailto:[email]">[username]</a>. Solo gli utenti autorizzati possono sbloccare questo documento.',
+'lock_message' => 'Questo documento è bloccato da [username]. Solo gli utenti autorizzati possono sbloccare questo documento.',
 'lock_status' => 'Stato bloccaggio',
 'login' => 'Accesso',
 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index fbbb78c4f..e8f4d8159 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/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 (938), daivoc (418)
+//    Translators: Admin (939), daivoc (418)
 
 $text = array(
 'accept' => '동의',
@@ -243,6 +243,7 @@ URL: [url]',
 'comment' => '코멘트',
 'comment_changed_email' => '변경된 이메일 코멘트',
 'comment_for_current_version' => '코맨트',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '예, 전체 텍스트 인덱스를 다시 만들고 싶습니다!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -592,7 +593,7 @@ URL: [url]',
 'local_file' => '로컬 파일',
 'locked_by' => '잠금',
 'lock_document' => '잠금',
-'lock_message' => '이 문서는 <a href="mailto:[email]">[username]</a>.에 의해 잠겨 있습니다. 허가 된 사용자 만이 문서를 잠금을 해제 할 수 있습니다.',
+'lock_message' => '이 문서는 [username].에 의해 잠겨 있습니다. 허가 된 사용자 만이 문서를 잠금을 해제 할 수 있습니다.',
 'lock_status' => '상태',
 'login' => '로그인',
 'login_disabled_text' => '귀정 이상 로그인 실패로 당신의 계정을사용할 수 없습니다.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index f553a0b7f..aac99f067 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/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 (715), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (716), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -234,6 +234,7 @@ URL: [url]',
 'comment' => 'Commentaar',
 'comment_changed_email' => 'Gewijzigde email',
 'comment_for_current_version' => 'Versie van het commentaar',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ja, Ik wil de volledigetekst index opnieuw maken!',
 'confirm_move_document' => 'Bevestig verplaatsing van document',
 'confirm_move_folder' => 'Bevestig de verplaatsing van de map',
@@ -585,7 +586,7 @@ URL: [url]',
 'local_file' => 'Lokaal bestand',
 'locked_by' => 'In gebruik door',
 'lock_document' => 'Blokkeer',
-'lock_message' => 'Dit document is geblokkeerd door <a href="mailto:[email]">[username]</a>. Alleen geautoriseerde Gebruikers kunnen het de-blokeren.',
+'lock_message' => 'Dit document is geblokkeerd door [username]. Alleen geautoriseerde Gebruikers kunnen het de-blokeren.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Uw account is gedeactiveerd, mogelijk door teveel foutieve inlogpogingen.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 7a46bbc55..0ed7120f6 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/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 (733), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (734), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -229,6 +229,7 @@ URL: [url]',
 'comment' => 'Opis',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentarz do wersji',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Tak, chcę ponownie utworzyć indeks pełnotekstowy!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -580,7 +581,7 @@ URL: [url]',
 'local_file' => 'Lokalny plik',
 'locked_by' => 'Zablokowane przez',
 'lock_document' => 'Zablokuj',
-'lock_message' => 'Ten dokument jest zablokowany przez <a href="mailto:[email]">[username]</a>. Tylko uprawnieni użytkownicy mogą odblokować dokument.',
+'lock_message' => 'Ten dokument jest zablokowany przez [username]. Tylko uprawnieni użytkownicy mogą odblokować dokument.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Twoje konto jest zablokowane. Prawdopodobnie z powodu zbyt wielu nieudanych prób logowania.',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 5ac68dbb9..e92a70a5a 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/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 (906), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (907), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -236,6 +236,7 @@ URL: [url]',
 'comment' => 'Comentário',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentário para versão atual',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Sim, eu gostaria de recriar o índice de texto completo!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -586,7 +587,7 @@ URL: [url]',
 'local_file' => 'Arquivo local',
 'locked_by' => 'Bloqueado por',
 'lock_document' => 'Travar',
-'lock_message' => 'Este documento foi travado por <a href="mailto:[email]">[username]</a>.<br>Somente usuários autorizados podem remover a trava deste documento (veja no final da página).',
+'lock_message' => 'Este documento foi travado por [username]. Somente usuários autorizados podem remover a trava deste documento (veja no final da página).',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Sua conta está desativada, provavelmente por causa de muitos logins falhos.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 165a0e065..7b66c04f4 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/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 (1041), balan (87)
+//    Translators: Admin (1042), balan (87)
 
 $text = array(
 'accept' => 'Accept',
@@ -241,6 +241,7 @@ URL: [url]',
 'comment' => 'Comentariu',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentariu versiune',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Da, aș dori să recreeze indexul pentru tot textul!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -592,7 +593,7 @@ URL: [url]',
 'local_file' => 'Fișier local',
 'locked_by' => 'Blocat de',
 'lock_document' => 'Blocare',
-'lock_message' => 'Acest document este blocat de <a href="mailto:[email]">[username]</a>. Numai utilizatorii autorizați pot debloca acest document.',
+'lock_message' => 'Acest document este blocat de [username]. Numai utilizatorii autorizați pot debloca acest document.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Contul dumneavoastră este dezactivat, probabil din cauza prea multor login-uri eșuate.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 772003095..976e6fcea 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/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 (1541)
+//    Translators: Admin (1542)
 
 $text = array(
 'accept' => 'Принять',
@@ -241,6 +241,7 @@ URL: [url]',
 'comment' => 'Комментарий',
 'comment_changed_email' => 'Сообщение об изменении комментария',
 'comment_for_current_version' => 'Комментарий версии',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Да, пересоздать полнотекстовый индекс!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -592,7 +593,7 @@ URL: [url]',
 'local_file' => 'Локальный файл',
 'locked_by' => 'Заблокирован',
 'lock_document' => 'Заблокировать',
-'lock_message' => 'Документ заблокировал(а) <a href="mailto:[email]">[username]</a>. Только имеющие права могут его разблокировать.',
+'lock_message' => 'Документ заблокировал(а) [username]. Только имеющие права могут его разблокировать.',
 'lock_status' => 'Статус',
 'login' => 'Логин',
 'login_disabled_text' => 'Ваша учётная запись заблокирована, возможно, из-за нескольких неудачных попыток входа.',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index c5fae7449..2a2e55416 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/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 (493), destinqo (19)
+//    Translators: Admin (494), destinqo (19)
 
 $text = array(
 'accept' => 'Prijať',
@@ -218,6 +218,7 @@ URL: [url]',
 'comment' => 'Komentár',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -515,7 +516,7 @@ URL: [url]',
 'local_file' => 'Lokálny súbor',
 'locked_by' => 'Uzamkol',
 'lock_document' => 'Zamknúť',
-'lock_message' => 'Tento dokument zamkol <a href="mailto:[email]">[username]</a>.<br>Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
+'lock_message' => 'Tento dokument zamkol [username]. Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
 'lock_status' => 'Stav',
 'login' => '',
 'login_disabled_text' => 'Vaše konto bolo zakázané, pravdepodobne veľa pokusov o prihlásenie zlyhalo.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 7dd6dd4b1..5177e9209 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/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 (1127), tmichelfelder (106)
+//    Translators: Admin (1128), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -229,6 +229,7 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar till versionen',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex !',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -580,7 +581,7 @@ URL: [url]',
 'local_file' => 'Lokal fil',
 'locked_by' => 'Låst av',
 'lock_document' => 'Lås',
-'lock_message' => 'Detta dokument har låsts av <a href="mailto:[email]">[username]</a>. Bara auktoriserade användare kan låsa upp dokumentet.',
+'lock_message' => 'Detta dokument har låsts av [username]. Bara auktoriserade användare kan låsa upp dokumentet.',
 'lock_status' => 'Status',
 'login' => 'Inloggning',
 'login_disabled_text' => 'Ditt konto är inaktivt, förmodligen för att du har överskridit tillåtna antal inloggningsförsök.',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index cfcc6bb4f..7218f40d3 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/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 (1036), aydin (83)
+//    Translators: Admin (1037), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -235,6 +235,7 @@ URL: [url]',
 'comment' => 'Açıklama',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Versiyon açıklaması',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Evet, tam metin indeksini yeniden oluşturmak istiyorum!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -586,7 +587,7 @@ URL: [url]',
 'local_file' => 'Yerel dosya',
 'locked_by' => 'Kilitleyen',
 'lock_document' => 'Kilitle',
-'lock_message' => 'Bu doküman <a href="mailto:[email]">[username]</a> tarafından kilitlenmiştir. Sadece yetkilendirilmiş kişiler bu dokümanı açabilirler.',
+'lock_message' => 'Bu doküman [username] tarafından kilitlenmiştir. Sadece yetkilendirilmiş kişiler bu dokümanı açabilirler.',
 'lock_status' => 'Durum',
 'login' => 'Giriş',
 'login_disabled_text' => 'Hesabınız devre dışı. Muhtemelen çok fazla hatalı giriş denemesi yapıldı.',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 7ca16f376..8a3d77743 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/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 (1323)
+//    Translators: Admin (1324)
 
 $text = array(
 'accept' => 'Прийняти',
@@ -241,6 +241,7 @@ URL: [url]',
 'comment' => 'Коментар',
 'comment_changed_email' => 'Повідомлення про зміну коментаря',
 'comment_for_current_version' => 'Коментар версії',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Так, перестворити повнотекстовий індекс!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -592,7 +593,7 @@ URL: [url]',
 'local_file' => 'Локальний файл',
 'locked_by' => 'Заблоковано',
 'lock_document' => 'Заблокувати',
-'lock_message' => 'Документ заблокував користувач <a href="mailto:[email]">[username]</a>. Тільки користувачі, які мають відповідні права, можуть його розблокувати.',
+'lock_message' => 'Документ заблокував користувач [username]. Тільки користувачі, які мають відповідні права, можуть його розблокувати.',
 'lock_status' => 'Статус',
 'login' => 'Логін',
 'login_disabled_text' => 'Ваш обліковий запис заблоковано, можливо, через кілька невдалих спроб входу.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 0710830ce..3f0df62ad 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/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 (633), fengjohn (5)
+//    Translators: Admin (634), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -218,6 +218,7 @@ URL: [url]',
 'comment' => '说明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本说明',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -517,7 +518,7 @@ URL: [url]',
 'local_file' => '本地文件',
 'locked_by' => '锁定人',
 'lock_document' => '锁定',
-'lock_message' => '此文档已被 <a href="mailto:[email]">[username]</a>锁定. 只有授权用户才能解锁.',
+'lock_message' => '此文档已被 [username] 锁定. 只有授权用户才能解锁.',
 'lock_status' => '锁定状态',
 'login' => '',
 'login_disabled_text' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index ae3b51289..bf8bde0b4 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/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 (2359)
+//    Translators: Admin (2360)
 
 $text = array(
 'accept' => '接受',
@@ -218,6 +218,7 @@ URL: [url]',
 'comment' => '說明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本說明',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '確認已新增之全文索引',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -515,7 +516,7 @@ URL: [url]',
 'local_file' => '本地檔',
 'locked_by' => '鎖定人',
 'lock_document' => '鎖定',
-'lock_message' => '此文檔已被 <a href="mailto:[email]">[username]</a>鎖定. 只有授權使用者才能解鎖.',
+'lock_message' => '此文檔已被 [username] 鎖定. 只有授權使用者才能解鎖.',
 'lock_status' => '鎖定狀態',
 'login' => '',
 'login_disabled_text' => '',

From 45538b32ffc12ea4e7ef49d55f079ee6c6a4d99f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jun 2016 19:31:18 +0200
Subject: [PATCH 51/76] set 'orig_filename' get return value of getDocument()

---
 restapi/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/restapi/index.php b/restapi/index.php
index a2b17da90..da6a89a04 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -461,6 +461,7 @@ function getDocument($id) { /* {{{ */
 				'date'=>$document->getDate(),
 				'mimetype'=>$lc->getMimeType(),
 				'version'=>$lc->getVersion(),
+				'orig_filename'=>$lc->getOriginalFileName(),
 				'size'=>$lc->getFileSize(),
 				'keywords'=>htmlspecialchars($document->getKeywords()),
 			);

From ec2d983bb47d13d609c5f1c1ce61d60ec3d9e5f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jun 2016 20:31:25 +0200
Subject: [PATCH 52/76] various updates

---
 languages/ca_ES/lang.inc |  8 ++++----
 languages/es_ES/lang.inc |  4 ++--
 languages/fr_FR/lang.inc |  6 +++---
 languages/hu_HU/lang.inc | 10 +++++-----
 languages/it_IT/lang.inc |  4 ++--
 languages/pl_PL/lang.inc |  4 ++--
 languages/ru_RU/lang.inc |  4 ++--
 languages/sk_SK/lang.inc | 12 ++++++------
 languages/tr_TR/lang.inc |  4 ++--
 languages/zh_CN/lang.inc |  4 ++--
 languages/zh_TW/lang.inc | 20 ++++++++++----------
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 1bd6f01bc..9ce73354a 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/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 (699)
+//    Translators: Admin (702)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -1195,7 +1195,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versió [version]:[status]',
 'to' => 'Fins',
 'toggle_manager' => 'Intercanviar manager',
 'to_before_from' => '',
@@ -1214,7 +1214,7 @@ URL: [url]',
 'tuesday' => 'Dimarts',
 'tuesday_abbr' => '',
 'type_of_hook' => '',
-'type_to_search' => '',
+'type_to_search' => 'Cerca',
 'uk_UA' => 'Ucraïnès',
 'under_folder' => 'A carpeta',
 'unknown_attrdef' => '',
@@ -1246,7 +1246,7 @@ URL: [url]',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
 'uploading_zerosize' => '',
-'used_discspace' => '',
+'used_discspace' => 'Espai utilitzat',
 'user' => 'Usuari',
 'users' => 'Usuaris',
 'users_and_groups' => '',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 34e1a51fe..90fc96018 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/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: acabello (20), Admin (992), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (993), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -228,7 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleccione acción del flujo de trabajo',
 'choose_workflow_state' => 'Seleccione estado del flujo de trabajo',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Borrar cache',
 'clear_clipboard' => 'Limpiar portapapeles',
 'clear_password' => '',
 'clipboard' => 'Portapapeles',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 7f953d998..1b5ee6fdd 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/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 (1030), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1032), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -228,7 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Choose une action de workflow',
 'choose_workflow_state' => 'Choisir un état de workflow',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Effacer le cache',
 'clear_clipboard' => 'Vider le presse-papier',
 'clear_password' => '',
 'clipboard' => 'Presse-papier',
@@ -236,7 +236,7 @@ URL: [url]',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
-'confirm_clear_cache' => '',
+'confirm_clear_cache' => 'Confirmer l\'effacement du cache',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de texte intégral!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index c0e0b2495..60529dc1e 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/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 (587), ribaz (1019)
+//    Translators: Admin (587), ribaz (1023)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -64,7 +64,7 @@ URL: [url]',
 'add_receipt' => '',
 'add_review' => 'Felülvizsgálat küldése',
 'add_revision' => '',
-'add_role' => '',
+'add_role' => 'szerepkör hozzáadása',
 'add_subfolder' => 'Alkönyvtár hozzáadása',
 'add_to_clipboard' => 'Vágólaphoz hozzáad',
 'add_to_transmittal' => '',
@@ -164,7 +164,7 @@ URL: [url]',
 'at_least_n_users_of_group' => 'Legalább [number_of_users] felhasználó a [group] csoportban',
 'august' => 'Augusztus',
 'authentication' => 'Hitelesítés',
-'author' => '',
+'author' => 'szerző',
 'automatic_status_update' => 'Automatikus állapot változás',
 'back' => 'Vissza',
 'backup_list' => 'Meglévő mentések listája',
@@ -365,7 +365,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Ellenőrző összeg beállítása',
 'do_object_setfilesize' => 'Állomány méret beállítása',
 'do_object_unlink' => 'Dokumentum verzió törlése',
-'draft' => '',
+'draft' => 'piszkozat',
 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
@@ -633,7 +633,7 @@ URL: [url]',
 'my_transmittals' => '',
 'name' => 'Név',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
-'never' => '',
+'never' => 'soha',
 'new' => 'Új',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
 'new_default_keywords' => 'Kulcsszó hozzáadása',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index bdfe6e984..2b1b5215e 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/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 (1526), s.pnt (26)
+//    Translators: Admin (1527), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -234,7 +234,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleziona l\'azione del flusso di lavoro',
 'choose_workflow_state' => 'Seleziona lo stato del flusso di lavoro',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Pulisci cache',
 'clear_clipboard' => 'Cancella appunti',
 'clear_password' => '',
 'clipboard' => 'Appunti',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 0ed7120f6..47d541e24 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/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 (734), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (735), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -221,7 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Wybierz działanie procesu',
 'choose_workflow_state' => 'Wybierz stan obiegu',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Wyczyść cache',
 'clear_clipboard' => 'Oczyść schowek',
 'clear_password' => '',
 'clipboard' => 'Schowek',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 976e6fcea..3829eaca4 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/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 (1542)
+//    Translators: Admin (1543)
 
 $text = array(
 'accept' => 'Принять',
@@ -233,7 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Выберите действие процесса',
 'choose_workflow_state' => 'Выберите статус процесса',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Очистить кэш',
 'clear_clipboard' => 'Очистить буфер обмена',
 'clear_password' => '',
 'clipboard' => 'Буфер обмена',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 2a2e55416..a5de71d7c 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/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 (494), destinqo (19)
+//    Translators: Admin (499), destinqo (19)
 
 $text = array(
 'accept' => 'Prijať',
@@ -242,7 +242,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
-'create_fulltext_index' => '',
+'create_fulltext_index' => 'Vytvoriť fulltext index',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Vytvorené',
 'cs_CZ' => 'Čestina',
@@ -410,7 +410,7 @@ URL: [url]',
 'fr_FR' => 'Francúzština',
 'fullsearch' => 'Fulltext index vyhľadávanie',
 'fullsearch_hint' => 'Použiť fulltext index',
-'fulltext_info' => '',
+'fulltext_info' => 'Informácie o fulltext indexe',
 'global_attributedefinitions' => 'Atribúty',
 'global_default_keywords' => 'Globálne kľúčové slová',
 'global_document_categories' => 'Kategórie',
@@ -1194,7 +1194,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Verzia [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',
 'to_before_from' => '',
@@ -1207,7 +1207,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Prosím počkajte kým sa nahrá strom dokumentov...',
 'trigger_workflow' => '',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
@@ -1234,7 +1234,7 @@ URL: [url]',
 'update' => 'Aktualizovať',
 'update_approvers' => 'Aktualizovať zoznam schvaľovateľov',
 'update_document' => 'Aktualizovať',
-'update_fulltext_index' => '',
+'update_fulltext_index' => 'Aktualizovať fulltext index',
 'update_info' => 'Aktualizovať informácie',
 'update_locked_msg' => 'Tento dokument je zamknutý.',
 'update_recipients' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 7218f40d3..90a8db147 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/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 (1037), aydin (83)
+//    Translators: Admin (1038), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -227,7 +227,7 @@ URL: [url]',
 'choose_workflow_action' => 'İş akış eylemi seçiniz',
 'choose_workflow_state' => 'İş akış durumunu seçiniz',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Ön belleği temizle',
 'clear_clipboard' => 'Panoyu temizle',
 'clear_password' => '',
 'clipboard' => 'Pano',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 3f0df62ad..3d852b13d 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/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 (634), fengjohn (5)
+//    Translators: Admin (635), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -210,7 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => '清除缓存',
 'clear_clipboard' => '清除粘贴板',
 'clear_password' => '',
 'clipboard' => '剪切板',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index bf8bde0b4..9ee761a87 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/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 (2360)
+//    Translators: Admin (2369)
 
 $text = array(
 'accept' => '接受',
@@ -155,7 +155,7 @@ URL: [url]',
 'backup_tools' => '備份工具',
 'between' => '時間段',
 'bg_BG' => '保加利亞語',
-'browse' => '',
+'browse' => '瀏覽',
 'calendar' => '日曆',
 'calendar_week' => '',
 'cancel' => '取消',
@@ -321,7 +321,7 @@ URL: [url]',
 'draft_pending_approval' => '待審核',
 'draft_pending_review' => '待校對',
 'drag_icon_here' => '拖動圖示到這裡',
-'dropfolder_file' => '',
+'dropfolder_file' => '檔案來源為 drop 目錄',
 'dropfolder_folder' => '',
 'dropupload' => '快速上傳',
 'drop_files_here' => '拖入這裡',
@@ -358,7 +358,7 @@ URL: [url]',
 'empty_notify_list' => '沒有條目',
 'en_GB' => '英語',
 'equal_transition_states' => '',
-'error' => '',
+'error' => '錯誤',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_importfs' => '',
@@ -382,7 +382,7 @@ URL: [url]',
 'files' => '文件',
 'files_deletion' => '刪除檔',
 'files_deletion_warning' => '通過此操作，您可以刪除整個DMS(文檔管理系統)資料夾裡的所有檔.但版本資訊將被保留',
-'files_loading' => '',
+'files_loading' => '請稍候， 檔案讀取中',
 'file_size' => '文件大小',
 'filter_for_documents' => '',
 'filter_for_folders' => '',
@@ -437,7 +437,7 @@ URL: [url]',
 'human_readable' => '可讀存檔',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
-'identical_version' => '',
+'identical_version' => '新版本的內容與舊版本完全相同',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
@@ -778,19 +778,19 @@ URL: [url]',
 'selection' => '選擇',
 'select_category' => '選中分類',
 'select_groups' => '點擊選擇組',
-'select_grp_approvers' => '',
+'select_grp_approvers' => '請點選審核人員群組',
 'select_grp_ind_approvers' => '',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
-'select_grp_reviewers' => '',
+'select_grp_reviewers' => '請點選校對人員群組',
 'select_grp_revisors' => '',
-'select_ind_approvers' => '',
+'select_ind_approvers' => '請點選單一的審核人',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => '',
+'select_ind_reviewers' => '請點選單一的校對人',
 'select_ind_revisors' => '',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',

From 0afbcc73d8ce80c207618cd80783d5ed2e283168 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 09:11:50 +0200
Subject: [PATCH 53/76] fix some sql statements to work with mysql 5.7.5
 (Closes: #273)

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index ac28172e9..5813c7f9b 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -308,7 +308,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `tblDocumentReviewLog`.`reviewLogID`";
+						"ORDER BY `maxLogID`";
 				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (PRIMARY KEY (`reviewID`), INDEX (`maxLogID`)) ".
@@ -316,7 +316,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `tblDocumentReviewLog`.`reviewLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttreviewid) {
 				if (!$this->getResult($queryStr))
@@ -341,7 +341,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogID`";
+						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (PRIMARY KEY (`approveID`), INDEX (`maxLogID`)) ".
@@ -349,7 +349,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttapproveid) {
 				if (!$this->getResult($queryStr))
@@ -374,7 +374,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `tblDocumentStatusLog`.`statusLogID`";
+						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (PRIMARY KEY (`statusID`), INDEX (`maxLogID`)) ".
@@ -382,7 +382,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `tblDocumentStatusLog`.`statusLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttstatid) {
 				if (!$this->getResult($queryStr))

From 30a264a16a543cfcb98c3a785d2fb0948134d96e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 09:14:46 +0200
Subject: [PATCH 54/76] add note for 4.3.27

---
 SeedDMS_Core/package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 05443f7de..e7d8817a7 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,7 +24,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-callbacks can have more then one user function
+- callbacks can have more then one user function
+- fix some sql statements, because they didn't work with mysql 5.7.5 anymore
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 4bc20da0176cc18c5f950f461b586d810848eaf2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 09:15:55 +0200
Subject: [PATCH 55/76] add entry for 4.3.27

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index eb974ca4e..269fbe03f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools
 - fix strict standard error in SeedDMS_Lucene (Closes #263)
+- fix sql statements, because the didn't work for mysql 5.7.5 anymore (Closes #273)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26

From d7898f972e044658856f4eab4c57a7c17a71de4f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 09:17:35 +0200
Subject: [PATCH 56/76] new version 4.3.27

---
 Makefile                           | 2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 inc/inc.Version.php                | 2 +-
 install/install.php                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 30e3bec8c..74b9eba92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=4.3.26
+VERSION=4.3.27
 SRC=CHANGELOG inc conf utils index.php languages views op out doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 45e93971f..2999fa977 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -274,7 +274,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.3.26';
+			$this->version = '4.3.27';
 	} /* }}} */
 
 	/**
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 9497d5134..e48181fe5 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "4.3.26";
+	public $_number = "4.3.27";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index f3b1536c8..2d1e2d51d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.26");
+define("SEEDDMS_VERSION", "4.3.27");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 5bd85e50f69b29bb454d2fa3fe18301ca756915d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 20:51:17 +0200
Subject: [PATCH 57/76] fix calculation of timeout

---
 SeedDMS_Preview/Preview/Previewer.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index ef37f82a4..6a466adbe 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -72,16 +72,17 @@ class SeedDMS_Preview_Previewer {
 		}
 			 
 		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
 		do {
-			$timeleft = $timeout - time();
-			$read = array($pipes[1]);
-			$write = NULL;
-			$exeptions = NULL;
 			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) {

From f6f9ad8c6d891f17911de95a36b8817f8372c45b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 20:51:40 +0200
Subject: [PATCH 58/76] fix calculation of timeout

---
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 5228570ca..ed664da77 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -44,14 +44,17 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		}
 			 
 		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
 		do {
-			$timeleft = $timeout - time();
-			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
+			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) {

From b6a0d5f60dac8460600e197a47d82568ca70cfbf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 20:52:17 +0200
Subject: [PATCH 59/76] add note

---
 SeedDMS_Preview/package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 26f2e7a37..a712b517b 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -24,8 +24,9 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 add more documentation
-finished deletePreview()
+finish deletePreview()
 add new method deleteDocumentPreviews()
+fix calculation of timeout (Bug #269)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 9b21d8a509e82878e16659542845c98590f93fbd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Jul 2016 20:52:33 +0200
Subject: [PATCH 60/76] new version 1.0.6

---
 SeedDMS_SQLiteFTS/package.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index c55c1ced0..9cb06a0d0 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -14,7 +14,7 @@
  <date>2016-03-29</date>
  <time>08:09:48</time>
  <version>
-  <release>1.0.5</release>
+  <release>1.0.6</release>
   <api>1.0.1</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+fix calculation of timeout (see bug #269)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -146,5 +146,21 @@ add command for indexing postѕcript files
 make it work with sqlite3 &lt; 3.8.0
    </notes>
   </release>
+  <release>
+   <date>2016-03-29</date>
+   <time>08:09:48</time>
+   <version>
+    <release>1.0.5</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+   </notes>
+  </release>
  </changelog>
 </package>

From 7dcee81c511bac020b997e151dba2f20c4fef2da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Jul 2016 17:29:58 +0200
Subject: [PATCH 61/76] make all functions static

---
 SeedDMS_Lucene/Lucene/Indexer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Indexer.php b/SeedDMS_Lucene/Lucene/Indexer.php
index 95df5ca71..58b7204eb 100644
--- a/SeedDMS_Lucene/Lucene/Indexer.php
+++ b/SeedDMS_Lucene/Lucene/Indexer.php
@@ -38,7 +38,7 @@ class SeedDMS_Lucene_Indexer {
 		}
 	} /* }}} */
 
-	function create($luceneDir) { /* {{{ */
+	static function create($luceneDir) { /* {{{ */
 		$index = Zend_Search_Lucene::create($luceneDir);
 		return($index);
 	} /* }}} */
@@ -47,7 +47,7 @@ class SeedDMS_Lucene_Indexer {
 	 * Do some initialization
 	 *
 	 */
-	function init($stopWordsFile='') { /* {{{ */
+	static function init($stopWordsFile='') { /* {{{ */
 		$analyzer = new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive();
 		if($stopWordsFile && file_exists($stopWordsFile)) {
 			$stopWordsFilter = new Zend_Search_Lucene_Analysis_TokenFilter_StopWords();

From e5f8144268967df5fb775b92e431324fa9e2e39e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 5 Jul 2016 17:31:25 +0200
Subject: [PATCH 62/76] make all functions static

---
 SeedDMS_Lucene/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index dc9fc8a20..3f5e3d45c 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 pass variables to stream_select() to fullfill strict standards.
+make all functions in Indexer.php static
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 58182119db3f1662bddb1815d064c1bba0d63371 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 08:25:27 +0200
Subject: [PATCH 63/76] add new key dropfolderdir_missing, add ro translation

---
 languages/ar_EG/lang.inc | 1 +
 languages/bg_BG/lang.inc | 1 +
 languages/ca_ES/lang.inc | 1 +
 languages/cs_CZ/lang.inc | 1 +
 languages/de_DE/lang.inc | 3 ++-
 languages/en_GB/lang.inc | 3 ++-
 languages/es_ES/lang.inc | 1 +
 languages/fr_FR/lang.inc | 1 +
 languages/hr_HR/lang.inc | 5 +++--
 languages/hu_HU/lang.inc | 1 +
 languages/it_IT/lang.inc | 1 +
 languages/ko_KR/lang.inc | 1 +
 languages/nl_NL/lang.inc | 7 ++++---
 languages/pl_PL/lang.inc | 7 ++++---
 languages/pt_BR/lang.inc | 1 +
 languages/ro_RO/lang.inc | 5 +++--
 languages/ru_RU/lang.inc | 1 +
 languages/sk_SK/lang.inc | 1 +
 languages/sv_SE/lang.inc | 5 +++--
 languages/tr_TR/lang.inc | 1 +
 languages/uk_UA/lang.inc | 1 +
 languages/zh_CN/lang.inc | 1 +
 languages/zh_TW/lang.inc | 1 +
 23 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index b9cc9688a..1a960363c 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -362,6 +362,7 @@ URL: [url]',
 'draft_pending_approval' => 'مسودة - قيد الموافقة',
 'draft_pending_review' => 'مسودة - قيد المراجعة',
 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'ملف من مجلد التجميع',
 'dropfolder_folder' => '',
 'dropupload' => 'رفع سريع',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 15aad9dde..885eb4d25 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -317,6 +317,7 @@ $text = array(
 'draft_pending_approval' => 'Чернова - очаква утвърждаване',
 'draft_pending_review' => 'Чернова - очаква рецензия',
 'drag_icon_here' => 'Провлачи икона или папка, или документ ТУК!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл от drop папка',
 'dropfolder_folder' => '',
 'dropupload' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 9ce73354a..32a028106 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -322,6 +322,7 @@ URL: [url]',
 'draft_pending_approval' => 'Esborrany - pendent d\'aprovació',
 'draft_pending_review' => 'Esborrany - pendent de revisió',
 'drag_icon_here' => 'Arrossegui aquí una icona de carpeta o document',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
 'dropfolder_folder' => '',
 'dropupload' => 'Pujada ràpida',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index be3e86302..3f5133237 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -369,6 +369,7 @@ URL: [url]',
 'draft_pending_approval' => 'Návrh - čeká na schválení',
 'draft_pending_review' => 'Návrh - čeká na kontrolu',
 'drag_icon_here' => 'Přetáhnout ikonu složky nebo dokumentu sem!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Soubor z "přetažené" složky',
 'dropfolder_folder' => '',
 'dropupload' => 'Rychlý upload',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 3a4a8e446..0ae2ded9a 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (2238), dgrutsch (21)
+//    Translators: Admin (2239), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => 'Entwurf - bevorstehende Freigabe',
 'draft_pending_review' => 'Entwurf - bevorstehende Prüfung',
 'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!',
+'dropfolderdir_missing' => 'Ihr persönlicher Ablageordner auf dem Server existiert nicht! Kontaktieren Sie den Administrator, um in anlegen zu lassen.',
 'dropfolder_file' => 'Datei aus Ablageordner',
 'dropfolder_folder' => 'Ordner aus Ablageordner',
 'dropupload' => 'Direkt Hochladen',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 16ebb1bca..a22f2b792 100644
--- a/languages/en_GB/lang.inc
+++ b/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 (1387), dgrutsch (7), netixw (14)
+//    Translators: Admin (1388), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => 'Draft - pending approval',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Drag icon of folder or document here!',
+'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.',
 'dropfolder_file' => 'File from drop folder',
 'dropfolder_folder' => 'Folder from drop folder',
 'dropupload' => 'Fast upload',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 90fc96018..30f41f8fd 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -369,6 +369,7 @@ URL: [url]',
 'draft_pending_approval' => 'Borador - pendiente de aprobación',
 'draft_pending_review' => 'Borrador - pendiente de revisión',
 'drag_icon_here' => 'Arrastre carpeta o documento aquí!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fichero de la carpeta destino',
 'dropfolder_folder' => '',
 'dropupload' => 'Carga Rapida',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 1b5ee6fdd..00ac3e297 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -369,6 +369,7 @@ URL: [url]',
 'draft_pending_approval' => 'Ebauche - En cours d\'approbation',
 'draft_pending_review' => 'Ebauche - En cours de correction',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fichier du dossier déposé',
 'dropfolder_folder' => '',
 'dropupload' => 'Téléchargement rapide',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index a7a34766b..bbdbd9581 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/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 (1186), marbanas (16)
+//    Translators: Admin (1187), marbanas (16)
 
 $text = array(
 'accept' => 'Prihvati',
@@ -233,7 +233,7 @@ Internet poveznica: [url]',
 'choose_workflow_action' => 'Odaberite radnju toka rada',
 'choose_workflow_state' => 'Odaberite status toka rada',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Obriši keš',
 'clear_clipboard' => 'Očistite međuspremnik',
 'clear_password' => '',
 'clipboard' => 'Međuspremnik',
@@ -374,6 +374,7 @@ Internet poveznica: [url]',
 'draft_pending_approval' => 'Skica - čeka odobrenje',
 'draft_pending_review' => 'Skica - čeka pregled',
 'drag_icon_here' => 'Ovdje povuci ikonu mape ili dokumenta!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Datoteka iz padajuće mape',
 'dropfolder_folder' => '',
 'dropupload' => 'Zona za brzo učitavanje',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 60529dc1e..9f6048b00 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -369,6 +369,7 @@ URL: [url]',
 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Állomány a dropfolder-ből',
 'dropfolder_folder' => '',
 'dropupload' => 'Gyors feltöltés',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 2b1b5215e..162ea1503 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -375,6 +375,7 @@ URL: [url]',
 'draft_pending_approval' => 'Bozza - in approvazione',
 'draft_pending_review' => 'Bozza - in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Scegli file dal server',
 'dropfolder_folder' => '',
 'dropupload' => 'Caricamento Rapido',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index e8f4d8159..3ab064bcc 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => '초안 - 보류 승인',
 'draft_pending_review' => '초안 - 검토 대기',
 'drag_icon_here' => '여기에 폴더 나 문서의 아이콘을 끌어!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '드롭 폴더 파일',
 'dropfolder_folder' => '',
 'dropupload' => '빠른 업로드',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index aac99f067..909afaeab 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/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 (716), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (718), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -226,7 +226,7 @@ URL: [url]',
 'choose_workflow_action' => 'Kies workflow actie',
 'choose_workflow_state' => 'kiest workflowstatus',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Cache leegmaken',
 'clear_clipboard' => 'Vrijgeven klembord',
 'clear_password' => '',
 'clipboard' => 'Klembord',
@@ -367,6 +367,7 @@ URL: [url]',
 'draft_pending_approval' => 'Draft - in afwachting van goedkeuring',
 'draft_pending_review' => 'Draft - in afwachting van controle',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Bestand van dropfolder',
 'dropfolder_folder' => '',
 'dropupload' => 'Snel toevoegen',
@@ -1187,7 +1188,7 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
 'settings_quota' => 'Gebruikersquotum',
 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.',
-'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
 'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Beperkte toegang',
 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 47d541e24..1557ddf09 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/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 (735), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (737), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -362,6 +362,7 @@ URL: [url]',
 'draft_pending_approval' => 'Szkic - w oczekiwaniu na akceptację',
 'draft_pending_review' => 'Szkic - w oczekiwaniu na opinię',
 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Plik z folderu rozwijanego',
 'dropfolder_folder' => '',
 'dropupload' => 'Szybki upload',
@@ -887,8 +888,8 @@ URL: [url]',
 'search_fulltext' => 'Przeszukaj całe teksty',
 'search_in' => 'Szukaj w',
 'search_mode_and' => 'wszystkie słowa',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Tylko dokumenty',
+'search_mode_folders' => 'Tylko foldery',
 'search_mode_or' => 'conajmnej jedno słowo',
 'search_no_results' => 'Nie znaleziono dokumentów spełniających kryteria wyszukiwania.',
 'search_query' => 'Wyszukaj',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index e92a70a5a..fae71e0ee 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -368,6 +368,7 @@ URL: [url]',
 'draft_pending_approval' => 'Rascunho - Aprovação pendente',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
 'dropfolder_folder' => '',
 'dropupload' => 'Upload rápido',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 7b66c04f4..b7f3ca039 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/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 (1042), balan (87)
+//    Translators: Admin (1043), balan (87)
 
 $text = array(
 'accept' => 'Accept',
@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => 'Proiect - în așteptarea aprobarii',
 'draft_pending_review' => 'Proiect - în așteptarea revizuirii',
 'drag_icon_here' => 'Trageți iconul de folder sau document aici!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fișiere din folderele aruncate (File from drop folder)',
 'dropfolder_folder' => '',
 'dropupload' => 'Încărcare rapidă',
@@ -1362,7 +1363,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'așteaptă aprobare',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => 'în proces',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versiune [versiune]: [stare]',
 'to' => 'La',
 'toggle_manager' => 'Comută Manager',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 3829eaca4..e94cf19b7 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => '<b>Черновик</b> — ожидает утверждения',
 'draft_pending_review' => '<b>Черновик</b> — ожидает рецензии',
 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл из проходного каталога',
 'dropfolder_folder' => '',
 'dropupload' => 'Быстрая загрузка',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a5de71d7c..72c48c312 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -321,6 +321,7 @@ URL: [url]',
 'draft_pending_approval' => 'Návrh - čaká na schválenie',
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
 'dropfolder_folder' => '',
 'dropupload' => 'Rýchlo nahraj',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 5177e9209..fcdd1a63c 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/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 (1128), tmichelfelder (106)
+//    Translators: Admin (1129), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -221,7 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Välj åtgärd för arbetsflödet',
 'choose_workflow_state' => 'Välj status för arbetsflödet',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Rensa cache',
 'clear_clipboard' => 'Rensa urklipp',
 'clear_password' => '',
 'clipboard' => 'Urklipp',
@@ -362,6 +362,7 @@ URL: [url]',
 'draft_pending_approval' => 'Utkast: väntar på godkännande',
 'draft_pending_review' => 'Utkast: väntar på granskning',
 'drag_icon_here' => 'Dra ikon av mappen eller dokument hit!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fil från mellanlagrings-mappen',
 'dropfolder_folder' => '',
 'dropupload' => 'Snabb uppladdning',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 90a8db147..2a3d1d377 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -368,6 +368,7 @@ URL: [url]',
 'draft_pending_approval' => 'Taslak - onay bekliyor',
 'draft_pending_review' => 'Taslak - kontrol bekliyor',
 'drag_icon_here' => 'Klasör veya dokümanın ikonunu buraya sürükleyin!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Sürüklenen klasörden dosya',
 'dropfolder_folder' => '',
 'dropupload' => 'Hızlı yükleme',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 8a3d77743..d8e50e361 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => '<b>Чернетка</b> — Очікує на затвердження',
 'draft_pending_review' => '<b>Чернетка</b> — Очікує на рецензію',
 'drag_icon_here' => 'Перетягніть сюди значок документа чи каталогу',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл з прохідного каталогу',
 'dropfolder_folder' => '',
 'dropupload' => 'Швидке завантаження',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 3d852b13d..82b8c4fcd 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -323,6 +323,7 @@ URL: [url]',
 'draft_pending_approval' => '待审核',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '所选文件夹的文件',
 'dropfolder_folder' => '',
 'dropupload' => '快速上传',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 9ee761a87..8ab3dbcad 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -321,6 +321,7 @@ URL: [url]',
 'draft_pending_approval' => '待審核',
 'draft_pending_review' => '待校對',
 'drag_icon_here' => '拖動圖示到這裡',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '檔案來源為 drop 目錄',
 'dropfolder_folder' => '',
 'dropupload' => '快速上傳',

From 4b0787147f17e58733256451f6b91116ea2a6f4e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:00:56 +0200
Subject: [PATCH 64/76] check if cache dir exists before deleting it

---
 SeedDMS_Preview/Preview/Previewer.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 6a466adbe..51f2bbdd1 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -383,7 +383,11 @@ class SeedDMS_Preview_Previewer {
 			return false;
 
 		$dir = $this->previewDir.'/'.$document->getDir();
-		return SeedDMS_Preview_Previewer::recurseRmdir($dir);
+		if(file_exists($dir) && is_dir($dir)) {
+			return SeedDMS_Preview_Previewer::recurseRmdir($dir);
+		} else {
+			return false;
+		}
 
 	} /* }}} */
 }

From 54c295276ba7d3bb93edf6b9b5409e5181a00192 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:02:16 +0200
Subject: [PATCH 65/76] add note

---
 SeedDMS_Preview/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index a712b517b..681e952bf 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -27,6 +27,7 @@ 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>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From f8a6b7e59939e5db0b75731bc954e345e063a9b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:03:14 +0200
Subject: [PATCH 66/76] distinguish between files and folders in
 printDropFolderChooser()

if $showfolders is set, only folders will be shown
---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ff5897f2c..cbb502d8a 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1112,13 +1112,13 @@ $('#acceptkeywords').click(function(ev) {
 		print "<div class=\"input-append\">\n";
 		print "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
 		print "<button type=\"button\" class=\"btn\" id=\"clearFilename".$formName."\"><i class=\"icon-remove\"></i></button>";
-		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("choose_target_file")."…</a>\n";
+		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		print "</div>\n";
 ?>
 <div class="modal hide" id="dropfolderChooser" tabindex="-1" role="dialog" aria-labelledby="dropfolderChooserLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="dropfolderChooserLabel"><?php printMLText("choose_target_file") ?></h3>
+    <h3 id="dropfolderChooserLabel"><?php echo ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")) ?></h3>
   </div>
   <div class="modal-body">
 		<p><?php printMLText('files_loading') ?></p>

From 32d69b61d80d4f631f28fe5f08bc816c2a22068b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:04:15 +0200
Subject: [PATCH 67/76] if $showfolders is set, only folders are shown

---
 views/bootstrap/class.DropFolderChooser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index e26c9276b..10541e5fc 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -78,15 +78,15 @@ $('.folderselect').click(function(ev) {
 				$finfo = finfo_open(FILEINFO_MIME_TYPE);
 				while (false !== ($entry = $d->read())) {
 					if($entry != '..' && $entry != '.') {
-						if(!is_dir($dir.'/'.$entry)) {
+						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
 							$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 							echo "<tr><td style=\"min-width: ".$previewwidth."px;\">";
 							if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-								echo "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
+								echo "<img style=\"cursor: pointer;\" class=\"fileselect mimeicon\" filename=\"".$entry."\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
 							}
 							echo "</td><td><span style=\"cursor: pointer;\" class=\"fileselect\" filename=\"".$entry."\">".$entry."</span></td><td align=\"right\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."</td><td>".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</td></tr>\n";
-						} elseif($showfolders) {
+						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
 							echo "<tr>";
 							echo "<td></td>";
 							echo "<td><span style=\"cursor: pointer;\" class=\"folderselect\" foldername=\"".$entry."\" >".$entry."</span></td><td align=\"right\"></td><td></td>";

From db53cc518aefcf0d63cad10473564f5557ce851a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:05:21 +0200
Subject: [PATCH 68/76] check id dropfolder exists

do not show the form but a warning if the drop folder doesn't exist
---
 views/bootstrap/class.ImportFS.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 192e95fc1..37829cb64 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -49,13 +49,13 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("import_fs"));
-		$this->contentContainerStart();
 
-		print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
-		print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
-		$this->printFolderChooserHtml("form1",M_READWRITE);
-		print "</div></div>";
-		if($dropfolderdir) {
+		if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
+			$this->contentContainerStart();
+			print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
+			print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
+			$this->printFolderChooserHtml("form1",M_READWRITE);
+			print "</div></div>";
 			print "<div class=\"control-group\"><label class=\"control-label\">";
 			printMLText("dropfolder_folder");
 			echo ": ";
@@ -63,14 +63,18 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 			/* Setting drop folder dir to "" will force to take the default from settings.xml */
 			$this->printDropFolderChooserHtml("form1", "", 1);
 			print "</div></div>";
+			print "<div class=\"control-group\"><label class=\"control-label\">";
+			print "</label><div class=\"controls\">";
+			print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/><br />";
+			print "</div></div>";
+			print "</form>\n";
+			$this->contentContainerEnd();
+		} else {
+			echo "<div class=\"alert alert-warning\">";
+			printMLText("dropfolderdir_missing");
+			echo "</div>\n";
 		}
-		print "<div class=\"control-group\"><label class=\"control-label\">";
-		print "</label><div class=\"controls\">";
-		print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/><br />";
-		print "</div></div>";
-		print "</form>\n";
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From ea5425a66980367af7f632f64ca42ef621477543 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:06:09 +0200
Subject: [PATCH 69/76] fix error message if the import object is not a folder
 but a file

---
 op/op.ImportFS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php
index e8bb3fa00..d64ec17a1 100644
--- a/op/op.ImportFS.php
+++ b/op/op.ImportFS.php
@@ -25,7 +25,7 @@ if (empty($_GET["dropfolderfileform1"])) {
 }
 $dirname = $settings->_dropFolderDir.'/'.$user->getLogin()."/".$_GET["dropfolderfileform1"];
 if(!is_dir($dirname)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("invalid_target_folder"));
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_dropfolder_folder"));
 }
 
 function import_folder($dirname, $folder) { /* {{{ */

From ccbe4291c625126d3c7c21dc2ad86aabd62b86ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:23:06 +0200
Subject: [PATCH 70/76] add phrase invalid_dropfolder_folder

---
 languages/ar_EG/lang.inc | 1 +
 languages/bg_BG/lang.inc | 1 +
 languages/ca_ES/lang.inc | 1 +
 languages/cs_CZ/lang.inc | 1 +
 languages/de_DE/lang.inc | 3 ++-
 languages/en_GB/lang.inc | 3 ++-
 languages/es_ES/lang.inc | 1 +
 languages/fr_FR/lang.inc | 1 +
 languages/hr_HR/lang.inc | 1 +
 languages/hu_HU/lang.inc | 1 +
 languages/it_IT/lang.inc | 1 +
 languages/ko_KR/lang.inc | 1 +
 languages/nl_NL/lang.inc | 1 +
 languages/pl_PL/lang.inc | 1 +
 languages/pt_BR/lang.inc | 1 +
 languages/ro_RO/lang.inc | 1 +
 languages/ru_RU/lang.inc | 1 +
 languages/sk_SK/lang.inc | 1 +
 languages/sv_SE/lang.inc | 1 +
 languages/tr_TR/lang.inc | 1 +
 languages/uk_UA/lang.inc | 1 +
 languages/zh_CN/lang.inc | 1 +
 languages/zh_TW/lang.inc | 1 +
 23 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 1a960363c..dc338ff73 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -526,6 +526,7 @@ URL: [url]',
 'invalid_create_date_end' => 'تاريخ نهائي خاطىء لانشاء مدى تاريخي',
 'invalid_create_date_start' => 'تاريخ ابتدائي خاطيء لانشاء مدى تاريخي',
 'invalid_doc_id' => 'معرف مستند خاطىء',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'معرف ملف خاطىء',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 885eb4d25..8323e3524 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -457,6 +457,7 @@ $text = array(
 'invalid_create_date_end' => 'Неправилна крайна дата за диапазаона на датата на създаване',
 'invalid_create_date_start' => 'Неправилна начална дата за диапазаона на датата на създаване',
 'invalid_doc_id' => 'Неправилен идентификатор на документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Неправилен идентификатор на файла',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 32a028106..6c892597b 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -462,6 +462,7 @@ URL: [url]',
 'invalid_create_date_end' => 'La data de final no és vàlida per a la creació de rangs de dates.',
 'invalid_create_date_start' => 'La data d\'inici no és vàlida per a la creació de rangs de dates.',
 'invalid_doc_id' => 'ID de document no vàlid',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fitxer no vàlid',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 3f5133237..9a54c1b02 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -533,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Neplatné koncové datum vytvoření.',
 'invalid_create_date_start' => 'Neplatné počáteční datum vytvoření.',
 'invalid_doc_id' => 'Neplatný ID dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nevalidní ID souboru',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 0ae2ded9a..5e22ed405 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (2239), dgrutsch (21)
+//    Translators: Admin (2240), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -538,6 +538,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Unzulässiges Erstellungsenddatum.',
 'invalid_create_date_start' => 'Unzulässiges Erstellungsstartdatum.',
 'invalid_doc_id' => 'Unzulässige Dokumentenidentifikation',
+'invalid_dropfolder_folder' => 'Ungültiger Ordner im Ablageordner',
 'invalid_expiration_date_end' => 'Unzulässiges Ablaufenddatum.',
 'invalid_expiration_date_start' => 'Unzulässiges Ablaufstartdatum.',
 'invalid_file_id' => 'Ungültige Datei-ID',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index a22f2b792..a4042fa8a 100644
--- a/languages/en_GB/lang.inc
+++ b/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 (1388), dgrutsch (7), netixw (14)
+//    Translators: Admin (1389), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -538,6 +538,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Invalid end date for creation date range.',
 'invalid_create_date_start' => 'Invalid start date for creation date range.',
 'invalid_doc_id' => 'Invalid Document ID',
+'invalid_dropfolder_folder' => 'Invalid folder in drop folder',
 'invalid_expiration_date_end' => 'Invalid end date for expiration date range.',
 'invalid_expiration_date_start' => 'Invalid start date for expiration date range.',
 'invalid_file_id' => 'Invalid file ID',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 30f41f8fd..827175523 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -533,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Fecha de fin no válida para creación de rango de fechas.',
 'invalid_create_date_start' => 'Fecha de inicio no válida para creación de rango de fechas.',
 'invalid_doc_id' => 'ID de documento no válido',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fichero no válido',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 00ac3e297..e32c2a005 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -533,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Date de fin invalide pour la plage de dates de création.',
 'invalid_create_date_start' => 'Date de début invalide pour la plage de dates de création.',
 'invalid_doc_id' => 'Identifiant de document invalide',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Identifiant de fichier invalide',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index bbdbd9581..2eb21f20a 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -538,6 +538,7 @@ Internet poveznica: [url]',
 'invalid_create_date_end' => 'Pogrešan krajnji datum za izradu vremenskog raspona.',
 'invalid_create_date_start' => 'Pogrešan početni datum za izradu vremenskog raspona.',
 'invalid_doc_id' => 'Pogrešan ID dokumenta',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Neispravan datum isteka za datumski raspon isteka.',
 'invalid_expiration_date_start' => 'Neispravan početni datum za datumski raspon isteka.',
 'invalid_file_id' => 'Pogrešan ID datoteke',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 9f6048b00..bbac6f0c0 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -533,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Érvénytelen befejezési dátum a létrehozási dátum tartományban.',
 'invalid_create_date_start' => 'Érvénytelen kezdési dátum a létrehozási dátum tartományban.',
 'invalid_doc_id' => 'Érvénytelen dokumentum azonosító',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Érvénytelen állomány azonosító',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 162ea1503..5ad2a5029 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -539,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale',
 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale',
 'invalid_doc_id' => 'ID del documento non valido',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID del file non valido',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 3ab064bcc..d8cd38c07 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -538,6 +538,7 @@ URL: [url]',
 'invalid_create_date_end' => '작성 날짜 범위에 대한 잘못된 종료 날짜.',
 'invalid_create_date_start' => '작성 날짜 범위에 대한 잘못된 시작 날짜.',
 'invalid_doc_id' => '잘못된 문서 ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '잘못된 유효 기간 종료',
 'invalid_expiration_date_start' => '잘못된 유효 기간 시작',
 'invalid_file_id' => '잘못된 파일 ID',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 909afaeab..3313e058a 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -531,6 +531,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Foutieve eind-datum voor het maken van een periode.',
 'invalid_create_date_start' => 'Foutieve begin-datum voor het maken van een periode.',
 'invalid_doc_id' => 'Foutief Document ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Foute expiratiedatum',
 'invalid_expiration_date_start' => 'Foute startdatum',
 'invalid_file_id' => 'Foutief Bestand ID',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 1557ddf09..a65f79d1b 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -526,6 +526,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Nieprawidłowa data końcowa dla tworzenia przedziału czasowego.',
 'invalid_create_date_start' => 'Nieprawidłowa data początkowa dla tworzenia przedziału czasowego.',
 'invalid_doc_id' => 'Nieprawidłowy identyfikator dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nieprawidłowy identyfikator pliku',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index fae71e0ee..9a8245252 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -532,6 +532,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Invalid end date for creation date range.',
 'invalid_create_date_start' => 'Invalid start date for creation date range.',
 'invalid_doc_id' => 'ID de documento inválida',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Invalid file ID',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index b7f3ca039..f2cd8c11c 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -538,6 +538,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Dată de încheiere invalidă pentru crearea intervalului de date.',
 'invalid_create_date_start' => 'Dată de începere invalidă pentru crearea intervalului de date.',
 'invalid_doc_id' => 'ID Document invalid',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID fisier invalid',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index e94cf19b7..956092f8e 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -538,6 +538,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Неверная конечная дата диапазона даты создания',
 'invalid_create_date_start' => 'Неверная начальная дата диапазона даты создания',
 'invalid_doc_id' => 'Неверный идентификатор документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Неверная конечная дата для диапазона срока исполнения.',
 'invalid_expiration_date_start' => 'Неверная начальная дата для диапазона срока исполнения.',
 'invalid_file_id' => 'Неверный идентификатор файла',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 72c48c312..e8dc447c2 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Neplatný koncový dátum vytvorenia.',
 'invalid_create_date_start' => 'Neplatný počiatočný dátum vytvorenia.',
 'invalid_doc_id' => 'Neplatný ID dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nesprávne ID súboru',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index fcdd1a63c..b8763c9b3 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -526,6 +526,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Ogiltigt slutdatum för intervall.',
 'invalid_create_date_start' => 'Ogiltigt startdatum för intervall.',
 'invalid_doc_id' => 'Ogiltigt dokument-ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Ogiltigt fil-ID',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 2a3d1d377..92362f6d6 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -532,6 +532,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Oluşturma tarih aralığı için geçersiz bitiş tarihi.',
 'invalid_create_date_start' => 'Oluşturma tarih aralığı için geçersiz başlangıç tarihi.',
 'invalid_doc_id' => 'Geçersiz Doküman ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Geçersiz dosya ID',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index d8e50e361..ebb56f20e 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -538,6 +538,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Невірна кінцева дата діапазону дати створення',
 'invalid_create_date_start' => 'Невірна початкова дата діапазону дати створення',
 'invalid_doc_id' => 'Невірний ідентифікатор документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Невірна кінцева дата діапазону терміна виконання.',
 'invalid_expiration_date_start' => 'Невірна початкова дата діапазону терміна виконання.',
 'invalid_file_id' => 'Невірний ідентифікатор файлу',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 82b8c4fcd..20d0ab08b 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -463,6 +463,7 @@ URL: [url]',
 'invalid_create_date_end' => '无效截止日期,不在创建日期范围内',
 'invalid_create_date_start' => '无效开始日期,不在创建日期范围内',
 'invalid_doc_id' => '无效文档ID号',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => '无效文件ID号',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 8ab3dbcad..8ee53ae9c 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'invalid_create_date_end' => '無效截止日期,不在創建日期範圍內',
 'invalid_create_date_start' => '無效開始日期,不在創建日期範圍內',
 'invalid_doc_id' => '無效文檔ID號',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => '無效檔ID號',

From e4dce2f3fad8fafd344d957aa37851240ff454a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 09:23:51 +0200
Subject: [PATCH 71/76] completed for 4.3.27

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 269fbe03f..121b9a5e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
 - check for minimum number of attribute values for each attribute type
-- fix selection of imported folder in ImportFS
+- fix selection of imported folder in ImportFS, add it to the admin menu
 - file from drop folder can be removed after successful upload
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools

From 6578621a3cda362b2c760455f8440701c3cf826a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 10:28:55 +0200
Subject: [PATCH 72/76] add phrase import_fs_warning

---
 languages/ar_EG/lang.inc | 1 +
 languages/bg_BG/lang.inc | 1 +
 languages/ca_ES/lang.inc | 1 +
 languages/cs_CZ/lang.inc | 1 +
 languages/de_DE/lang.inc | 3 ++-
 languages/en_GB/lang.inc | 3 ++-
 languages/es_ES/lang.inc | 1 +
 languages/fr_FR/lang.inc | 1 +
 languages/hr_HR/lang.inc | 1 +
 languages/hu_HU/lang.inc | 1 +
 languages/it_IT/lang.inc | 1 +
 languages/ko_KR/lang.inc | 1 +
 languages/nl_NL/lang.inc | 1 +
 languages/pl_PL/lang.inc | 1 +
 languages/pt_BR/lang.inc | 1 +
 languages/ro_RO/lang.inc | 1 +
 languages/ru_RU/lang.inc | 1 +
 languages/sk_SK/lang.inc | 1 +
 languages/sv_SE/lang.inc | 1 +
 languages/tr_TR/lang.inc | 1 +
 languages/uk_UA/lang.inc | 1 +
 languages/zh_CN/lang.inc | 1 +
 languages/zh_TW/lang.inc | 1 +
 23 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index dc338ff73..b4efb5e2f 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -507,6 +507,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8323e3524..2abd8dfbf 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -438,6 +438,7 @@ $text = array(
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 6c892597b..8c3bc0b53 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -443,6 +443,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 9a54c1b02..2b09834da 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -514,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 5e22ed405..d0f978a6d 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (2240), dgrutsch (21)
+//    Translators: Admin (2241), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -519,6 +519,7 @@ URL: [url]',
 'import' => 'Importiere',
 'importfs' => 'Importiere aus Dateisystem',
 'import_fs' => 'Aus Dateisystem importieren',
+'import_fs_warning' => 'Der Import kann nur für Ordner im Ablageordner erfolgen. Alle Ordner und Dateien werden rekursiv importiert. Dateien werden sofort freigegeben.',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index a4042fa8a..6575659c5 100644
--- a/languages/en_GB/lang.inc
+++ b/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 (1389), dgrutsch (7), netixw (14)
+//    Translators: Admin (1391), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -519,6 +519,7 @@ URL: [url]',
 'import' => 'Import',
 'importfs' => 'Import from Filesystem',
 'import_fs' => 'Import from filesystem',
+'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 827175523..2437468af 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -514,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index e32c2a005..547bd2120 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -514,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 2eb21f20a..fd30c71be 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -519,6 +519,7 @@ Internet poveznica: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index bbac6f0c0..c26d0b62b 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -514,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 5ad2a5029..70fba75e1 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -520,6 +520,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index d8cd38c07..05473f3fb 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -519,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '서브 디렉토리를 포함',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 3313e058a..479f84a0f 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -512,6 +512,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index a65f79d1b..c7e5ffa2f 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -507,6 +507,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9a8245252..a502d42b1 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -513,6 +513,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index f2cd8c11c..00fad576c 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -519,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 956092f8e..60f4c02c4 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -519,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index e8dc447c2..b5764231a 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -442,6 +442,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index b8763c9b3..aed205b61 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -507,6 +507,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 92362f6d6..70616f3ff 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -513,6 +513,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index ebb56f20e..98170f86a 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -519,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 20d0ab08b..556031f64 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -444,6 +444,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 8ee53ae9c..59888a7c8 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -442,6 +442,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',

From 79ae595b7d33d51726510bea1dc97e400ca5d409 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 10:30:32 +0200
Subject: [PATCH 73/76] add ImportFS to menu

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index cbb502d8a..e7d9c103c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -573,6 +573,7 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("misc")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		echo "      <li><a href=\"../out/out.ImportFS.php\">".getMLText("import_fs")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Statistic.php\">".getMLText("folders_and_documents_statistic")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";

From 2b17ffc2072eaac9fd72004ecbb8487333b8ff67 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 10:30:53 +0200
Subject: [PATCH 74/76] add warning on top of form

---
 views/bootstrap/class.ImportFS.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 37829cb64..9bf154941 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -51,6 +51,9 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("import_fs"));
 
 		if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
+			echo "<div class=\"alert alert-warning\">";
+			printMLText("import_fs_warning");
+			echo "</div>\n";
 			$this->contentContainerStart();
 			print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
 			print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";

From 3a3a5c24aef7d694ef8bbbbd87b07b2b2700ac92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 10:31:10 +0200
Subject: [PATCH 75/76] some minor corrections

---
 CHANGELOG | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 121b9a5e6..0af714074 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,12 +2,12 @@
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
 - check for minimum number of attribute values for each attribute type
-- fix selection of imported folder in ImportFS, add it to the admin menu
+- fix selection of imported folder in ImportFS, add it to the admin tools
 - file from drop folder can be removed after successful upload
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools
 - fix strict standard error in SeedDMS_Lucene (Closes #263)
-- fix sql statements, because the didn't work for mysql 5.7.5 anymore (Closes #273)
+- fix some sql statements, because they didn't work for mysql 5.7.5 anymore (Closes #273)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26

From 25c57db20515a7c3ba986c03c861277a788d8660 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 11:28:56 +0200
Subject: [PATCH 76/76] include missing inc/inc.Init.php

---
 out/out.ImportFS.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php
index ff9a44ded..f0162d0fd 100644
--- a/out/out.ImportFS.php
+++ b/out/out.ImportFS.php
@@ -17,11 +17,13 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.ClassUI.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
 
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));