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

CHANGELOG

@@ -138,16 +138,17 @@
 - new controller EmptyFolder (currently not used)
 - check for duplicate mails to the same group when a workflow was triggered
 - new hook to output clipboard items
+- turn on load on demand again in the folder tree
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.11
 --------------------------------------------------------------------------------
 - fix for CVE-2019-12744 (Remote Command Execution through unvalidated
   file upload), add .htaccess file to data directory, better documentation
-	for installing seeddms
+       for installing seeddms
 - fix for CVE-2019-12745 (Persistent or Stored XSS in UsrMgr) and
   CVE-2019-12801 (Persistent or Stored XSS in GroupMgr), propperly escape
-	strings used in Select2 js library used by UsrMgr and GroupMgr
+       strings used in Select2 js library used by UsrMgr and GroupMgr
 - do not show attributes in search results in extra column anymore
 - fix setting language during login (Closes #437)
 - fix indexing documents even if no preIndexDocument hook is set (Closes #437)
@@ -202,7 +203,7 @@
 - catch error when updating a document fails (Closes #410)
 - use always 'Send from' address as Return-Path when set, only if not set the
   logged in user's email will be used (Closes #418)
-- show the debug output when sending a test mail
+- show the debug output when sendind a test mail
 - add hooks add hooks folderListPreContent and folderListPostContent in
   class.ViewFolder.php
 - do not redirect to ForcePassword page if out.Logout.php was opened. This

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -1965,9 +1965,6 @@ class SeedDMS_Core_DMS {
 					// Prepare the complete search query, including the LIMIT clause.
 					$searchQuery = "SELECT DISTINCT `tblFolders`.`id` ".$searchQuery." GROUP BY `tblFolders`.`id`";
 
-					if($limit) {
-						$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
-					}
 					switch($orderby) {
 					case 'dd':
 						$searchQuery .= " ORDER BY `tblFolders`.`date` DESC";
@@ -1983,6 +1980,10 @@ class SeedDMS_Core_DMS {
 					default:
 						$searchQuery .= " ORDER BY `tblFolders`.`name`";
 						break;
+                    }
+
+					if($limit) {
+						$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
 					}
 
 					// Send the complete search query to the database.
@@ -2267,11 +2268,12 @@ class SeedDMS_Core_DMS {
 							$offset -= $totalFolders;
 						else
 							$offset = 0;
-						if($limit)
-							$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
 
 						$searchQuery .= $orderbyQuery;
 
+						if($limit)
+							$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
+
 						// Send the complete search query to the database.
 						$resArr = $this->db->getResultArray($searchQuery);
 						if($resArr === false)

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -2142,7 +2142,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$status = $version->getStatus();
 		$stID = $status["statusID"];
 
-		$queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() .	" AND `version` = " . $version->_version;
+		$queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() .	" AND `version` = " . $version->getVersion();
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2166,7 +2166,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		$queryStr = "DELETE FROM `tblDocumentStatus` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblDocumentStatus` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2196,7 +2196,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			}
 		}
-		$queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2225,7 +2225,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			}
 		}
-		$queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2289,7 +2289,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			}
 		}
 
-		$queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2297,7 +2297,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		/* Will be deleted automatically when record will be deleted
 		 * from tblWorkflowDocumentContent
-		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2305,7 +2305,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		 */
 
 		// remove document files attached to version
-		$res = $this->getDocumentFiles($version->_version);
+		$res = $this->getDocumentFiles($version->getVersion());
 		if (is_bool($res) && !$res) {
 			$db->rollbackTransaction();
 			return false;
@@ -3052,6 +3052,70 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
  * @version    Release: @package_version@
  */
 class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
+	/**
+	 * @var object document
+	 */
+	protected $_document;
+
+	/**
+	 * @var integer version
+	 */
+	protected $_version;
+
+	/**
+	 * @var string comment
+	 */
+	protected $_comment;
+
+	/**
+	 * @var string date
+	 */
+	protected $_date;
+
+	/**
+	 * @var integer userID
+	 */
+	protected $_userID;
+
+	/**
+	 * @var string dir on disk (deprecated)
+	 */
+	protected $_dir;
+
+	/**
+	 * @var string original file name
+	 */
+	protected $_orgFileName;
+
+	/**
+	 * @var string file type (actually the extension without the leading dot)
+	 */
+	protected $_fileType;
+
+	/**
+	 * @var string mime type
+	 */
+	protected $_mimeType;
+
+	/**
+	 * @var string checksum of content
+	 */
+	protected $_checksum;
+
+	/**
+	 * @var object workflow
+	 */
+	protected $_workflow;
+
+	/**
+	 * @var object workflow state
+	 */
+	protected $_workflowState;
+
+	/**
+	 * @var object dms
+	 */
+	public $_dms;
 
 	/**
 	 * Recalculate the status of a document
@@ -3217,7 +3281,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getOriginalFileName() { return $this->_orgFileName; }
 	function getFileType() { return $this->_fileType; }
 	function getFileName(){ return $this->_version . $this->_fileType; }
-	function getDir() { return $this->_dir; }
+	/**
+	 * getDir and the corresponding database table field are deprecated
+	 */
+	function __getDir() { return $this->_dir; }
 	function getMimeType() { return $this->_mimeType; }
 	function getRevisionDate() { return $this->_revisionDate; }
 	function getDocument() { return $this->_document; }

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -1113,7 +1113,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *
 	 * @return boolean true on success, false in case of an error
 	 */
-	function empty() { /* {{{ */
+	function emptyFolder() { /* {{{ */
 		/** @noinspection PhpUnusedLocalVariableInspection */
 		$db = $this->_dms->getDB();
 

controllers/class.EmptyFolder.php

@@ -58,7 +58,7 @@ class SeedDMS_Controller_EmptyFolder extends SeedDMS_Controller_Common {
 			if($index)
 				$dms->setCallback('onPreEmptyDocument', 'removeFromIndex', array($index, $indexconf));
 
-			if (!$folder->empty()) {
+			if (!$folder->emptyFolder()) {
 				$this->errormsg = 'error_occured';
 				return false;
 			}

inc/inc.Utils.php

@@ -485,21 +485,35 @@ function checkQuota($user) { /* {{{ */
 	return ($quota - $user->getUsedDiskSpace());
 } /* }}} */
 
-function encryptData($key, $value){
+/**
+ * Encrypt any data with a key
+ *
+ * @param string $key
+ * @param string $value plain text data
+ * @return string encrypted data
+ */
+function encryptData($key, $value) { /* {{{ */
   $text = $value;
   $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
   $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
   $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv);
   return $crypttext;
-}
+} /* }}} */
 
-function decryptData($key, $value){
+/**
+ * Decrypt data previously encrypted by encrypt
+ *
+ * @param string $key
+ * @param string $value encrypted data
+ * @return string plain text data
+ */
+function decryptData($key, $value) { /* {{{ */
   $crypttext = $value;
   $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
   $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
   $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $crypttext, MCRYPT_MODE_ECB, $iv);
   return trim($decrypttext);
-}
+} /* }}} */
 
 /**
  * Return file extension for a give mimetype
@@ -591,4 +605,56 @@ function sendFile($filename) { /* {{{ */
 		readfile($filename);
 	}
 } /* }}} */
+
+class SeedDMS_CSRF {
+
+	protected $secret;
+
+	public function __construct($secret) {
+		$this->secret = $secret;
+	}
+
+	public function create_api_key() {
+		return base64_encode($this->encrypt(time().'|'.$_SERVER['REMOTE_ADDR'])); // !change if you dont want IP check
+	}
+
+	public function check_api_key($key, $timeout = 5) {
+		if (empty($key)) exit('Invalid Key');
+
+		$keys = explode('|', $this->decrypt(base64_decode($key)));
+
+		return (
+			isset($key, $keys[0], $keys[1]) && 
+			$keys[0] >= (time() - $timeout) && 
+			$keys[1] == $_SERVER['REMOTE_ADDR'] // !change if you dont want IP check
+		);
+	}
+
+	public function encrypt($string, $key = 'PrivateKey', $method = 'AES-256-CBC') {
+		// hash
+		$key = hash('sha256', $key);
+		// create iv - encrypt method AES-256-CBC expects 16 bytes
+		$iv = substr(hash('sha256', $this->secret), 0, 16);
+		// encrypt
+		$output = openssl_encrypt($string, $method, $key, 0, $iv);
+		// encode
+		return base64_encode($output);
+	}
+
+	public function decrypt($string, $key = 'PrivateKey', $method = 'AES-256-CBC') {
+		// hash
+		$key = hash('sha256', $key);
+		// create iv - encrypt method AES-256-CBC expects 16 bytes
+		$iv = substr(hash('sha256', $this->secret), 0, 16);
+		// decode
+		$string = base64_decode($string);
+		// decrypt
+		return openssl_decrypt($string, $method, $key, 0, $iv);
+	}
+}
+
+//$CSRF = new SeedDMS_CSRF($settings->_encryptionKey);
+//$kkk = $CSRF->create_api_key();
+//echo $kkk;
+//echo $CSRF->check_api_key($kkk) ? 'valid' : 'invalid';
 ?>

languages/ar_EG/lang.inc

@@ -283,6 +283,7 @@ URL: [url]',
 'confirm_rm_user' => 'هل تود حقا ازالة المستخدم "[username]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'هل تود حقا ازالة الاصدار [version] الخاص بالمستند "[documentname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'المحتوى',
@@ -702,6 +703,7 @@ URL: [url]',
 'linked_to_document' => 'ﺮﺒﻃ ﺐﻤﻠﻓ ﺄﺧﺭ',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل <a href="%s">صفحة التحميل</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'ﻉﺮﺿ ﻚﻟ ﺎﻠﺻﻼﺤﻳﺎﺗ',
 'list_contains_no_access_docs' => '',
@@ -922,6 +924,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1541,6 +1544,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1571,6 +1575,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1660,6 +1665,7 @@ URL: [url]',
 'toggle_manager' => 'رجح مدير',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'ﺕﺮﺠﻣ ﺎﻠﻤﻠﻓ',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

languages/bg_BG/lang.inc

@@ -266,6 +266,7 @@ $text = array(
 'confirm_rm_user' => 'Изтрий потребител "[username]"?<br>Действието е перманентно',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Изтрий версия на [version] документ "[documentname]"?<br>Действието е перманентно',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Съдържание',
@@ -631,6 +632,7 @@ $text = array(
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг <a href="%s">начин</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Списък на права',
 'list_contains_no_access_docs' => '',
@@ -821,6 +823,7 @@ $text = array(
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1404,6 +1407,7 @@ $text = array(
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1434,6 +1438,7 @@ $text = array(
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1523,6 +1528,7 @@ $text = array(
 'toggle_manager' => 'Превключи мениджър',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'Прехвърли документ',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

languages/ca_ES/lang.inc

@@ -271,6 +271,7 @@ URL: [url]',
 'confirm_rm_user' => '¿Vol realment eliminar l\'usuari "[username]"?<br />Atenció: aquesta acció no es pot desfer.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '¿Vol realment eliminar la versió [version] del document "[documentname]"?<br />Atenció: aquesta acció no es pot desfer.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contingut',
@@ -636,6 +637,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Llista tots els tipus d\'accés...',
 'list_contains_no_access_docs' => '',
@@ -826,6 +828,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1409,6 +1412,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1439,6 +1443,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1528,6 +1533,7 @@ URL: [url]',
 'toggle_manager' => 'Intercanviar manager',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'transferir document',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => 'transferir sense poder escriure',

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 (1523), kreml (579)
+//    Translators: Admin (1525), kreml (579)
 
 $text = array(
 '2_factor_auth' => 'dvoufaktorové ověření',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Opravdu chcete odstranit uživatele "[username]"?<br>Pozor: Akce je nevratná.',
 'confirm_rm_user_from_processes' => 'Opravdu chcete odstranit uživatele "[username]" ze všech procesů? <br> Pozor: Tato akce může vést k uvolnění dokumentů, pokud byl uživatel jediným nebo posledním schvalujícím.',
 'confirm_rm_version' => 'Opravdu chcete odstranit verzi [version] dokumentu "[documentname]"?<br>Buďte opatrní: Tuto činnost není možné vrátit zpět.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Opravdu chcete přenést dokumenty, složky atd. Uživatele "[username]"? <br> Pozor: Tuto akci nelze vrátit zpět.',
 'confirm_update_transmittalitem' => 'Potvrďte aktualizaci',
 'content' => 'Domů',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Provázáno s dokumentem',
 'linked_to_this_version' => 'Provázáno odkazem s touto verzí',
 'link_alt_updatedocument' => 'Chcete-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím <a href="%s">alternativní stránku</a>.',
+'link_document' => '',
 'link_to_version' => 'Provázat k verzi',
 'list_access_rights' => 'Seznam všech přístupových práv ...',
 'list_contains_no_access_docs' => 'Seznam obsahuje více dokumentů, ke kterým nemáte přístup a které se nezobrazují.',
@@ -975,6 +977,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Souhrn přijetí',
 'receipt_update_failed' => 'Potvrzení že přijetí se nezdařilo',
+'recent_uploads' => '',
 'reception' => 'Přijetí',
 'reception_acknowleged' => 'Přijetí potvrzeno',
 'reception_noaction' => 'Žádná akce',
@@ -1554,7 +1557,7 @@ Jméno: [username]
 'settings_updateDatabase' => 'Spustit skripty pro aktualizaci schématu databáze',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Uživatelé jsou informováni o změnách dokumentů, ke kterým došlo v posledních sekundách \'Aktualizace upozornění\'',
-'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.2.0',
+'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.6.38',
 'settings_versioningFileName' => 'Verzování názvu souboru',
 'settings_versioningFileName_desc' => 'Název souboru s informacemi o verzích vytvořeném nástrojem pro zálohování',
 'settings_versiontolow' => 'Příliš nízká verze',
@@ -1580,7 +1583,7 @@ Jméno: [username]
 'sign_out_user' => 'Odhlášení uživatele',
 'sk_SK' => 'Slovenština',
 'sort_by_date' => '',
-'sort_by_name' => '',
+'sort_by_name' => 'Třídit podle jména',
 'sort_by_sequence' => '',
 'space_used_on_data_folder' => 'Použité místo pro data složky',
 'splash_added_to_clipboard' => 'Přidáno do schránky',
@@ -1620,6 +1623,7 @@ Jméno: [username]
 'splash_inherit_access' => 'Přístupové právo bude zděděno',
 'splash_invalid_folder_id' => 'Neplatné ID složky',
 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',
 'splash_move_document' => 'Dokument přesunut',
 'splash_move_folder' => 'Složka přesunuta',
@@ -1650,6 +1654,7 @@ Jméno: [username]
 'splash_substituted_user' => 'Zaměněný uživatel',
 'splash_switched_back_user' => 'Přepnuto zpět na původního uživatele',
 'splash_toogle_group_manager' => 'Manažer skupiny přepnut',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Dokument přenesen',
 'splash_transfer_objects' => 'Objekt přenesen',
 'splash_trigger_workflow' => 'Spuštěn přechod workflow',
@@ -1739,6 +1744,7 @@ Jméno: [username]
 'toggle_manager' => 'Přepnout správce',
 'toggle_qrcode' => 'Zobrazit / skrýt QR kód',
 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení',
+'transfer_content' => '',
 'transfer_document' => 'Přenést dokument',
 'transfer_no_read_access' => 'Uživatel nemá přístup ke čtení ve složce',
 'transfer_no_write_access' => 'Uživatel nemá přístup k zápisu do složky',

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 (2687), dgrutsch (22)
+//    Translators: Admin (2695), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Möchten Sie wirklich den Benutzer "[username]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_rm_user_from_processes' => 'Möchten Sie wirklich den Benutzer "[username]" aus allen Prozessen löschen?<br />Beachten Sie, dass dies möglicherweise in der Freigabe von Dokumenten resultiert, wenn der Benutzer der einzige oder letzte Prüfer ist.',
 'confirm_rm_version' => 'Wollen Sie die Version [version] des Dokumentes "[documentname]" wirklich löschen?<br>Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden.',
+'confirm_transfer_link_document' => 'Möchten Sie das Dokument verlinken oder dessen Inhalt auf das Zieldokument als neue Version übertragen. Der Inhalt kann nur übertragen werden, wenn das Ursprungsdokument lediglich eine Version hat. Das Ursprungsdokument wird danach gelöscht.',
 'confirm_transfer_objects' => 'Möchten Sie wirklich die Dokumente, Ordner, etc. des Benutzer "[username]" übertragen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_update_transmittalitem' => 'Aktualisierung bestätigen',
 'content' => 'Inhalt',
@@ -739,6 +740,7 @@ URL: [url]',
 'linked_to_document' => 'Mit dem Dokument verknüpft',
 'linked_to_this_version' => 'Mit dieser Version verknüpft',
 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative <a href="%s">Upload-Seite</a>.',
+'link_document' => 'Dokument verlinken',
 'link_to_version' => 'An Version hängen',
 'list_access_rights' => 'Alle Zugriffsrechte auflisten ...',
 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.',
@@ -977,6 +979,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Übersicht Bestätigungen',
 'receipt_update_failed' => 'Setzen der Empfangsbestätigung fehlgeschlagen',
+'recent_uploads' => 'Letzte Uploads',
 'reception' => 'Empfangsbestätigung',
 'reception_acknowleged' => 'Empfang bestätigt',
 'reception_noaction' => 'Keine Aktion',
@@ -1564,7 +1567,7 @@ Name: [username]
 'settings_updateDatabase' => 'Datenbank-Update-Skript ausführen',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
-'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.2.0',
+'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.6.38',
 'settings_versioningFileName' => 'Versionsinfo-Datei',
 'settings_versioningFileName_desc' => 'Der Name der Datei mit Versionsinformationen, wie sie durch das Backup-Tool erzeugt werden.',
 'settings_versiontolow' => 'Version zu gering',
@@ -1630,6 +1633,7 @@ Name: [username]
 'splash_inherit_access' => 'Zugriffsrechte werden geerbt',
 'splash_invalid_folder_id' => 'Ungültige Ordner-ID',
 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff',
+'splash_link_document' => 'Link hinzugefügt',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',
 'splash_move_document' => 'Dokument verschoben',
 'splash_move_folder' => 'Ordner verschoben',
@@ -1660,6 +1664,7 @@ Name: [username]
 'splash_substituted_user' => 'Benutzer gewechselt',
 'splash_switched_back_user' => 'Zum ursprünglichen Benutzer zurückgekehrt',
 'splash_toogle_group_manager' => 'Gruppenverwalter gewechselt',
+'splash_transfer_content' => 'Dokumenteninhalt übertragen',
 'splash_transfer_document' => 'Dokument übertragen',
 'splash_transfer_objects' => 'Objekte übertragen',
 'splash_trigger_workflow' => '',
@@ -1749,6 +1754,7 @@ Name: [username]
 'toggle_manager' => 'Managerstatus wechseln',
 'toggle_qrcode' => 'Zeige/verberge QR-Code',
 'to_before_from' => 'Endedatum darf nicht vor dem Startdatum liegen',
+'transfer_content' => 'Inhalt übertragen',
 'transfer_document' => 'Dokument übertragen',
 'transfer_no_read_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte',
 'transfer_no_write_access' => 'Der Benutzer hat in dem Ordner keine Schreibrechte',

languages/el_GR/lang.inc

@@ -266,6 +266,7 @@ $text = array(
 'confirm_rm_user' => '',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Περιεχόμενο',
@@ -631,6 +632,7 @@ $text = array(
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
@@ -832,6 +834,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1415,6 +1418,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1445,6 +1449,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1534,6 +1539,7 @@ URL: [url]',
 'toggle_manager' => '',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (1779), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1787), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?<br>Be careful: This action can lead to the release of documents if the user was the only or last approver.',
 'confirm_rm_version' => 'Do you really want to remove version [version] of document "[documentname]"?<br>Be careful: This action cannot be undone.',
+'confirm_transfer_link_document' => 'Select if you like to link the dragged document or transfer its content to the target document as a new version. Only documents with one version can be transferred. The dragged document will be removed afterwards.',
 'confirm_transfer_objects' => 'Do you really want to transfer the documents, folders, etc. of the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_update_transmittalitem' => 'Confirm update',
 'content' => 'Content',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Linked to document',
 'linked_to_this_version' => 'Linked to this version',
 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative <a href="%s">upload page</a>.',
+'link_document' => 'Link document',
 'link_to_version' => 'Attach to version',
 'list_access_rights' => 'List all access rights ...',
 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.',
@@ -979,6 +981,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Receipt summary',
 'receipt_update_failed' => 'Acknowledging reception failed',
+'recent_uploads' => 'Recent Uploads',
 'reception' => 'Reception',
 'reception_acknowleged' => 'Reception acknowledged',
 'reception_noaction' => 'No action',
@@ -1559,7 +1562,7 @@ Name: [username]
 'settings_updateDatabase' => 'Run schema update scripts on database',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
-'settings_upgrade_php' => 'Upgrade PHP to at least version 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38',
 'settings_versioningFileName' => 'Versioning FileName',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => 'Version to low',
@@ -1625,6 +1628,7 @@ Name: [username]
 'splash_inherit_access' => 'Access right will be inherited',
 'splash_invalid_folder_id' => 'Invalid folder ID',
 'splash_invalid_searchterm' => 'Invalid search term',
+'splash_link_document' => 'Link added',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',
 'splash_move_document' => 'Document moved',
 'splash_move_folder' => 'Folder moved',
@@ -1655,6 +1659,7 @@ Name: [username]
 'splash_substituted_user' => 'Substituted user',
 'splash_switched_back_user' => 'Switched back to original user',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_content' => 'Content transfered',
 'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'splash_trigger_workflow' => 'Triggered transition of workflow',
@@ -1744,6 +1749,7 @@ Name: [username]
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => 'Show/hide QR code',
 'to_before_from' => 'End date may not be before start date',
+'transfer_content' => 'Transfer content',
 'transfer_document' => 'Transfer document',
 'transfer_no_read_access' => 'The user does not have read access in the folder',
 'transfer_no_write_access' => 'The user does not have write access in the folder',

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 (1114), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1118), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -290,6 +290,7 @@ URL: [url]',
 'confirm_rm_user' => '¿Desea realmente eliminar el usuario "[username]"?<br />Atención: Esta acción no se puede deshacer.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '¿Desea realmente eliminar la versión [version] del documento "[documentname]"?<br />Atención: esta acción no se puede deshacer.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
@@ -709,6 +710,7 @@ URL: [url]',
 'linked_to_document' => 'Enlazado al documento',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Listar los derechos de acceso',
 'list_contains_no_access_docs' => '',
@@ -937,6 +939,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1490,7 +1493,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Lanzar scripts de actualización de esquema en la base de datos',
 'settings_updateNotifyTime' => 'Tiempo de notificación de actualización',
 'settings_updateNotifyTime_desc' => 'Se notificará a los usuarios sobre los cambios en documentos que tengan lugar en los próximos segundos de «Tiempo de notificación de actualización»',
-'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.2.0',
+'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.6.38',
 'settings_versioningFileName' => 'Archivo de versionado',
 'settings_versioningFileName_desc' => 'Nombre de archivo de información de versionado creado por la herramienta de copia de respaldo',
 'settings_versiontolow' => 'Versión antigua',
@@ -1515,9 +1518,9 @@ URL: [url]',
 'sign_out' => 'Salir',
 'sign_out_user' => 'Desconectar usuario',
 'sk_SK' => 'Slovaco',
-'sort_by_date' => '',
+'sort_by_date' => 'Ordenar por Fecha',
-'sort_by_name' => '',
+'sort_by_name' => 'Ordenar por Nombre',
-'sort_by_sequence' => '',
+'sort_by_sequence' => 'Ordenar por Secuencia',
 'space_used_on_data_folder' => 'Espacio usado en la carpeta de datos',
 'splash_added_to_clipboard' => 'Agregado al portapapeles',
 'splash_add_access' => '',
@@ -1556,6 +1559,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID de carpeta inválido',
 'splash_invalid_searchterm' => 'Término de búsqueda inválido',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1586,6 +1590,7 @@ URL: [url]',
 'splash_substituted_user' => 'Usuario sustituido',
 'splash_switched_back_user' => 'Cambió de nuevo al usuario original',
 'splash_toogle_group_manager' => 'Administrador de grupo activado',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1675,6 +1680,7 @@ URL: [url]',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
+'transfer_content' => '',
 'transfer_document' => 'Transferir documento',
 'transfer_no_read_access' => 'El usuario no tiene acceso de lectura en la carpeta',
 'transfer_no_write_access' => 'El usuario no tiene acceso de escritura en la carpeta',

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 (1091), jeromerobert (50), lonnnew (9), Oudiceval (750)
+//    Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (755)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 'confirm_rm_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?<br>Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.',
 'confirm_rm_version' => 'Voulez-vous vraiment supprimer la version [version] du document « [documentname] » ?<br>Attention : Cette action est irréversible.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 'confirm_update_transmittalitem' => 'Confirmer la mise à jour',
 'content' => 'Contenu',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Lié au document',
 'linked_to_this_version' => 'Lié à cette version',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
+'link_document' => '',
 'link_to_version' => 'Version',
 'list_access_rights' => 'Liste des droits d’accès…',
 'list_contains_no_access_docs' => 'La liste contient des documents auxquels vous n’avez pas accès et qui ne sont donc pas affichés.',
@@ -977,6 +979,7 @@ URL : [url]',
 'receipt_status' => 'Statut',
 'receipt_summary' => 'Vue d’ensemble réception',
 'receipt_update_failed' => 'La confirmation de réception a échoué',
+'recent_uploads' => '',
 'reception' => 'Réception',
 'reception_acknowleged' => 'Réception confirmée',
 'reception_noaction' => 'Aucune action',
@@ -1299,8 +1302,8 @@ Nom : [username]
 'settings_enableDropUpload_desc' => 'Active/désactive la zone de glisser-déposer sur la page d’un dossier afin d’y déposer des fichiers.',
 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom',
 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.',
-'settings_enableDuplicateSubFolderNames' => '',
+'settings_enableDuplicateSubFolderNames' => 'Autoriser les sous-dossiers de même nom',
-'settings_enableDuplicateSubFolderNames_desc' => '',
+'settings_enableDuplicateSubFolderNames_desc' => 'Autorise plusieurs sous-dossiers de même nom dans un dossier.',
 'settings_enableEmail' => 'E-mails',
 'settings_enableEmail_desc' => 'Active/désactive la notification automatique par e-mail',
 'settings_enableFilterReceipt' => '',
@@ -1543,10 +1546,10 @@ Nom : [username]
 'settings_updateDatabase' => 'Exécuter les scripts de mise à jour du schéma de la base',
 'settings_updateNotifyTime' => 'Délai de notification des modifications',
 'settings_updateNotifyTime_desc' => 'Les utilisateurs sont informés des modifications apportées aux documents qui ont eu lieu durant le délai précisé (en secondes).',
-'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.2.0',
+'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.6.38',
 'settings_versioningFileName' => 'Nom des fichiers de versionnage',
 'settings_versioningFileName_desc' => 'Nom des fichiers textes d’information créés depuis les outils de sauvegarde',
-'settings_versiontolow' => '',
+'settings_versiontolow' => 'Version trop ancienne',
 'settings_viewOnlineFileTypes' => 'Aperçu en ligne des fichiers',
 'settings_viewOnlineFileTypes_desc' => 'Extensions des fichiers pouvant être visionnés en ligne (en lettres minuscules uniquement).',
 'settings_webdav' => 'WebDAV',
@@ -1609,6 +1612,7 @@ Nom : [username]
 'splash_inherit_access' => 'Droits d’accès hérités',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Contenu du presse-papier déplacé vers le dossier courant',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
@@ -1639,6 +1643,7 @@ Nom : [username]
 'splash_substituted_user' => 'Utilisateur de substitution',
 'splash_switched_back_user' => 'Revenu à l\'utilisateur initial',
 'splash_toogle_group_manager' => 'Responsable de groupe changé',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Document transféré',
 'splash_transfer_objects' => 'Objets transférés',
 'splash_trigger_workflow' => 'Transition de workflow déclenchée',
@@ -1665,7 +1670,7 @@ Nom : [username]
 'status_revisor_removed' => 'Réviseur retiré de la liste',
 'status_unknown' => 'Inconnu',
 'storage_size' => 'Taille occupée',
-'subfolder_duplicate_name' => '',
+'subfolder_duplicate_name' => 'Un sous-dossier porte déjà ce nom !',
 'submit_2_fact_auth' => 'Enregistrer la clé secrète',
 'submit_approval' => 'Soumettre approbation',
 'submit_login' => 'Connexion',
@@ -1728,6 +1733,7 @@ Nom : [username]
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
+'transfer_content' => '',
 'transfer_document' => 'Transférer le document',
 'transfer_no_read_access' => 'L’utilisateur n’a pas le droit de lecture dans ce dossier',
 'transfer_no_write_access' => 'L’utilisateur n’a pas le droit d’écriture dans ce dossier',

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 (1221), marbanas (16)
+//    Translators: Admin (1222), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -295,6 +295,7 @@ Internet poveznica: [url]',
 'confirm_rm_user' => 'Da li zaista želite ukloniti korisnika "[username]"?<br>Oprez: ova radnja nije povratna.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Da li zaista želite ukloniti verziju [version] dokumenta "[documentname]"?<br>Oprez: ova radnja nije povratna.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Potvrdi izmjenu',
 'content' => 'Sadržaj',
@@ -714,6 +715,7 @@ Internet poveznica: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu <a href="%s">upload page</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Izlistaj sve dozvole pristupa',
 'list_contains_no_access_docs' => '',
@@ -941,6 +943,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'receipt_status' => '',
 'receipt_summary' => 'Sažetak prijema',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1511,7 +1514,7 @@ Internet poveznica: [url]',
 'settings_updateDatabase' => 'Pokreni shemu ažuriranja skripti na bazi podataka',
 'settings_updateNotifyTime' => 'Ažuriraj vrijeme obavijesti',
 'settings_updateNotifyTime_desc' => 'Korisnici se obavještavaju o promjenama dokumenta koje su se dogodile unutar zadnjih \'Update Notify Time\' sekundi',
-'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.2.0',
+'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.6.38',
 'settings_versioningFileName' => 'Naziv datoteke verzije dokumenta',
 'settings_versioningFileName_desc' => 'Naziv datoteke s informacijom o verziji kreirane alatom za stvaranje sigurnosne kopije',
 'settings_versiontolow' => 'Na nižu verziju',
@@ -1577,6 +1580,7 @@ Internet poveznica: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Nevažeći ID mape',
 'splash_invalid_searchterm' => 'Nevažeći traženi pojam',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1607,6 +1611,7 @@ Internet poveznica: [url]',
 'splash_substituted_user' => 'Zamjenski korisnik',
 'splash_switched_back_user' => 'Prebačeno nazad na izvornog korisnika',
 'splash_toogle_group_manager' => 'Zamjenjen upravitelj grupe',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1696,6 +1701,7 @@ Internet poveznica: [url]',
 'toggle_manager' => 'Zamjeni upravitelja',
 'toggle_qrcode' => '',
 'to_before_from' => 'Datum završetka ne može biti prije datuma početka',
+'transfer_content' => '',
 'transfer_document' => 'Prijenos dokumenta',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (632), ribaz (1036)
+//    Translators: Admin (633), ribaz (1036)
 
 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@@ -290,6 +290,7 @@ URL: [url]',
 'confirm_rm_user' => 'Biztosan el kívánja távolítani ezt a felhasználót "[username]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Biztosan el kívánaj távolítani a dokumentum "[documentname]" [version] verzióját?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Tartalom',
@@ -709,6 +710,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív <a href="%s">feltöltő oldalt</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Összes jogosultság felsorolása...',
 'list_contains_no_access_docs' => '',
@@ -937,6 +939,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1489,7 +1492,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Adatbázis séma frissítő szkript futtatása',
 'settings_updateNotifyTime' => 'Értesítési idő frissítése',
 'settings_updateNotifyTime_desc' => 'Felhasználók értesítést kapnak az \'Értesítés frissítési idő\' által meghatározott másodperc alatt történt dokumentum változásokról',
-'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.2.0 verzióra',
+'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.6.38 verzióra',
 'settings_versioningFileName' => 'Változatkezelő állománynév',
 'settings_versioningFileName_desc' => 'A változáskezelő információs állomány neve létrehozva a mentő eszközzel',
 'settings_versiontolow' => 'túl alacsony verzió',
@@ -1555,6 +1558,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító',
 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1585,6 +1589,7 @@ URL: [url]',
 'splash_substituted_user' => 'Helyettesített felhasználó',
 'splash_switched_back_user' => 'Visszaváltva az eredeti felhasználóra',
 'splash_toogle_group_manager' => 'Csoport kezelő kiválasztva',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1674,6 +1679,7 @@ URL: [url]',
 'toggle_manager' => 'Kulcs kezelő',
 'toggle_qrcode' => '',
 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
+'transfer_content' => '',
 'transfer_document' => 'Tulajdonos váltás',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (1624), rickr (144), s.pnt (26)
+//    Translators: Admin (1628), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -296,6 +296,7 @@ URL: [url]',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_user_from_processes' => 'Processo',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Conferma aggiornamento',
 'content' => 'Contenuto',
@@ -715,6 +716,7 @@ URL: [url]',
 'linked_to_document' => 'Collegato al documento',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la <a href="%s">pagina alternativa di upload</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Elenca tutti i diritti di accesso...',
 'list_contains_no_access_docs' => '',
@@ -948,6 +950,7 @@ URL: [url]',
 'receipt_status' => 'Status',
 'receipt_summary' => 'Sommario ricezione',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1523,7 +1526,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Esegui gli script di aggiornamento schema sul database',
 'settings_updateNotifyTime' => 'Intervallo notifica di aggiornamento',
 'settings_updateNotifyTime_desc' => 'Intervallo di tempo in secondi durante il quale ogni modifica ad un documento verrà notificata agli utenti',
-'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.2.0 o superiori',
+'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.6.38 o superiori',
 'settings_versioningFileName' => 'Nome file di versione',
 'settings_versioningFileName_desc' => 'Nome attribuito al file di versione creato dallo strumento di backup.',
 'settings_versiontolow' => 'Versione obsoleta',
@@ -1548,9 +1551,9 @@ URL: [url]',
 'sign_out' => 'Disconnettiti',
 'sign_out_user' => 'Disconnetti l\'utente',
 'sk_SK' => 'Slovacco',
-'sort_by_date' => '',
+'sort_by_date' => 'Ordina per Data',
-'sort_by_name' => '',
+'sort_by_name' => 'Ordina per Nom',
-'sort_by_sequence' => '',
+'sort_by_sequence' => 'Ordina per Sequenza',
 'space_used_on_data_folder' => 'Spazio utilizzato dai dati',
 'splash_added_to_clipboard' => 'Aggiunto agli appunti',
 'splash_add_access' => '',
@@ -1589,6 +1592,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID cartella non valido',
 'splash_invalid_searchterm' => 'Termine di ricerca non valido',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',
 'splash_move_document' => 'Documento spostato',
 'splash_move_folder' => 'Cartella spostato',
@@ -1619,6 +1623,7 @@ URL: [url]',
 'splash_substituted_user' => 'Utente sostituito',
 'splash_switched_back_user' => 'Ritorno all\'utente originale',
 'splash_toogle_group_manager' => 'Amministratore di gruppo invertito',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1708,6 +1713,7 @@ URL: [url]',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri / nascondi codice QR',
 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
+'transfer_content' => '',
 'transfer_document' => 'Trasferisci Documento',
 'transfer_no_read_access' => 'L`utente non ha i permessi in lettura per la cartella',
 'transfer_no_write_access' => 'L`utente non ha i permessi in scrittura per la cartella',

languages/ko_KR/lang.inc

@@ -298,6 +298,7 @@ URL: [url]',
 'confirm_rm_user' => '사용자 "[username]"을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '문서 "[documentname]"의 버젼 [version]을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '업데이트 확인',
 'content' => '콘텐츠',
@@ -715,6 +716,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 <a href="%s">upload page</a> 사용하십시오.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => '모든 접근 권한 나열',
 'list_contains_no_access_docs' => '',
@@ -935,6 +937,7 @@ URL : [url]',
 'receipt_status' => '',
 'receipt_summary' => '접수증 요약',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1571,6 +1574,7 @@ URL : [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '잘못된 폴더 ID',
 'splash_invalid_searchterm' => '잘못된 검색 범위',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',
 'splash_move_document' => '문서 옮겨짐',
 'splash_move_folder' => '폴더 옮겨짐',
@@ -1601,6 +1605,7 @@ URL : [url]',
 'splash_substituted_user' => '전환된 사용자',
 'splash_switched_back_user' => '원래 사용자로 전환',
 'splash_toogle_group_manager' => '그룹 관리자 전환',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1690,6 +1695,7 @@ URL : [url]',
 'toggle_manager' => '전환 매니저',
 'toggle_qrcode' => 'QR code 보이기/숨기기',
 'to_before_from' => '종료일은 시작일 전이 될수 없습니다',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

languages/lo_LA/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 (1468)
+//    Translators: Admin (1469)
 
 $text = array(
 '2_factor_auth' => 'ການກວດສອບແບບ 2 ປັດໃຈ',
@@ -293,6 +293,7 @@ URL: [url]',
 'confirm_rm_user' => 'ເຈົ້າຄ້ອງການລົບຜູ້ໄຊ້ "[username]"? <br>  ລະວັງ: ການກະທຳນີ້ບໍ່ສາມາດຍົກເລີກໄດ້',
 'confirm_rm_user_from_processes' => 'ເຈົ້າຕ້ອງການລົບຜູ້ໄຊ້ "[username] ອອກຈາກກະບວນການທັງຫມົດຫຼືບໍ <br> ກະລຸນາໄຊ້ຄວາມລະມັດລະວັງ: ການດຳເນີນການນີ້ສາມາດນຳໄປສູ້ການເຜີຍແຜ່ເອກະສານໄດ້ຫາກຜູ້ໄຊ້ເປັນຜູ້ອະນຸມັດຜູ້ດຽວຫຼືເປັນຄົນສຸດທ້າຍເທົ່ານັ້ນ',
 'confirm_rm_version' => 'ເຈົ້າຕ້ອງການລົບເອກະສານ [version] ເວີຊັນ [documentname] ລະວັງ: ເຈົ້າາບໍ່ສາມາດຍົກເລີກການດຳເນີນການນີ້ໄດ້',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'ເຈົ້າຕ້ອງການໂອນເອກະສານໂຟລເດີ ແລະອື່ນໆ ຂອງຜູ້ໄຊ້ "[username]"? <br>  ລະວັງ ການກະທໍານີ້ບໍ່ສາມາດຍົກເລີກໄດ້',
 'confirm_update_transmittalitem' => 'ຢືນຢັນການອັບເດດ',
 'content' => 'ເນື້ອຫາ',
@@ -719,6 +720,7 @@ URL: [url]',
 'linked_to_document' => 'ເຊື່ອມໂຍງກັລເອກະສານ',
 'linked_to_this_version' => 'ເຊື່ອມໂຍງກັບເວີຊັນນີ້ແລ້ວ',
 'link_alt_updatedocument' => 'ຖ້າເຈົ້າຕ້ອງການອັບໂຫລດໄຟລທີ່ໄຫ່ຍກວ່າຂະໜາດອັບໂຫລດສູງສຸດໃນປັດຈຸບັນກະລຸນາໄຊ້ <a href="%s"> ອັບໂຫລດຢູ່ຫ້າເຟສ </a>',
+'link_document' => '',
 'link_to_version' => 'ແນບໄປພ້ອມກັບເວີຊັນ',
 'list_access_rights' => 'ສະແດງສິດທິການເຂົ້າເຖິງທັງໝົດ ...',
 'list_contains_no_access_docs' => 'ລິດລາຍການປະກອບດ້ວຍເອກະສານເພີ່ມເຕີມທີ່ເຈົ້າບໍ່ສາມາດເຂົ້າເຖິງໄດ້ ແລະບໍ່ສະແດງ',
@@ -958,6 +960,7 @@ URL: [url]',
 'receipt_status' => 'ສະຖານະ',
 'receipt_summary' => 'ສະຫຼູບໃບບິນ',
 'receipt_update_failed' => 'ການຍອມຮັບສັນຍານບໍ່ສຳເລັດ',
+'recent_uploads' => '',
 'reception' => 'ພະແນກຕ້ອນຮັບ',
 'reception_acknowleged' => 'ຄວາມຮັບຮູ້ກ່ຽວກັບການຕ້ອນຮັບ',
 'reception_noaction' => 'ບໍ່ມີການຕອບສະຫນອງ',
@@ -1538,7 +1541,7 @@ URL: [url]',
 'settings_updateDatabase' => 'ຮຽກໄຊ້ສະຄິບການປັບປຸງສະຄິບໃນຖານຂໍ້ມູນ',
 'settings_updateNotifyTime' => 'ອັບເດດເວລາການແຈ້ງເຕືອນ',
 'settings_updateNotifyTime_desc' => 'ຜູ້ໄຊ້ຈະໄດ້ຮັບການແຈ້ງກ່ຽວກັບການປ່ຽນແປງເອກະສານທີ່ເກີດຂື້ນພາຍໃນວິນາທີສຸດທ້າຍ  "ແຈ້ງເຕືອນເວລາ   "',
-'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.2.0',
+'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.6.38',
 'settings_versioningFileName' => 'ການກຳນົດຊື່ໄຟລ',
 'settings_versioningFileName_desc' => 'ຊື່ຂອງແຟ້ມຂໍ້ມູນການກຳນົດເວີຊັນທີ່ສ້າງໂດຍເຄື່ອງມືສຳຮອງຂໍ້ມູນ',
 'settings_versiontolow' => 'ເວີຊັນເກົ່າ',
@@ -1604,6 +1607,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID ໂຟລເດີບໍ່ຖືກຕ້ອງ',
 'splash_invalid_searchterm' => 'ຄຳຄົນຫາບໍ່ຖືກຕ້ອງ',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'ຍ້າຍຄິບບອດໄປທີ່ໂຟລເດີປັດຈຸບັນແລ້ວ',
 'splash_move_document' => 'ຍ້າຍເອກະສານແລ້ວ',
 'splash_move_folder' => 'ຍ້າຍໂຟລເດີແລ້ວ',
@@ -1634,6 +1638,7 @@ URL: [url]',
 'splash_substituted_user' => 'ຜູ້ນຳໄຊ້ທີຖືກແທນທີ',
 'splash_switched_back_user' => 'ປ່ຽນກັບໄປເປັນຜູ້ໄຊ້ເດີມ',
 'splash_toogle_group_manager' => 'ການດູແລກຸ່ມ',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => 'ຖ່າຍໂອນວັດຖຸຮຽບຮ້ອຍແລ້ວ',
 'splash_trigger_workflow' => '',
@@ -1723,6 +1728,7 @@ URL: [url]',
 'toggle_manager' => 'ສຳລັບຜູ້ຈັດການ',
 'toggle_qrcode' => 'ສະແດງ/ ຊ້ອນລະຫັດ QR',
 'to_before_from' => 'ວັນເລີ້ມຕົ້ນຈະບໍ່ຄືກັບວັນສຸດທ້າຍ',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (768), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (770), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -288,6 +288,7 @@ URL: [url]',
 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_user_from_processes' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen uit dit proces?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?<br>Pas op: deze handeling kan niet ongedaan worden gemaakt.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Weet U zeker dat U de documenten, mappen etc. van gebruiker "[username]" wilt overzetten?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item',
 'content' => 'Welkomstpagina',
@@ -714,6 +715,7 @@ URL: [url]',
 'linked_to_document' => 'Bijlage(n) bij document',
 'linked_to_this_version' => 'Bijlage bij deze versie',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
+'link_document' => '',
 'link_to_version' => 'Bijlage(n) bij versie',
 'list_access_rights' => 'Toegangsrechten',
 'list_contains_no_access_docs' => 'Geen toegankelijke documenten',
@@ -953,6 +955,7 @@ URL: [url]',
 'receipt_status' => 'Status ontvangst',
 'receipt_summary' => 'Samenvatting',
 'receipt_update_failed' => 'Update ontvangst mislukt',
+'recent_uploads' => '',
 'reception' => 'bestemming',
 'reception_acknowleged' => 'bestemming OK',
 'reception_noaction' => 'Geen actie',
@@ -1535,7 +1538,7 @@ Name: [username]
 'settings_updateDatabase' => 'Voer schema update scripts uit op database',
 'settings_updateNotifyTime' => 'Update Notificatie Tijd',
 'settings_updateNotifyTime_desc' => 'Gebruikers worden niet genotificeerd over documentwijzigingen die plaats vinden binnen de laatste \'Update Notificatie Tijd\' seconden',
-'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.6.38',
 'settings_versioningFileName' => 'Versie-informatie Bestandsnaam',
 'settings_versioningFileName_desc' => 'De naam van het versie informatie bestand gemaakt door het backupgereedschap',
 'settings_versiontolow' => 'Versie te laag',
@@ -1562,7 +1565,7 @@ Name: [username]
 'sk_SK' => 'Slowaaks',
 'sort_by_date' => 'Sorteren op datum',
 'sort_by_name' => 'Sorteren op naam',
-'sort_by_sequence' => '',
+'sort_by_sequence' => 'Sorteer op volgorde',
 'space_used_on_data_folder' => 'Gebruikte diskomvang in data map',
 'splash_added_to_clipboard' => 'Toegevoegd aan klembord',
 'splash_add_access' => '',
@@ -1601,6 +1604,7 @@ Name: [username]
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
 'splash_move_document' => 'Document verplaatst',
 'splash_move_folder' => 'Map verplaatst',
@@ -1631,6 +1635,7 @@ Name: [username]
 'splash_substituted_user' => 'Invallers gebruiker',
 'splash_switched_back_user' => 'Teruggeschakeld naar de oorspronkelijke gebruiker',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => 'Objecten overgedragen',
 'splash_trigger_workflow' => '',
@@ -1720,6 +1725,7 @@ Name: [username]
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => 'Tonen/Verbergen QR-code',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
+'transfer_content' => '',
 'transfer_document' => 'Document overdragen',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => 'De gebruiker heeft geen schrijfrechten in deze map',

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 (830), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (831), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -283,6 +283,7 @@ URL: [url]',
 'confirm_rm_user' => 'Czy rzeczywiście chcesz usunąć użytkownika "[username]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Czy rzeczywiście chcesz usunąć wersję [version] dokumentu "[documentname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
@@ -702,6 +703,7 @@ URL: [url]',
 'linked_to_document' => 'Połączony z dokumentem',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej <a href="%s">strony wczytywania</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Pokaż uprawnienia dostępu',
 'list_contains_no_access_docs' => '',
@@ -930,6 +932,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1469,7 +1472,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Uruchom skrytoy aktualizujące shemat bazy danych',
 'settings_updateNotifyTime' => 'Okres powiadamiania o zmianach',
 'settings_updateNotifyTime_desc' => 'Użytkownicy są powiadamiani o zmianach w dokumentach, które miały miejsce w ciągu ostatnich \'Update Notify Time\' sekund',
-'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.2.0',
+'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.6.38',
 'settings_versioningFileName' => 'Nazwa pliku z wersjonowaniem',
 'settings_versioningFileName_desc' => 'Nazwa pliku, zawierającego informacje o wersjonowaniu, utworzonego przez narzędzie kopii zapasowej.',
 'settings_versiontolow' => 'Za niska wersja',
@@ -1535,6 +1538,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu',
 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1565,6 +1569,7 @@ URL: [url]',
 'splash_substituted_user' => 'Zmieniono użytkownika',
 'splash_switched_back_user' => 'Przełączono z powrotem do oryginalnego użytkownika',
 'splash_toogle_group_manager' => 'Przełączono grupę menadżerów',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1654,6 +1659,7 @@ URL: [url]',
 'toggle_manager' => 'Przełączanie zarządcy',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => 'Transfer dokumentu',
 'transfer_no_read_access' => 'Użytkownik nie ma prawa do odczytu w tym folderze',
 'transfer_no_write_access' => 'Użytkownik nie ma prawa do zapisu w tym folderze',

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 (1718), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (1719), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => 'Autenticação de dois fatores',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Você realmente deseja remover o usuário "[username]"? <br> Tenha cuidado: esta ação não pode ser desfeita.',
 'confirm_rm_user_from_processes' => 'Você realmente deseja remover o usuário "[username]" de todos os processos? <br> Tenha cuidado: essa ação pode levar à liberação de documentos se o usuário for o único ou o último aprovador.',
 'confirm_rm_version' => 'Deseja realmente remover versão [version] do documento "[documentname]"?<br>Por favor, tenha cuidado porque esta ação não poderá ser desfeita.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Você realmente quer transferir os documentos, pastas etc. do usuário "[username]"? <br> Tenha cuidado: Esta ação não pode ser desfeita.',
 'confirm_update_transmittalitem' => 'Confirme a atualização',
 'content' => 'Conteúdo',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Vinculado ao documento',
 'linked_to_this_version' => 'Vinculado a esta versão',
 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de <a href="%s">envio</a>.',
+'link_document' => '',
 'link_to_version' => 'Anexar à versão',
 'list_access_rights' => 'Listar todos os direitos de acesso...',
 'list_contains_no_access_docs' => 'A lista contém mais documentos aos quais você não tem acesso e não são exibidos.',
@@ -978,6 +980,7 @@ URL: [url]',
 'receipt_status' => 'Estado',
 'receipt_summary' => 'Resumo da entrada',
 'receipt_update_failed' => 'Confirmação de entrada falhou',
+'recent_uploads' => '',
 'reception' => 'Entrada',
 'reception_acknowleged' => 'Entrada reconhecida',
 'reception_noaction' => 'Nenhuma ação',
@@ -1557,7 +1560,7 @@ Nome: [username]
 'settings_updateDatabase' => 'Executar scripts de atualização do esquema de banco de dados',
 'settings_updateNotifyTime' => 'Atualizar Tempo de Notificação',
 'settings_updateNotifyTime_desc' => 'Usuários são notificados sobe mudanças em documentos que se realizaram nos últimos segundos \'Tempo de Atualização de Notificação\'',
-'settings_upgrade_php' => 'Atualize PHP para pelo menos a versão 5.2.0',
+'settings_upgrade_php' => 'Atualize PHP para pelo menos a versão 5.6.38',
 'settings_versioningFileName' => 'Versionando NomedoArquivo',
 'settings_versioningFileName_desc' => 'O nome do arquivo de informações de versões criadas pela ferramenta de backup',
 'settings_versiontolow' => 'Versão para baixo',
@@ -1623,6 +1626,7 @@ Nome: [username]
 'splash_inherit_access' => 'O direito de acesso será herdado',
 'splash_invalid_folder_id' => 'ID de pasta inválida',
 'splash_invalid_searchterm' => 'Termo de pesquisa inválido',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente',
 'splash_move_document' => 'Documento movido',
 'splash_move_folder' => 'Pasta movida',
@@ -1653,6 +1657,7 @@ Nome: [username]
 'splash_substituted_user' => 'Usuário substituido',
 'splash_switched_back_user' => 'Comutada de volta ao usuário original',
 'splash_toogle_group_manager' => 'Gerente Grupo alternado',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Documento transferido',
 'splash_transfer_objects' => 'Objetos transferidos',
 'splash_trigger_workflow' => 'Acionada transição do fluxo de trabalho',
@@ -1742,6 +1747,7 @@ Nome: [username]
 'toggle_manager' => 'Alternar gerente',
 'toggle_qrcode' => 'Mostrar / ocultar o código QR',
 'to_before_from' => 'A data de término não pode ser anterior a data de início',
+'transfer_content' => '',
 'transfer_document' => 'Transferir documento',
 'transfer_no_read_access' => 'O usuário não possui acesso de leitura na pasta',
 'transfer_no_write_access' => 'O usuário não possui acesso de escrita na pasta',

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 (1085), balan (87)
+//    Translators: Admin (1086), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Sigur doriți să eliminați utilizatorul "[username]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Sigur doriți să eliminați versiunea [version] a documentului "[documentname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conținut',
@@ -714,6 +715,7 @@ URL: [url]',
 'linked_to_document' => 'Atasat documentului',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa <a href="%s">pagină de încărcare</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Listeaza toate drepturile de acces',
 'list_contains_no_access_docs' => '',
@@ -942,6 +944,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1512,7 +1515,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Rulați script-urile de actualizare a schemei bazei de date',
 'settings_updateNotifyTime' => 'Timpul de actualizare a notificarilor',
 'settings_updateNotifyTime_desc' => 'Utilizatorii sunt notificați cu privire la schimbările suferite de un documentul în ultima perioadă a \'Timpul de actualizare a notificarilor\' în secunde',
-'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.6.38',
 'settings_versioningFileName' => 'Nume Fișier versionare',
 'settings_versioningFileName_desc' => 'Numele fișierului cu informatii ale versiunilor creat de către instrumentul de backup',
 'settings_versiontolow' => 'Versiunea e prea mică(veche)',
@@ -1578,6 +1581,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'ID folder invalid',
 'splash_invalid_searchterm' => 'Termen de căutare invalid',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1608,6 +1612,7 @@ URL: [url]',
 'splash_substituted_user' => 'Utilizator substituit',
 'splash_switched_back_user' => 'Comutat înapoi la utilizatorul original',
 'splash_toogle_group_manager' => 'Comută Managerul de grup',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1697,6 +1702,7 @@ URL: [url]',
 'toggle_manager' => 'Comută Manager',
 'toggle_qrcode' => '',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',
+'transfer_content' => '',
 'transfer_document' => 'Transfer document',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar',

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 (1668)
+//    Translators: Admin (1669)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Удалить пользователя «[username]»?<br>Действие <b>необратимо</b>',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Удалить версию [version] документа «[documentname]»?<br>Действие <b>необратимо</b>',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Подтвердите обновление',
 'content' => 'Содержимое',
@@ -714,6 +715,7 @@ URL: [url]',
 'linked_to_document' => 'Связан с документом',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте <a href="%s">другой способ</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Показать все права доступа',
 'list_contains_no_access_docs' => '',
@@ -944,6 +946,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => 'Сводка по получению',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1519,7 +1522,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Запустить обновление схемы БД',
 'settings_updateNotifyTime' => 'Период уведомлений об изменениях',
 'settings_updateNotifyTime_desc' => 'Пользователи уведомляются об изменениях документов за указанные последние секунды.',
-'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.2.0',
+'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.6.38',
 'settings_versioningFileName' => 'Название файла версий',
 'settings_versioningFileName_desc' => 'Названия файла версий, создаваемого инструментом резервного копирования.',
 'settings_versiontolow' => 'Слишком старая версия',
@@ -1585,6 +1588,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Неверный идентификатор каталога',
 'splash_invalid_searchterm' => 'Неверный поисковый запрос',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1615,6 +1619,7 @@ URL: [url]',
 'splash_substituted_user' => 'Пользователь переключён',
 'splash_switched_back_user' => 'Переключён на исходного пользователя',
 'splash_toogle_group_manager' => 'Изменён менеджер группы',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1704,6 +1709,7 @@ URL: [url]',
 'toggle_manager' => 'Изменить как менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Конечная дата не может быть меньше начальной даты',
+'transfer_content' => '',
 'transfer_document' => 'Передать документ',
 'transfer_no_read_access' => 'Пользователь не имеет доступа на чтение в этой папке',
 'transfer_no_write_access' => 'Пользователь не имеет доступа на запись в этой папке',

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 (1224), destinqo (19), pS2017 (508), ssebech (4)
+//    Translators: Admin (1225), destinqo (19), pS2017 (508), ssebech (4)
 
 $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Skutočne si prajete odstrániť používateľa "[username]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?<br>Be careful: This action can lead to the release of documents if the user was the only or last approver.',
 'confirm_rm_version' => 'Naozaj chcete odstrániť verziu [version] dokumentu "[documentname]"?<br>Buďte opatrní: Túto operáciu nemožno vrátiť späť.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Do you really want to transfer the documents, folders, etc. of the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_update_transmittalitem' => 'Potvrdiť aktualizáciu',
 'content' => 'Obsah',
@@ -740,6 +741,7 @@ URL: [url]',
 'linked_to_document' => 'Prepojené s dokumentom',
 'linked_to_this_version' => 'Prepojené s touto verziou',
 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative <a href="%s">upload page</a>.',
+'link_document' => '',
 'link_to_version' => 'Pripojiť k verzii',
 'list_access_rights' => 'Zobraziť všetky prístupové práva',
 'list_contains_no_access_docs' => 'Zoznam obsahuje viac dokumentov, ku ktorým nemáte prístup a nie sú zobrazené.',
@@ -979,6 +981,7 @@ URL: [url]',
 'receipt_status' => 'Stav',
 'receipt_summary' => 'Receipt summary',
 'receipt_update_failed' => 'Acknowledging reception failed',
+'recent_uploads' => '',
 'reception' => 'Reception',
 'reception_acknowleged' => 'Reception acknowledged',
 'reception_noaction' => 'Žiadna akcia',
@@ -1559,7 +1562,7 @@ Meno: [username]
 'settings_updateDatabase' => 'Run schema update scripts on database',
 'settings_updateNotifyTime' => 'Aktualizovať čas notifikácie',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
-'settings_upgrade_php' => 'Upgrade PHP to at least version 5.2.0',
+'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38',
 'settings_versioningFileName' => 'Versioning FileName',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => 'Verzia je nízka',
@@ -1625,6 +1628,7 @@ Meno: [username]
 'splash_inherit_access' => 'Access right will be inherited',
 'splash_invalid_folder_id' => 'Neplatné ID zložky',
 'splash_invalid_searchterm' => 'Invalid search term',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Schránka sa presunula do aktuálnej zložky',
 'splash_move_document' => 'Dokument bol presunutý',
 'splash_move_folder' => 'Zložka bola presunutá',
@@ -1655,6 +1659,7 @@ Meno: [username]
 'splash_substituted_user' => 'Substituted user',
 'splash_switched_back_user' => 'Switched back to original user',
 'splash_toogle_group_manager' => 'Group manager toogled',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'splash_trigger_workflow' => '',
@@ -1744,6 +1749,7 @@ Meno: [username]
 'toggle_manager' => 'Prepnúť stav manager',
 'toggle_qrcode' => 'Ukázať/skryť QR kód',
 'to_before_from' => 'End date may not be before start date',
+'transfer_content' => '',
 'transfer_document' => 'Zmeniť vlastníka',
 'transfer_no_read_access' => 'Používateľ nemá práva na čítanie v adresári',
 'transfer_no_write_access' => 'Používateľ nemá práva na zapisovanie v adresári',

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 (1159), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1160), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -296,6 +296,7 @@ URL: [url]',
 'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Åtgärden kan inte ångras!',
 'confirm_rm_user_from_processes' => 'Vill du verkligen ta bort användaren "[username]" från alla arbetsflöden?<br>Var försiktig! Denna åtgärd kan innebära oönskad publicering om användaren är den sista eller enda godkännaren i ett arbetsflöde.',
 'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Åtgärden kan inte ångras!',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => 'Vill du verkligen flytta dokument, kataloger m m tillhörande användaren "[username]"? OBS! Åtgärden kan inte ångras!',
 'confirm_update_transmittalitem' => 'Bekräfta uppdatering',
 'content' => 'Innehåll',
@@ -727,6 +728,7 @@ URL: [url]',
 'linked_to_document' => 'Länkad till dokument',
 'linked_to_this_version' => 'Länkad till denna version',
 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer <a href="%s">Alternativ uppladdning</a>.',
+'link_document' => '',
 'link_to_version' => 'Kopppla till version',
 'list_access_rights' => 'Lista alla rättigheter...',
 'list_contains_no_access_docs' => 'Listan innehåller fler dokument som inte visas då du saknar rättigheter till dessa.',
@@ -952,6 +954,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'receipt_status' => 'Status',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => 'Ingen åtgärd',
@@ -1532,7 +1535,7 @@ Kommentar: [comment]',
 'settings_updateDatabase' => 'Kör schemauppdateringsskript på databasen',
 'settings_updateNotifyTime' => 'Tid för uppdateringsmeddelande',
 'settings_updateNotifyTime_desc' => 'Användare meddelas om att ändringar i dokumentet har genomförts inom de senaste \'Tid för uppdateringsmeddelande\' sekunder.',
-'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.2.0',
+'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.6.38',
 'settings_versioningFileName' => 'Versionsinfo-filnamn',
 'settings_versioningFileName_desc' => 'Namnet på versionsinfo-fil som skapas med backup-verktyget',
 'settings_versiontolow' => 'Version för låg',
@@ -1598,6 +1601,7 @@ Kommentar: [comment]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Ogiltigt katalog-ID',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuell katalog',
 'splash_move_document' => 'Dokumentet flyttat',
 'splash_move_folder' => 'Katalogen flyttad',
@@ -1628,6 +1632,7 @@ Kommentar: [comment]',
 'splash_substituted_user' => 'Bytt användare',
 'splash_switched_back_user' => 'Byt tillbaka till original användare',
 'splash_toogle_group_manager' => 'Gruppmanager har ändrats',
+'splash_transfer_content' => '',
 'splash_transfer_document' => 'Dokument överfört',
 'splash_transfer_objects' => 'Objekt överförda',
 'splash_trigger_workflow' => '',
@@ -1717,6 +1722,7 @@ Kommentar: [comment]',
 'toggle_manager' => 'Byt manager',
 'toggle_qrcode' => 'Visa/göm QR-kod',
 'to_before_from' => 'Slutdatum får inte vara innan startdatum',
+'transfer_content' => '',
 'transfer_document' => 'Överför dokument',
 'transfer_no_read_access' => 'Användaren har inte läsrättigheter i katalogen',
 'transfer_no_write_access' => 'Användaren har inte skrivrättigheter i katalogen',

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 (1083), aydin (83)
+//    Translators: Admin (1087), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -289,6 +289,7 @@ URL: [url]',
 'confirm_rm_user' => '"[username]" kullanıcısını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '"[documentname]" dokümanının [version] versiyonunu silmek istiyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'İçerik',
@@ -708,6 +709,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız <a href="%s">alternatif yükleme sayfası için tıklayın</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Tüm erişim haklarini listele',
 'list_contains_no_access_docs' => '',
@@ -938,6 +940,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1491,7 +1494,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Veritabanında schema update betik çalıştır',
 'settings_updateNotifyTime' => 'Güncelleme Bildirim Zamanı',
 'settings_updateNotifyTime_desc' => 'Kullanıcılara doküman güncellemelerinin \'Update Notify Time\' saniyede gerçekleştiği bildirilir.',
-'settings_upgrade_php' => 'PHP versiyonu en az 5.2.0 olmalıdır',
+'settings_upgrade_php' => 'PHP versiyonu en az 5.6.38 olmalıdır',
 'settings_versioningFileName' => 'Versiyonlama DosyaAdı',
 'settings_versioningFileName_desc' => 'Yedekleme aracı tarafından oluşturulan versiyon bilgisi dosyasının adı',
 'settings_versiontolow' => 'Versiyon düşük',
@@ -1516,9 +1519,9 @@ URL: [url]',
 'sign_out' => 'Çıkış',
 'sign_out_user' => 'Kullanıcı hesabından çıkış',
 'sk_SK' => 'Slovakça',
-'sort_by_date' => '',
+'sort_by_date' => 'Tarihe göre sırala',
-'sort_by_name' => '',
+'sort_by_name' => 'Ada göre sırala',
-'sort_by_sequence' => '',
+'sort_by_sequence' => 'Eklenme sırasına göre sırala',
 'space_used_on_data_folder' => 'Data klasörü kullanılan alan',
 'splash_added_to_clipboard' => 'Panoya eklendi',
 'splash_add_access' => '',
@@ -1557,6 +1560,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Hatalı klasör ID',
 'splash_invalid_searchterm' => 'Hatalı arama terimi',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1587,6 +1591,7 @@ URL: [url]',
 'splash_substituted_user' => 'Yerine geçilen kullanıcı',
 'splash_switched_back_user' => 'Orijinal kullanıcıya geri dönüldü',
 'splash_toogle_group_manager' => 'Grup yöneticisi değişti',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1676,6 +1681,7 @@ URL: [url]',
 'toggle_manager' => 'Değişim yönetimi',
 'toggle_qrcode' => '',
 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz',
+'transfer_content' => '',
 'transfer_document' => 'Dokumanı gönder',
 'transfer_no_read_access' => 'Kullanıcının klasörde okuma erişimi yok.',
 'transfer_no_write_access' => 'Kullanıcının klasör üzerinde yazma hakkı yok',

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 (1337)
+//    Translators: Admin (1338)
 
 $text = array(
 '2_factor_auth' => '',
@@ -295,6 +295,7 @@ URL: [url]',
 'confirm_rm_user' => 'Видалити користувача «[username]»?<br>Дія <b>незворотня</b>',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Видалити версію [version] документа «[documentname]»?<br>Дія <b>незворотня</b>',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Підтвердити оновлення',
 'content' => 'Вміст',
@@ -714,6 +715,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте <a href="%s">інший метод</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => 'Повний список прав...',
 'list_contains_no_access_docs' => '',
@@ -944,6 +946,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => 'Підсумки отримання',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1512,7 +1515,7 @@ URL: [url]',
 'settings_updateDatabase' => 'Запустити оновлення схеми БД',
 'settings_updateNotifyTime' => 'Період сповіщень про зміни',
 'settings_updateNotifyTime_desc' => 'Користувачі отримують сповіщення за вказані останні секунди.',
-'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.2.0',
+'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.6.38',
 'settings_versioningFileName' => 'Назва файлу версій',
 'settings_versioningFileName_desc' => 'Назва файлу версій, створеного інструментами резервного копіювання.',
 'settings_versiontolow' => 'Надто стара версія',
@@ -1578,6 +1581,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталогу',
 'splash_invalid_searchterm' => 'Невірний пошуковий запит',
+'splash_link_document' => '',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1608,6 +1612,7 @@ URL: [url]',
 'splash_substituted_user' => 'Користувача переключено',
 'splash_switched_back_user' => 'Переключено на початкового користувача',
 'splash_toogle_group_manager' => 'Змінено менеджера групи',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1697,6 +1702,7 @@ URL: [url]',
 'toggle_manager' => 'Змінити ознаку менеджера',
 'toggle_qrcode' => '',
 'to_before_from' => 'Кінцева дата не може бути меншою початкової дати',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

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 (761), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (765), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -287,6 +287,7 @@ URL: [url]',
 'confirm_rm_user' => '您确定要删除"[username]"用户?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?<br>请注意：此动作执行后不能撤销.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '确认更新',
 'content' => '内容',
@@ -710,6 +711,7 @@ URL: [url]',
 'linked_to_document' => '链接到文档',
 'linked_to_this_version' => '链接到版本',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
+'link_document' => '',
 'link_to_version' => '附加到版本',
 'list_access_rights' => '列出所有的访问权限',
 'list_contains_no_access_docs' => '',
@@ -943,6 +945,7 @@ URL: [url]',
 'receipt_status' => '状态',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1518,9 +1521,9 @@ URL: [url]',
 'sign_out' => '登出',
 'sign_out_user' => '退出登录',
 'sk_SK' => '斯洛伐克语',
-'sort_by_date' => '',
+'sort_by_date' => '日期排序',
-'sort_by_name' => '',
+'sort_by_name' => '文件名排序',
-'sort_by_sequence' => '',
+'sort_by_sequence' => '顺序排列',
 'space_used_on_data_folder' => '数据文件夹使用空间',
 'splash_added_to_clipboard' => '已复制',
 'splash_add_access' => '',
@@ -1559,6 +1562,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '非法的文件夹 ID',
 'splash_invalid_searchterm' => '无效的搜索项',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '文档已迁移',
 'splash_move_folder' => '文件夹已迁移',
@@ -1589,6 +1593,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1678,6 +1683,7 @@ URL: [url]',
 'toggle_manager' => '角色切换',
 'toggle_qrcode' => '显示/隐藏 QR 码',
 'to_before_from' => '结束日期不能早于开始日期',
+'transfer_content' => '',
 'transfer_document' => '共享文档',
 'transfer_no_read_access' => '用户没有该文件夹的读权限',
 'transfer_no_write_access' => '当前用户没有文件夹写入权限',

languages/zh_TW/lang.inc

@@ -270,6 +270,7 @@ URL: [url]',
 'confirm_rm_user' => '您確定要刪除"[username]"用戶?<br>請注意：此動作執行後不能撤銷.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您確定要刪除"[documentname]文檔的[version]版本檔?<br>請注意：此動作執行後不能撤銷.',
+'confirm_transfer_link_document' => '',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => '',
 'content' => '內容',
@@ -635,6 +636,7 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '超過20M大檔，請選擇<a href="%s">上傳大檔</a>.',
+'link_document' => '',
 'link_to_version' => '',
 'list_access_rights' => '列出權限',
 'list_contains_no_access_docs' => '',
@@ -825,6 +827,7 @@ URL: [url]',
 'receipt_status' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recent_uploads' => '',
 'reception' => '',
 'reception_acknowleged' => '',
 'reception_noaction' => '',
@@ -1408,6 +1411,7 @@ URL: [url]',
 'splash_inherit_access' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
+'splash_link_document' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
@@ -1438,6 +1442,7 @@ URL: [url]',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
+'splash_transfer_content' => '',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
@@ -1527,6 +1532,7 @@ URL: [url]',
 'toggle_manager' => '角色切換',
 'toggle_qrcode' => '',
 'to_before_from' => '',
+'transfer_content' => '',
 'transfer_document' => '',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',

op/op.Ajax.php

@@ -271,7 +271,7 @@ switch($command) {
 
 	case 'movefolder': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movefolder', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -310,7 +310,7 @@ switch($command) {
 
 	case 'movedocument': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movedocument', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -347,6 +347,96 @@ switch($command) {
 		}
 		break; /* }}} */
 
+	case 'transfercontent': /* {{{ */
+		if($user) {
+			if(!checkFormKey('', 'GET')) {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$mdocument = $dms->getDocument($_REQUEST['docid']);
+				if($mdocument) {
+					if ($mdocument->getAccessMode($user, 'transferContent') >= M_READWRITE) {
+						/* Check if source document has more than one version */
+						$versions = $mdocument->getContent();
+						if(count($versions) == 1) {
+							if($targetdoc = $dms->getDocument($_REQUEST['targetdocumentid'])) {
+								if($targetdoc->getAccessMode($user, 'transferContent') >= M_READWRITE) {
+									if($targetdoc->addContent($versions[0]->getComment(), $versions[0]->getUser(), $dms->contentDir . $versions[0]->getPath(), $versions[0]->getOriginalFileName(), $versions[0]->getFileType(), $versions[0]->getMimeType())) { //, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) {
+										if($mdocument->remove()) {
+											header('Content-Type: application/json');
+											echo json_encode(array('success'=>true, 'message'=>getMLText('splash_transfer_content'), 'data'=>''));
+											add_log_line();
+										} else {
+											header('Content-Type: application/json');
+											echo json_encode(array('success'=>false, 'message'=>'Error removing source document', 'data'=>''));
+										}
+									} else {
+										header('Content-Type: application/json');
+										echo json_encode(array('success'=>false, 'message'=>'Error transfering content', 'data'=>''));
+									}
+								} else {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+								}
+							} else {
+								header('Content-Type: application/json');
+								echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+							}
+						} else {
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>false, 'message'=>getMLText('splash_source_doc_has_versions'), 'data'=>''));
+						}
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
+	case 'linkdocument': /* {{{ */
+		if($user) {
+			if(!checkFormKey('', 'GET')) {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$mdocument = $dms->getDocument($_REQUEST['docid']);
+				if($mdocument) {
+					if ($mdocument->getAccessMode($user, 'linkDocument') >= M_READ) {
+						if($targetdoc = $dms->getDocument($_REQUEST['targetdocumentid'])) {
+							if($targetdoc->getAccessMode($user, 'linkDocument') >= M_READWRITE) {
+								if($targetdoc->addDocumentLink($mdocument->getID(), $user->getID(), false)) {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_link_document'), 'data'=>''));
+									add_log_line();
+								} else {
+									header('Content-Type: application/json');
+									echo json_encode(array('success'=>false, 'message'=>'Error linking document', 'data'=>''));
+								}
+							} else {
+								header('Content-Type: application/json');
+								echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+							}
+						} else {
+							header('Content-Type: application/json');
+							echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+						}
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied'), 'data'=>''));
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id'), 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
 	case 'deletefolder': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removefolder', 'GET')) {
@@ -523,7 +613,7 @@ switch($command) {
 
 	case 'uploaddocument': /* {{{ */
 		if($user) {
-			if(checkFormKey('adddocument')) {
+			if(checkFormKey('')) {
 				if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
 					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));

restapi/index.php

@@ -390,17 +390,17 @@ function createFolder($request, $response, $args) { /* {{{ */
             $params = $request->getParsedBody();
             if(!empty($params['name'])) {
                 $comment = isset($params['comment']) ? $params['comment'] : '';
-								if(isset($params['sequence'])) {
+                if(isset($params['sequence'])) {
-										$sequence = str_replace(',', '.', $params["sequence"]);
+                    $sequence = str_replace(',', '.', $params["sequence"]);
-										if (!is_numeric($sequence))
+                    if (!is_numeric($sequence))
-												return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400);
+                        return $response->withJson(array('success'=>false, 'message'=>getMLText("invalid_sequence"), 'data'=>''), 400);
-								} else {
+                } else {
-										$dd = $parent->getSubFolders('s');
+                    $dd = $parent->getSubFolders('s');
-										if(count($dd) > 1)
+                    if(count($dd) > 1)
-												$sequence = $dd[count($dd)-1]->getSequence() + 1;
+                        $sequence = $dd[count($dd)-1]->getSequence() + 1;
-										else
+                    else
-												$sequence = 1.0;
+                        $sequence = 1.0;
-								}
+                }
                 $newattrs = array();
                 if(!empty($params['attributes'])) {
                     foreach($params['attributes'] as $attrname=>$attrvalue) {
@@ -410,12 +410,12 @@ function createFolder($request, $response, $args) { /* {{{ */
                         }
                     }
                 }
-								/* Check if name already exists in the folder */
+                /* Check if name already exists in the folder */
-								if(!$settings->_enableDuplicateSubFolderNames) {
+                if(!$settings->_enableDuplicateSubFolderNames) {
-									if($folder->hasSubFolderByName($params['name'])) {
+                    if($folder->hasSubFolderByName($params['name'])) {
-										return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400);
+                        return $response->withJson(array('success'=>false, 'message'=>getMLText("subfolder_duplicate_name"), 'data'=>''), 400);
-									}
+                    }
-								}
+                }
                 if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) {
 
                     $rec = __getFolderData($folder);
@@ -577,12 +577,12 @@ function uploadDocument($request, $response, $args) { /* {{{ */
                 $origfilename = $file_info->getClientFilename();
             if (trim($docname) == '')
                 $docname = $origfilename;
-						/* Check if name already exists in the folder */
+            /* Check if name already exists in the folder */
-						if(!$settings->_enableDuplicateDocNames) {
+            if(!$settings->_enableDuplicateDocNames) {
-							if($mfolder->hasDocumentByName($docname)) {
+                if($mfolder->hasDocumentByName($docname)) {
-                return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400);
+                    return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400);
-							}
+                }
-						}
+            }
             $temp = $file_info->file;
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
             $userfiletype = finfo_file($finfo, $temp);
@@ -699,12 +699,12 @@ function uploadDocumentPut($request, $response, $args) { /* {{{ */
             $userfiletype = finfo_file($finfo, $temp);
             $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
             finfo_close($finfo);
-						/* Check if name already exists in the folder */
+            /* Check if name already exists in the folder */
-						if(!$settings->_enableDuplicateDocNames) {
+            if(!$settings->_enableDuplicateDocNames) {
-							if($mfolder->hasDocumentByName($docname)) {
+                if($mfolder->hasDocumentByName($docname)) {
                 return $response->withJson(array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''), 400);
-							}
+                }
-						}
+            }
             $res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
             unlink($temp);
             if($res) {
@@ -796,13 +796,13 @@ function addDocumentLink($request, $response, $args) { /* {{{ */
     $targetdoc = $dms->getDocument($args['documentid']);
     if($sourcedoc && $targetdoc) {
         if($sourcedoc->getAccessMode($userobj, 'addDocumentLink') >= M_READ) {
-					$params = $request->getParsedBody();
+            $params = $request->getParsedBody();
-					  $public = !isset($params['public']) ? true : false;
+              $public = !isset($params['public']) ? true : false;
-						if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){
+                if ($sourcedoc->addDocumentLink($targetdoc->getId(), $userobj->getID(), $public)){
                 return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 201);
-						} else {
+                } else {
-								return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500);
+                        return $response->withJson(array('success'=>false, 'message'=>'Could not create document link', 'data'=>''), 500);
-						}
+            }
         } else {
             return $response->withJson(array('success'=>false, 'message'=>'No access on source document', 'data'=>''), 403);
         }

styles/bootstrap/application.css

@@ -152,6 +152,40 @@ div.splash {
 	display: none;
 }
 
+div.statusbar-container {
+	display: none;
+	position: fixed;
+	right:10px;
+	top:60px;
+	width:300px;
+	padding:10px;
+	background-color: white;
+	border: 1px solid #E0E0E0;
+	border-radius: 4px;
+	z-index: 10;
+	overflow-y: scroll;
+	max-height: calc(100% - 100px);
+}
+div.statusbar-container::-webkit-scrollbar {
+	width: 5px;
+}
+div.statusbar-container::-webkit-scrollbar-track {
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+}
+
+div.statusbar-container::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+}
+
+div.statusbar-container h1 {
+	font-size: 21px;
+	line-height: 40px;
+	color: #333333;
+	font-weight: normal;
+}
+
 ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
     background-color: #E0E0E0;
 }

styles/bootstrap/application.js

@@ -545,7 +545,6 @@ function onAddClipboard(ev) { /* {{{ */
 	}
 
 	function sendFileToServer(formData,status) {
-		formData.append('command', 'uploaddocument');
 		var uploadURL = ajaxurl; //Upload URL
 		var extraData ={}; //Extra Data.
 		var jqXHR=$.ajax({
@@ -641,18 +640,29 @@ function onAddClipboard(ev) { /* {{{ */
 		}
 	}
 
-	SeedDMSUpload.handleFileUpload = function(files,obj) {
+	SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) {
-		var target = obj.data('target');
+		/* target is set for the quick upload area */
-		if(target) {
+		var target_id = obj.data('target');
+		var target_type = 'folder';
+		/* droptarget is set for folders and documents in lists */
+		var droptarget = obj.data('droptarget');
+		if(droptarget) {
+			target_type = droptarget.split("_")[0];
+			target_id = droptarget.split("_")[1];
+		}
+		if(target_type == 'folder' && target_id) {
 			for (var i = 0; i < files.length; i++) {
 				if(files[i].size <= maxFileSize) {
 					var fd = new FormData();
-					fd.append('folderid', target);
+					fd.append('targettype', target_type);
-					fd.append('formtoken', obj.data('formtoken'));
+					fd.append('folderid', target_id);
+					fd.append('formtoken', obj.data('uploadformtoken'));
 					fd.append('userfile', files[i]);
+					fd.append('command', 'uploaddocument');
 //					fd.append('path', files[i].webkitRelativePath);
 
-					var status = new createStatusbar(obj);
+					statusbar.parent().show();
+					var status = new createStatusbar(statusbar);
 					status.setFileNameSize(files[i].name,files[i].size);
 					sendFileToServer(fd,status);
 				} else {
@@ -666,6 +676,32 @@ function onAddClipboard(ev) { /* {{{ */
 					});
 				}
 			}
+		} else if(target_type == 'document' && target_id) {
+			/*
+			for (var i = 0; i < files.length; i++) {
+				if(files[i].size <= maxFileSize) {
+					var fd = new FormData();
+					fd.append('targettype', target_type);
+					fd.append('documentid', target_id);
+					fd.append('formtoken', obj.data('uploadformtoken'));
+					fd.append('userfile', files[i]);
+					fd.append('command', 'uploaddocument');
+
+					var status = new createStatusbar(statusbar);
+					status.setFileNameSize(files[i].name,files[i].size);
+					sendFileToServer(fd,status);
+				} else {
+					noty({
+						text: maxFileSizeMsg + '<br /><em>' + files[i].name + ' (' + files[i].size + ' Bytes)</em>',
+						type: 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 5000,
+					});
+				}
+			}
+			*/
 		}
 	}
 }( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */
@@ -690,120 +726,211 @@ $(document).ready(function() { /* {{{ */
 		var files = e.originalEvent.dataTransfer.files;
 
 		//We need to send dropped files to Server
-		SeedDMSUpload.handleFileUpload(files,obj);
+		SeedDMSUpload.handleFileUpload(files,obj, obj);
 	});
 
-	$(document).on('dragenter', '.table-row-folder', function (e) {
+	$(document).on('dragenter', '.droptarget', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(e.currentTarget).css('border', '2px dashed #0B85A1');
 	});
-	$(document).on('dragleave', '.table-row-folder', function (e) {
+	$(document).on('dragleave', '.droptarget', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(e.currentTarget).css('border', '0px solid white');
 	});
-	$(document).on('dragover', '.table-row-folder', function (e) {
+	$(document).on('dragover', '.droptarget', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 	});
-	$(document).on('drop', '.table-row-folder', function (e) {
+	$(document).on('drop', '.droptarget', function (e) {
 		e.preventDefault();
 		e.stopPropagation();
 		$(e.currentTarget).css('border', '0px solid white');
-		attr_rel = $(e.currentTarget).attr('rel');
+		attr_rel = $(e.currentTarget).data('droptarget');
 		target_type = attr_rel.split("_")[0];
 		target_id = attr_rel.split("_")[1];
-		console.log(e.originalEvent.dataTransfer.getData("text"));
+		if(target_type == 'folder') {
-		var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
+			var files = e.originalEvent.dataTransfer.files;
-		source_type = source_info.type;
+			if(files.length > 0) {
-		source_id = source_info.id;
+				console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
-		formtoken = source_info.formtoken;
+				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/);
-//		source_type = e.originalEvent.dataTransfer.getData("type");
+			} else {
-//		source_id = e.originalEvent.dataTransfer.getData("id");
+				var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
-//		formtoken = e.originalEvent.dataTransfer.getData("formtoken");
+				source_type = source_info.type;
-		if(source_type == 'document') {
+				source_id = source_info.id;
-			bootbox.dialog(trans.confirm_move_document, [{
+				formtoken = source_info.formtoken;
-				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
-				"class" : "btn-danger",
+				if(source_type == 'document') {
-				"callback": function() {
+					bootbox.dialog(trans.confirm_move_document, [{
-					$.get('../op/op.Ajax.php',
+						"label" : "<i class='icon-remove'></i> "+trans.move_document,
-						{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
+						"class" : "btn-danger",
-						function(data) {
+						"callback": function() {
-							if(data.success) {
+							$.get('../op/op.Ajax.php',
-								$('#table-row-document-'+source_id).hide('slow');
+								{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
-								noty({
+								function(data) {
-									text: data.message,
+									if(data.success) {
-									type: 'success',
+										$('#table-row-document-'+source_id).hide('slow');
-									dismissQueue: true,
+										noty({
-									layout: 'topRight',
+											text: data.message,
-									theme: 'defaultTheme',
+											type: 'success',
-									timeout: 1500,
+											dismissQueue: true,
-								});
+											layout: 'topRight',
-							} else {
+											theme: 'defaultTheme',
-								noty({
+											timeout: 1500,
-									text: data.message,
+										});
-									type: 'error',
+									} else {
-									dismissQueue: true,
+										noty({
-									layout: 'topRight',
+											text: data.message,
-									theme: 'defaultTheme',
+											type: 'error',
-									timeout: 3500,
+											dismissQueue: true,
-								});
+											layout: 'topRight',
-							}
+											theme: 'defaultTheme',
-						},
+											timeout: 3500,
-						'json'
+										});
-					);
+									}
-				}
+								},
-			}, {
+								'json'
-				"label" : trans.cancel,
+							);
-				"class" : "btn-cancel",
+						}
-				"callback": function() {
+					}, {
-				}
+						"label" : trans.cancel,
-			}]);
+						"class" : "btn-cancel",
+						"callback": function() {
+						}
+					}]);
 
-			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
+					url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
-//			document.location = url;
+		//			document.location = url;
-		} else if(source_type == 'folder' && source_id != target_id) {
+				} else if(source_type == 'folder' && source_id != target_id) {
-			bootbox.dialog(trans.confirm_move_folder, [{
+					bootbox.dialog(trans.confirm_move_folder, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+						"label" : "<i class='icon-remove'></i> "+trans.move_folder,
-				"class" : "btn-danger",
+						"class" : "btn-danger",
-				"callback": function() {
+						"callback": function() {
-					$.get('../op/op.Ajax.php',
+							$.get('../op/op.Ajax.php',
-						{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
+								{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
-						function(data) {
+								function(data) {
-							if(data.success) {
+									if(data.success) {
-								$('#table-row-folder-'+source_id).hide('slow');
+										$('#table-row-folder-'+source_id).hide('slow');
-								noty({
+										noty({
-									text: data.message,
+											text: data.message,
-									type: 'success',
+											type: 'success',
-									dismissQueue: true,
+											dismissQueue: true,
-									layout: 'topRight',
+											layout: 'topRight',
-									theme: 'defaultTheme',
+											theme: 'defaultTheme',
-									timeout: 1500,
+											timeout: 1500,
-								});
+										});
-							} else {
+									} else {
-								noty({
+										noty({
-									text: data.message,
+											text: data.message,
-									type: 'error',
+											type: 'error',
-									dismissQueue: true,
+											dismissQueue: true,
-									layout: 'topRight',
+											layout: 'topRight',
-									theme: 'defaultTheme',
+											theme: 'defaultTheme',
-									timeout: 3500,
+											timeout: 3500,
-								});
+										});
-							}
+									}
-						},
+								},
-						'json'
+								'json'
-					);
+							);
-				}
+						}
-			}, {
+					}, {
-				"label" : trans.cancel,
+						"label" : trans.cancel,
-				"class" : "btn-cancel",
+						"class" : "btn-cancel",
-				"callback": function() {
+						"callback": function() {
-				}
+						}
-			}]);
+					}]);
 
-			url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
+					url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
-//			document.location = url;
+		//			document.location = url;
+				}
+			}
+		} else if(target_type == 'document') {
+			var files = e.originalEvent.dataTransfer.files;
+			if(files.length > 0) {
+				console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
+				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/);
+			} else {
+				var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
+				source_type = source_info.type;
+				source_id = source_info.id;
+				formtoken = source_info.formtoken;
+				console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
+				if(source_type == 'document') {
+					if(source_id != target_id) {
+						bootbox.dialog(trans.confirm_transfer_link_document, [{
+							"label" : "<i class='icon-remove'></i> "+trans.transfer_content,
+							"class" : "btn-danger",
+							"callback": function() {
+								$.get('../op/op.Ajax.php',
+									{ command: 'transfercontent', docid: source_id, targetdocumentid: target_id, formtoken: formtoken },
+									function(data) {
+										if(data.success) {
+											$('#table-row-document-'+source_id).hide('slow');
+											noty({
+												text: data.message,
+												type: 'success',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 1500,
+											});
+										} else {
+											noty({
+												text: data.message,
+												type: 'error',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 3500,
+											});
+										}
+									},
+									'json'
+								);
+							}
+						}, {
+							"label" : trans.link_document,
+							"class" : "btn-danger",
+							"callback": function() {
+								$.get('../op/op.Ajax.php',
+									{ command: 'linkdocument', docid: source_id, targetdocumentid: target_id, formtoken: formtoken },
+									function(data) {
+										if(data.success) {
+											noty({
+												text: data.message,
+												type: 'success',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 1500,
+											});
+										} else {
+											noty({
+												text: data.message,
+												type: 'error',
+												dismissQueue: true,
+												layout: 'topRight',
+												theme: 'defaultTheme',
+												timeout: 3500,
+											});
+										}
+									},
+									'json'
+								);
+							}
+						}, {
+							"label" : trans.cancel,
+							"class" : "btn-cancel",
+							"callback": function() {
+							}
+						}]);
+					}
+
+					url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
+		//			document.location = url;
+				}
+			}
 		}
 	});
 	$(document).on('dragstart', '.table-row-folder', function (e) {
@@ -816,9 +943,6 @@ $(document).ready(function() { /* {{{ */
 			formtoken : $(e.target).attr('formtoken')
 		};
 		e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
-//		e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
-//		e.originalEvent.dataTransfer.setData("type","folder");
-//		e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
 	});
 
 	$(document).on('dragstart', '.table-row-document', function (e) {
@@ -831,9 +955,6 @@ $(document).ready(function() { /* {{{ */
 			formtoken : $(e.target).attr('formtoken')
 		};
 		e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
-//		e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
-//		e.originalEvent.dataTransfer.setData("type","document");
-//		e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
 	});
 
 	/* Dropping item on alert below clipboard */

views/bootstrap/class.ApprovalSummary.php

@@ -36,6 +36,13 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+
+		$this->printDeleteDocumentButtonJs();
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -48,6 +55,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -90,10 +99,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 					echo $txt;
 				else {
 					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRowStart($document, $class);
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
 					print "<td><small>".getApprovalStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
-					print "</tr>\n";
+					echo $this->documentListRowEnd($document);
 				}
 			}
 			if ($st["status"]!=-2) {
@@ -137,10 +146,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 					echo $txt;
 				else {
 					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+				echo $this->documentListRowStart($document, $class);
-					echo $this->documentListRow($document, $previewer, true, $st['version']);
+				echo $this->documentListRow($document, $previewer, true, $st['version']);
-					print "<td><small>".getApprovalStatusText($st["status"])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+				print "<td><small>".getApprovalStatusText($st["status"])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
-					print "</tr>\n";
+				echo $this->documentListRowEnd($document);
 				}
 			}
 		}

views/bootstrap/class.Bootstrap.php

@@ -128,6 +128,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			$this->params['session']->clearSplashMsg();
 			echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\"".(!empty($flashmsg['timeout']) ? ' data-timeout="'.$flashmsg['timeout'].'"': '').">".$flashmsg['msg']."</div>\n";
 		}
+		echo "<div class=\"statusbar-container\"><h1>".getMLText('recent_uploads')."</h1></div>\n";
 		foreach($hookObjs as $hookObj) {
 			if (method_exists($hookObj, 'startBody')) {
 				$hookObj->startBody($this);
@@ -483,7 +484,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		for ($i = 0; $i < count($path); $i++) {
 			$txtpath .= "<li>";
 			if ($i +1 < count($path)) {
-				$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">".
+				$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".
 					htmlspecialchars($path[$i]->getName())."</a>";
 			}
 			else {
@@ -1749,15 +1750,15 @@ $(document).ready(function() {
 			if($path || $expandtree>=$level) {
 				if($path)
 					$pathfolder = array_shift($path);
-				$subfolders = $folder->getSubFolders($orderby[0], $orderdir);
+				$subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 				$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
 				$children = array();
 				foreach($subfolders as $subfolder) {
-					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true);
+					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true);
 					if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) {
 						$node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
 						if($showdocs) {
-							$documents = $subfolder->getDocuments($orderby[0], $orderdir);
+							$documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 							$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
 							if($obj->hasHook('filterTreeDocuments'))
 								$documents = $obj->callHook('filterTreeDocuments', $folder, $documents);
@@ -1771,11 +1772,11 @@ $(document).ready(function() {
 				}
 				return $children;
 			} else {
-				$subfolders = $folder->getSubFolders($orderby[0], $orderdir);
+				$subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 				$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
 				$children = array();
 				foreach($subfolders as $subfolder) {
-					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true);
+					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true);
 					$children[] = $node;
 				}
 				return $children;
@@ -1807,7 +1808,7 @@ $(document).ready(function() {
 			} else {
 				$node['children'] = jqtree($this, $path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0);
 				if($showdocs) {
-					$documents = $folder->getDocuments($orderby[0], $orderdir);
+					$documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
 					if($this->hasHook('filterTreeDocuments'))
 						$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
@@ -1827,7 +1828,7 @@ $(document).ready(function() {
 			
 		} else {
 			$root = $this->params['dms']->getFolder($this->params['rootfolderid']);
-			$tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>false, 'is_folder'=>true));
+			$tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>true, 'is_folder'=>true));
 		}
 
 ?>
@@ -1850,7 +1851,7 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey('movefolder'); ?>');
+					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
 				else
 					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
     }
@@ -2349,6 +2350,21 @@ $(document).ready( function() {
 		";
 	} /* }}} */
 
+	/**
+	 * Start the row for a folder in list of documents and folders
+	 *
+	 * For a detailed description see
+	 * {@link SeedDMS_Bootstrap_Style::folderListRowStart()}
+	 */
+	function documentListRowStart($document, $class='') { /* {{{ */
+		$docID = $document->getID();
+		return "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document droptarget ".($class ? ' '.$class : '')."\" data-droptarget=\"document_".$docID."\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('')."\" draggable=\"true\">";
+	} /* }}} */
+
+	function documentListRowEnd($document) { /* {{{ */
+			return "</tr>\n";
+	} /* }}} */
+
 	/**
 	 * Return HTML of a single row in the document list table
 	 *
@@ -2373,7 +2389,7 @@ $(document).ready( function() {
 		$docID = $document->getID();
 
 		if(!$skipcont)
-			$content .= "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+			$content .= $this->documentListRowStart($document);
 
 		if($version) {
 			$latestContent = $this->callHook('documentContent', $document, $version);
@@ -2504,10 +2520,50 @@ $(document).ready( function() {
 			$content .= "</td>";
 		}
 		if(!$skipcont)
-			$content .= "</tr>\n";
+			$content .= $this->documentListRowEnd($document);
 		return $content;
 	} /* }}} */
 
+	/**
+	 * Start the row for a folder in list of documents and folders
+	 *
+	 * This method creates the starting tr tag for a new table row containing
+	 * a folder list entry. The tr tag contains various attributes which are
+	 * used for removing the table line and to make drap&drop work.
+	 *
+	 * id=table-row-folder-<id> : used for identifying the row when removing the table
+	 *   row after deletion of the folder by clicking on the delete button in that table
+	 *   row.
+	 * data-droptarget=folder_<id> : identifies the folder represented by this row
+	 *   when it used as a target of the drag&drop operation.
+	 *   If an element (either a file or a dragged item) is dropped on this row, the
+	 *   data-droptarget will be evaluated to identify the underlying dms object.
+	 *   Dropping a file on a folder will upload that file into the folder. Droping
+	 *   an item (which is currently either a document or a folder) from the page will
+	 *   move that item into the folder.
+	 * rel=folder_<id> : This data is put into drag data when a drag starts. When the
+	 *   item is dropped on some other item this data will identify the source object.
+	 *   The attributes data-droptarget and rel are usually equal. At least there is
+	 *   currently no scenario where they are different.
+	 * formtoken=<token> : token made of key 'movefolder'
+	 *   formtoken is also placed in the drag data just like the value of attibute 'rel'.
+	 *   This is always set to a value made of 'movefolder'.
+	 * data-uploadformtoken=<token> : token made of key 'adddocument'
+	 * class=table-row-folder : The class must have a class named 'table-row-folder' in
+	 *   order to be draggable and to extract the drag data from the attributes 'rel' and
+	 *   'formtoken'
+	 *
+	 * @param object $folder
+	 * @return string starting tr tag for a table
+	 */
+	function folderListRowStart($folder, $class='') { /* {{{ */
+		return "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget".($class ? ' '.$class : '')."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">";
+	} /* }}} */
+
+	function folderListRowEnd($folder) { /* {{{ */
+			return "</tr>\n";
+	} /* }}} */
+
 	function folderListRow($subFolder, $extracontent=array()) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -2522,9 +2578,9 @@ $(document).ready( function() {
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
 
 		$content = '';
-		$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+		$content .= $this->folderListRowStart($subFolder);
-		$content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
+		$content .= "<td><a draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
-		$content .= "<td><a draggable=\"false\" _rel=\"folder_".$subFolder->getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
+		$content .= "<td><a draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
 		$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>";
 		if($comment) {
 			$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
@@ -2579,7 +2635,7 @@ $(document).ready( function() {
 		}
 		$content .= "</div>";
 		$content .= "</td>";
-		$content .= "</tr>\n";
+		$content .= $this->folderListRowEnd($subFolder);
 		return $content;
 	} /* }}} */
 

views/bootstrap/class.Clipboard.php

@@ -57,11 +57,11 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -103,7 +103,8 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		$content = '';
 		$comment = $folder->getComment();
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-		$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+//		$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+		$content .= $this->folderListRowStart($folder);
 		$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
 		$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
 		if($comment) {
@@ -138,7 +139,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 			$version = $latestContent->getVersion();
 			$status = $latestContent->getStatus();
 			
-			$content .= "<tr draggable=\"true\" rel=\"document_".$document->getID()."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
+			$content .= $this->documentListRowStart($document);
 
 			if (file_exists($dms->contentDir . $latestContent->getPath())) {
 				$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version."\">";

views/bootstrap/class.ReviewSummary.php

@@ -36,6 +36,13 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+
+		$this->printDeleteDocumentButtonJs();
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -48,6 +55,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -92,10 +101,10 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 					echo $txt;
 				else {
 					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRowStart($document, $class);
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
 					print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
-					print "</tr>\n";
+					echo $this->documentListRowEnd($document);
 				}
 			}
 			if ($st["status"]!=-2) {
@@ -139,7 +148,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 					echo $txt;
 				else {
 					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
-					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+//					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRowStart($document, $class);
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
 					print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
 					print "</tr>\n";

views/bootstrap/class.Search.php

@@ -55,7 +55,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
 
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 
 ?>
 $(document).ready( function() {
@@ -635,87 +635,6 @@ $(document).ready( function() {
 						if($attrstr)
 							$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-default">'.getMLText('attributes').'</span>', $attrstr, true);
 						print $this->documentListRow($document, $previewer, false, 0, $extracontent);
-
-						if(0) {
-						print "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
-						if (in_array(2, $searchin)) {
-							$docName = $this->markQuery(htmlspecialchars($document->getName()), "i");
-						} else {
-							$docName = htmlspecialchars($document->getName());
-						}
-						print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">";
-						if($previewer->hasPreview($lc)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$lc->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($lc->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">";
-						print $docName;
-						print "</a>";
-						print "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
-						$folder = $document->getFolder();
-						$path = $folder->getPath();
-						for ($i = 1; $i  < count($path); $i++) {
-							print htmlspecialchars($path[$i]->getName())."/";
-						}
-						print "</span>";
-					print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $lc->getDate())."</b></span>";
-						if($comment) {
-							print "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-						}
-						print "</td>";
-
-						print "<td>";
-						print "<ul class=\"unstyled\">\n";
-						$lcattributes = $lc->getAttributes();
-						if($lcattributes) {
-							foreach($lcattributes as $lcattribute) {
-								$attrdef = $lcattribute->getAttributeDefinition();
-								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $lcattribute->getValueAsArray()))."</li>\n";
-							}
-						}
-						print "</ul>\n";
-						print "<ul class=\"unstyled\">\n";
-						$docttributes = $document->getAttributes();
-						if($docttributes) {
-							foreach($docttributes as $docttribute) {
-								$attrdef = $docttribute->getAttributeDefinition();
-								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $docttribute->getValueAsArray()))."</li>\n";
-							}
-						}
-						print "</ul>\n";
-						print "</td>";
-
-						$display_status=$lc->getStatus();
-						print "<td>".getOverallStatusText($display_status["status"]). "</td>";
-						print "<td>";
-						print "<div class=\"list-action\">";
-						if($document->getAccessMode($user) >= M_ALL) {
-							$this->printDeleteDocumentButton($document, 'splash_rm_document');
-						} else {
-	?>
-			 <span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>
-	<?php
-						}
-						if($document->getAccessMode($user) >= M_READWRITE) {
-	?>
-			 <a href="../out/out.EditDocument.php?documentid=<?php echo $document->getID(); ?>"><i class="icon-edit"></i></a>
-	<?php
-						} else {
-	?>
-			 <span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>
-	<?php
-						}
-						if($enableclipboard) {
-	?>
-			 <a class="addtoclipboard" rel="<?php echo "D".$document->getID(); ?>" msg="<?php printMLText('splash_added_to_clipboard'); ?>" _href="../op/op.AddToClipboard.php?documentid=<?php echo $document->getID(); ?>&type=document&id=<?php echo $document->getID(); ?>&refferer=<?php echo urlencode($this->params['refferer']); ?>" title="<?php printMLText("add_to_clipboard");?>"><i class="icon-copy"></i></a>
-<?php
-						}
-						print "</div>";
-						print "</td>";
-						print "</tr>\n";
-						}
 					}
 				} elseif(get_class($entry) == $dms->getClassname('folder')) {
 					$folder = $entry;
@@ -741,64 +660,6 @@ $(document).ready( function() {
 					if($attrstr)
 						$extracontent['bottom_title'] = '<br />'.$this->printPopupBox('<span class="btn btn-mini btn-default">'.getMLText('attributes').'</span>', $attrstr, true);
 					print $this->folderListRow($folder, $extracontent);
-					if(0) {
-					print "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
-					print $folderName;
-					print "</a>";
-					print "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
-					$path = $folder->getPath();
-					for ($i = 1; $i  < count($path)-1; $i++) {
-						print htmlspecialchars($path[$i]->getName())."/";
-					}
-					print "</span>";
-					print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $folder->getDate())."</b></span>";
-					if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($folder->getComment()));
-					else $comment = htmlspecialchars($folder->getComment());
-					if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-					if($comment) {
-						print "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-					}
-					print "</td>";
-					print "<td>";
-					print "<ul class=\"unstyled\">\n";
-					$folderattributes = $folder->getAttributes();
-					if($folderattributes) {
-						foreach($folderattributes as $folderattribute) {
-							$attrdef = $folderattribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $folderattribute->getValueAsArray()))."</li>\n";
-						}
-					}
-					print "</td>";
-					print "<td></td>";
-					print "<td nowrap>";
-					print "<div class=\"list-action\">";
-					if($folder->getAccessMode($user) >= M_ALL) {
-						$this->printDeleteFolderButton($folder, 'splash_rm_folder');
-					} else {
-?>
-     <span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>
-<?php
-					}
-					if($folder->getAccessMode($user) >= M_READWRITE) {
-?>
-     <a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid=<?php echo $folder->getID(); ?>"><i class="icon-edit"></i></a>
-<?php
-					} else {
-?>
-     <span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>
-<?php
-					}
-					if($enableclipboard) {
-?>
-     <a class="addtoclipboard" rel="<?php echo "F".$folder->getID(); ?>" msg="<?php printMLText('splash_added_to_clipboard'); ?>" _href="../op/op.AddToClipboard.php?folderid=<?php echo $folder->getID(); ?>&type=folder&id=<?php echo $folder->getID(); ?>&refferer=<?php echo urlencode($this->params['refferer']); ?>" title="<?php printMLText("add_to_clipboard");?>"><i class="icon-copy"></i></a>
-<?php
-					}
-					print "</div>";
-					print "</td>";
-					print "</tr>\n";
-					}
 				}
 			}
 			print "</tbody></table>\n";

views/bootstrap/class.Tasks.php

@@ -260,7 +260,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['review'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -271,7 +271,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['approval'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -282,7 +282,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['workflow'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\">".$doc->getName()."</a></li>";
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -394,7 +394,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 				if($folder = $dms->getFolder($folderid)) {
 					$comment = $folder->getComment();
 					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+//					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+					$content .= $this->folderListRowStart($folder);
 					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
 					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
 					if($comment) {
@@ -404,7 +405,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					$content .= "<td>\n";
 					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
 					$content .= "</td>\n";
-					$content .= "</tr>\n";
+					//$content .= "</tr>\n";
+					$content .= $this->folderListRowEnd($folder);
 					$foldercount++;
 				}
 			}

views/bootstrap/class.ViewFolder.php

@@ -94,7 +94,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$showtree = $this->params['showtree'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 ?>
 function folderSelected(id, name) {
 	window.location = '../out/out.ViewFolder.php?folderid=' + id;
@@ -390,7 +390,7 @@ $('#loadmore').click(function(e) {
 //			$this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");");
 //			$this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');");
 ?>
-<div id="dragandrophandler" class="well alert" data-target="<?php echo $folder->getID(); ?>" data-formtoken="<?php echo createFormKey('adddocument'); ?>"><?php printMLText('drop_files_here'); ?></div>
+<div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
 <?php
 			echo "</div>";
 			echo "</div>";