From 1de9ed37d514c9ab0a72386973dc71fbd7a40d41 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 30 Jul 2019 06:33:18 +0200 Subject: [PATCH 001/198] =?UTF-8?q?allow=20serveral=20instance=D1=95=20of?= =?UTF-8?q?=20drop=20folder=20chooser=20on=20one=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/bootstrap/class.AddDocument.php | 4 ++-- views/bootstrap/class.Bootstrap.php | 14 ++++++++------ views/bootstrap/class.DropFolderChooser.php | 16 +++++++++------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index e740e9651..7d4c25ee9 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -199,7 +199,7 @@ $(document).ready(function() { 'type'=>'text', 'id'=>'name', 'name'=>'name', - 'required'=>true + 'required'=>false ) ); $this->formField( @@ -310,7 +310,7 @@ $(document).ready(function() { ); $this->formField( getMLText("local_file"), - $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', false).($enablemultiupload ? '' : '') + $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '' : '') ); if($dropfolderdir) { $this->formField( diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1eb5703c7..4f3f07054 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1039,7 +1039,7 @@ $(document).ready(function() {
- '.getMLText("browse").'… + '.getMLText("browse").'…
@@ -1422,7 +1422,7 @@ $(document).ready(function() { $content = "
\n"; $content .= ""; $content .= ""; - $content .= "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; + $content .= "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; $content .= "
\n"; $content .= ' callHook('postContent'); $this->contentEnd(); $this->htmlEndPage(); } /* }}} */ From 1144ee4500fa2d83382d8157a495ff92314dde93 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 11:07:52 +0200 Subject: [PATCH 069/198] add entry for 5.1.13 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 40fe3b4ea..b9d21eb00 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,7 +12,7 @@ - do not set mandatory reviewer when document is uploaded and workflow mode is set to 'traditional without review'. - turn off auto complete for date fields -- new hook pageNavigationBar +- new hook pageNavigationBar in bootstrap, preContent, postContent in ViewDocument -------------------------------------------------------------------------------- Changes in version 5.1.12 From a53cd4b0cd036dcf90a77169df6ee3889386d216 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 12:21:40 +0200 Subject: [PATCH 070/198] add method successMsg() --- views/bootstrap/class.Bootstrap.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ef79b702a..c933ea73d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1524,6 +1524,12 @@ $(document).ready(function() { echo "\n"; } /* }}} */ + function successMsg($msg) { /* {{{ */ + echo "
\n"; + echo $msg; + echo "
\n"; + } /* }}} */ + function ___exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */ /* This is just a hack to prevent creation of js files in an error From 0205e8a08e9338689a04aef1534a64f9ede308cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Oct 2019 12:55:03 +0200 Subject: [PATCH 071/198] create AccessOperation object --- out/out.AttributeMgr.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index a455e6199..ef7960d13 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -27,6 +27,7 @@ require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); @@ -35,6 +36,8 @@ if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + $attrdefs = $dms->getAllAttributeDefinitions(); if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { @@ -44,6 +47,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { } if($view) { + $view->setParam('accessobject', $accessop); $view->setParam('attrdefs', $attrdefs); $view->setParam('selattrdef', $selattrdef); $view->setParam('showtree', showtree()); From b8447b7d390b86c2d73e0fa7dfc6ca6219c68b65 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:16:43 +0200 Subject: [PATCH 072/198] add more hooks (still incomplete) --- doc/README.Hooks | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/doc/README.Hooks b/doc/README.Hooks index 361a8e8c9..91f8de0a5 100644 --- a/doc/README.Hooks +++ b/doc/README.Hooks @@ -59,6 +59,22 @@ AddDocument::preIndexDocument are the document and the indexed document. Returning false will prevent the document from being indexed. +EditDocument::editDocumentAttribute + Called for each custom document attribute + + This hook will be called for each custom attribute to ouput the form entry. + The parameters passed are the document and the attribute definition. + Returning an empty array will prevent the attribute from being show. + Returning an array with two elements will pass those element to the formField + method. A returned string will be output as is. + +EditDocument::addDocumentAttributes + Called after all custom document attributes has been output + + This hook will be called right after the document attributes have been shown. + The return value is either an array with two elements or a string. + The string will be output as is, the array will be passed to the method formField. + UpdateDocument::preUpdateDocument Called before a new document will be updated @@ -70,10 +86,10 @@ UpdateDocument::preUpdateDocument UpdateDocument::updateDocument Called when the document is to be updated - This hook can be used to replace the code for updating a document. In - that case it must return a document content or false. If - the hook returns null, the original code for adding the - document will be executed. + This hook can be used to replace the code for updating a document. In + that case it must return a document content or false. If + the hook returns null, the original code for adding the + document will be executed. UpdateDocument::postUpdateDocument Called after a new document has been updated From dfa2d03cf9f942fb13fbe975747a2989a66d11fd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:18:06 +0200 Subject: [PATCH 073/198] new and modified hooks add hook addDocumentContentAttributes, addDocumentContentAttributes and editDocumentContentAttribute can also return a string --- views/bootstrap/class.EditAttributes.php | 28 ++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php index 1fa26e300..7401be445 100644 --- a/views/bootstrap/class.EditAttributes.php +++ b/views/bootstrap/class.EditAttributes.php @@ -53,18 +53,28 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { callHook('editDocumentContentAttribute', $version, $attrdef); - if(is_array($arr)) { - if($arr) { - $this->formField($arr[0], $arr[1]); - } - } else { - $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef))); + if($attrdefs) { + foreach($attrdefs as $attrdef) { + $arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef); + if(is_array($arr)) { + if($arr) { + $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; + } else { + $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef))); } } + } + $arrs = $this->callHook('addDocumentContentAttributes', $version); + if(is_array($arrs)) { + foreach($arrs as $arr) { + $this->formField($arr[0], $arr[1]); + } + } elseif(is_string($arr) { + echo $arr; + } $this->formSubmit(" ".getMLText('save')); ?> From 070af52849304fc185ce35790f7cd1ab4f6d9738 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:19:09 +0200 Subject: [PATCH 074/198] add new hook addFolderAttributes, editFolderAttribute may return a string --- views/bootstrap/class.EditFolder.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index 3168a08be..89bb50d4b 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -117,11 +117,21 @@ $(document).ready(function() { if($arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $folder->getAttribute($attrdef))); } } } + $arrs = $this->callHook('addFolderAttributes', $folder); + if(is_array($arrs)) { + foreach($arrs as $arr) { + $this->formField($arr[0], $arr[1]); + } + } elseif(is_string($arr) { + echo $arr; + } $this->formSubmit(" ".getMLText('save')); ?> From 0208d544094910988d80d944e4eb48693a9e7fb1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:19:51 +0200 Subject: [PATCH 075/198] fix parameter for addDocumentAttributes, editDocumentAttributes may return a string --- views/bootstrap/class.EditDocument.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index 8e1ef93ae..c3fbbd1af 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -162,16 +162,20 @@ $(document).ready( function() { if($arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef))); } } } - $arrs = $this->callHook('addDocumentAttributes', $folder); + $arrs = $this->callHook('addDocumentAttributes', $document); if(is_array($arrs)) { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr) { + echo $arr; } $this->formSubmit(" ".getMLText('save')); ?> From da5fed35915e56b0adeb2f5524a440206926e9c4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 08:27:38 +0200 Subject: [PATCH 076/198] fix syntax error --- views/bootstrap/class.EditAttributes.php | 4 ++-- views/bootstrap/class.EditDocument.php | 4 ++-- views/bootstrap/class.EditFolder.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php index 7401be445..ca64c9b98 100644 --- a/views/bootstrap/class.EditAttributes.php +++ b/views/bootstrap/class.EditAttributes.php @@ -60,7 +60,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { if($arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef))); @@ -72,7 +72,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index c3fbbd1af..937245c4b 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -162,7 +162,7 @@ $(document).ready( function() { if($arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef))); @@ -174,7 +174,7 @@ $(document).ready( function() { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index 89bb50d4b..e7bc756df 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -117,7 +117,7 @@ $(document).ready(function() { if($arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $folder->getAttribute($attrdef))); @@ -129,7 +129,7 @@ $(document).ready(function() { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr) { + } elseif(is_string($arr)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); From 8c73f36151d9ce434343a3cfa0a84e5b8ba7488f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sat, 19 Oct 2019 09:17:49 +0200 Subject: [PATCH 077/198] show[Document|Folder]Attribute may return a string --- views/bootstrap/class.ViewDocument.php | 2 ++ views/bootstrap/class.ViewFolder.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 06a2d4cff..ffb59411b 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -314,6 +314,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { echo "".$arr[0].":"; echo "".$arr[1].""; echo ""; + } elseif(is_string($arr)) { + echo $arr; } else { $this->printAttribute($attribute); } diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 1e57d85c4..b45acfff2 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -262,6 +262,8 @@ $('body').on('click', '.order-btn', function(ev) { echo "".$arr[0].":"; echo "".$arr[1].":"; echo ""; + } elseif(is_string($arr)) { + echo $arr; } else { $attrdef = $attribute->getAttributeDefinition(); ?> From e9b896ecf10e3296dbc7bc2669916cbec9e01c38 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 21 Oct 2019 09:32:07 +0200 Subject: [PATCH 078/198] fix errors related to new onepage mode --- out/out.AttributeMgr.php | 1 + out/out.Calendar.php | 5 +++++ out/out.Search.php | 4 ++++ out/out.Timeline.php | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index ef7960d13..445a69d60 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -48,6 +48,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { if($view) { $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('attrdefs', $attrdefs); $view->setParam('selattrdef', $selattrdef); $view->setParam('showtree', showtree()); diff --git a/out/out.Calendar.php b/out/out.Calendar.php index 2622b4958..e8f1ad8e0 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -26,6 +26,7 @@ require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); @@ -44,6 +45,8 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume } else $document = null; +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + $calendar = new SeedDMS_Calendar($dms->getDB(), $user); if(isset($_GET['eventid']) && $_GET['eventid'] && is_numeric($_GET['eventid'])) { @@ -62,6 +65,8 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) { $eventtype = 'regular'; if($view) { + $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('calendar', $calendar); $view->setParam('start', $start); $view->setParam('end', $end); diff --git a/out/out.Search.php b/out/out.Search.php index 1dac3b46a..1a47098bf 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -58,6 +58,8 @@ if (isset($_GET["navBar"])) { */ } +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) { // Search in Fulltext {{{ if (isset($_GET["query"]) && is_string($_GET["query"])) { @@ -435,6 +437,8 @@ if($settings->_showSingleSearchHit && count($entries) == 1) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir)); if($view) { + $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('showtree', showtree()); $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); $view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount); diff --git a/out/out.Timeline.php b/out/out.Timeline.php index e124ab13b..0bbbca5eb 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -26,6 +26,7 @@ require_once("inc/inc.Init.php"); require_once("inc/inc.Extension.php"); require_once("inc/inc.DBInit.php"); require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); @@ -40,6 +41,8 @@ if(isset($_GET['skip'])) else $skip = array(); +$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings); + $document = null; $content = null; if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['documentid'])) { @@ -53,6 +56,8 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume if($view) { $view->setParam('dms', $dms); $view->setParam('user', $user); + $view->setParam('accessobject', $accessop); + $view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax $view->setParam('showtree', showtree()); $view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : ''); $view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : ''); From badf336542fa8c9b0f3d08dd882b6f3481e6dd1c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 22 Oct 2019 06:45:23 +0200 Subject: [PATCH 079/198] translation updates, major rework of italian --- languages/ar_EG/lang.inc | 3 + languages/bg_BG/lang.inc | 7 +- languages/ca_ES/lang.inc | 3 + languages/cs_CZ/lang.inc | 11 +- languages/de_DE/lang.inc | 9 +- languages/el_GR/lang.inc | 3 + languages/en_GB/lang.inc | 13 +- languages/es_ES/lang.inc | 15 +- languages/fr_FR/lang.inc | 11 +- languages/hr_HR/lang.inc | 7 +- languages/hu_HU/lang.inc | 7 +- languages/it_IT/lang.inc | 813 ++++++++++++++++++++------------------- languages/ko_KR/lang.inc | 3 + languages/lo_LA/lang.inc | 3 + languages/nl_NL/lang.inc | 7 +- languages/pl_PL/lang.inc | 7 +- languages/pt_BR/lang.inc | 11 +- languages/ro_RO/lang.inc | 7 +- languages/ru_RU/lang.inc | 9 +- languages/sk_SK/lang.inc | 9 +- languages/sv_SE/lang.inc | 7 +- languages/tr_TR/lang.inc | 7 +- languages/uk_UA/lang.inc | 7 +- languages/zh_CN/lang.inc | 7 +- languages/zh_TW/lang.inc | 7 +- 25 files changed, 545 insertions(+), 448 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 7087609a4..f0919a9e9 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -822,6 +822,7 @@ URL: [url]', 'no_action' => 'لايوجد اجراء مطلوب', 'no_approval_needed' => 'لايوجد موافقات منتظره', 'no_attached_files' => 'لا يوجد مرفقات', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'لايوجد كلمات بحثية متاحة', 'no_docs_checked_out' => '', @@ -1276,6 +1277,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index a4e24c16e..7cfe1f6ca 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (861) +// Translators: Admin (862) $text = array( '2_factor_auth' => '', @@ -727,6 +727,7 @@ $text = array( 'no_action' => 'Действие не е нужно', 'no_approval_needed' => 'Утвърждение не е нужно', 'no_attached_files' => 'Няма прикрачени файлове', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'Няма ключови думи', 'no_docs_checked_out' => '', @@ -823,7 +824,7 @@ $text = array( 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Последно Качени', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1139,6 +1140,8 @@ $text = array( 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index c7d318204..0c8622a4b 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -732,6 +732,7 @@ URL: [url]', 'no_action' => 'No és necessària cap acció', 'no_approval_needed' => 'No hi ha aprovacions pendents.', 'no_attached_files' => 'No hi ha fitxers adjunts', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'No hi ha mots clau disponibles', 'no_docs_checked_out' => '', @@ -1144,6 +1145,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index f04091398..87cb4ae30 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1525), kreml (579) +// Translators: Admin (1527), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'Nic se nevykoná', 'no_approval_needed' => 'Nic nečeká na schválení.', 'no_attached_files' => 'Žádné přiložené soubory', +'no_backup_dir' => '', 'no_current_version' => 'Používáte starou verzi SeedDMS. Nejnovější dostupná verze je [latestversion].', 'no_default_keywords' => 'Nejsou dostupná žádná klíčová slova.', 'no_docs_checked_out' => 'Nebyly odbaveny žádné dokumenty', @@ -977,7 +978,7 @@ URL: [url]', 'receipt_status' => 'Status', 'receipt_summary' => 'Souhrn přijetí', 'receipt_update_failed' => 'Potvrzení že přijetí se nezdařilo', -'recent_uploads' => '', +'recent_uploads' => 'Naposledy nahráno', 'reception' => 'Přijetí', 'reception_acknowleged' => 'Přijetí potvrzeno', 'reception_noaction' => 'Žádná akce', @@ -1355,8 +1356,10 @@ Jméno: [username] 'settings_enableReceiptWorkflow_desc' => 'Povolte, pro spuštění workflow při potvrzení příjmu dokumentu.', 'settings_enableRecursiveCount' => 'Povolit rekurzivní počítání dokumentů / složek', 'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.', -'settings_enableRevisionOnVoteReject' => 'Odmítnutí jedním revizorem', -'settings_enableRevisionOnVoteReject_desc' => 'Pokud je nastaveno, tak dokument bude odmítnut, pokud jen jeden revizor odmítne dokument.', +'settings_enableRevisionOneVoteReject' => 'Odmítnutí jedním revizorem', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Povolit revizi dokumentů', 'settings_enableRevisionWorkflow_desc' => 'Povolit, aby bylo možné spustit workflow pro revidování dokumentu po uplynutí dané doby.', 'settings_enableSelfReceipt' => 'Povolit příjem dokumentů pro přihlášeného uživatele', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 395deb3e1..21dcce1ca 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2695), dgrutsch (22) +// Translators: Admin (2697), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -858,6 +858,7 @@ URL: [url]', 'no_action' => 'Keine Aktion erforderlich.', 'no_approval_needed' => 'Keine offenen Freigaben.', 'no_attached_files' => 'Keine angehängten Dokumente', +'no_backup_dir' => 'Das Backup-Verzeichnis ist nicht gesetzt', 'no_current_version' => 'Sie verwenden eine ältere Version als die zur Zeit verfügbare Version [latestversion].', 'no_default_keywords' => 'Keine Vorlagen vorhanden', 'no_docs_checked_out' => 'Keine Dokumente ausgecheckt', @@ -1365,8 +1366,10 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten', 'settings_enableRecursiveCount' => 'Rekursive Dokumenten-/Ordner-Zählung', 'settings_enableRecursiveCount_desc' => 'Wenn diese Option eingeschaltet ist, wird die Anzahl der Dokumente und Ordner in der Ordner-Ansicht rekursiv, unter Berücksichtigung der Zugriffsrechte ermittelt.', -'settings_enableRevisionOnVoteReject' => 'Ablehnung durch einen Wiederholungsprüfer', -'settings_enableRevisionOnVoteReject_desc' => 'Diese Einstellung setzen, wenn die Ablehnung einer Wiederholungsprüfung zur Ablehnung des Dokuments führen soll und nicht den Status \'Korrektur erforderlich\' setzt.', +'settings_enableRevisionOneVoteReject' => 'Ablehnung durch einen Wiederholungsprüfer', +'settings_enableRevisionOneVoteReject_desc' => 'Diese Einstellung setzen, wenn die Ablehnung einer Wiederholungsprüfung durch einen einzelnen Prüfer den Status \'Korrektur erforderlich\' setzt und nicht erst alle Prüfungen abgewartet werden, bevor ein Statuswechsel vollzogen wird.', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Ermögliche Wiederholungsprüfung von Dokumenten', 'settings_enableRevisionWorkflow_desc' => 'Anwählen, um den Workflow der Wiederholungsprüfung von Dokumenten nach einer einstellbaren Zeit zu ermöglichen.', 'settings_enableSelfReceipt' => 'Erlaube Empfangsbestätigung durch angemeldeten Benutzer', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 126ec6c4d..c72b6c47e 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -738,6 +738,7 @@ URL: [url]', 'no_action' => '', 'no_approval_needed' => '', 'no_attached_files' => '', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => '', 'no_docs_checked_out' => '', @@ -1150,6 +1151,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 1e513287d..c2c459f38 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1787), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1791), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -421,7 +421,7 @@ New owner: [newuser] Parent folder: [folder_path] User: [username] URL: [url]', -'document_transfered_email_subject' => '[sitename]: [name] - Transfer Dokument', +'document_transfered_email_subject' => '[sitename]: [name] - Transfer Document', 'document_updated_email' => 'Document updated', 'document_updated_email_body' => 'Document updated Document: [name] @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'No action required', 'no_approval_needed' => 'No approval pending.', 'no_attached_files' => 'No attached files', +'no_backup_dir' => 'Backup directory is not set.', 'no_current_version' => 'You are running an old version of SeedDMS. The latest available version is [latestversion].', 'no_default_keywords' => 'No keywords available', 'no_docs_checked_out' => 'No documents checked out', @@ -1360,8 +1361,10 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableRecursiveCount' => 'Enable recursive document/folder count', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', -'settings_enableRevisionOnVoteReject' => 'Reject by one revisor', -'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be rejected if one revisor rejects the document.', +'settings_enableRevisionOneVoteReject' => 'Reject by one revisor', +'settings_enableRevisionOneVoteReject_desc' => 'If enabled, the document status will be set to \'needs correction\' once the first revisor rejects the document. If disabled, the document status will not change until all revisors have finished their revision.', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Enable revision of documents', 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.', 'settings_enableSelfReceipt' => 'Allow reception of documents for logged in user', @@ -1620,7 +1623,7 @@ Name: [username] 'splash_error_rm_download_link' => 'Error when removing download link', 'splash_error_send_download_link' => 'Error while sending download link', 'splash_extension_getlist' => 'Updated list of extensions from repository', -'splash_extension_import' => 'Extensition installed', +'splash_extension_import' => 'Extension installed', 'splash_extension_refresh' => 'Refreshed list of extensions', 'splash_extension_upload' => 'Extension installed', 'splash_folder_edited' => 'Save folder changes', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 7d2368c00..bc2d627d9 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1118), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1124), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -829,6 +829,7 @@ URL: [url]', 'no_action' => 'No es necesaria ninguna acción', 'no_approval_needed' => 'No hay aprobaciones pendientes.', 'no_attached_files' => 'No hay ficheros adjuntos', +'no_backup_dir' => '', 'no_current_version' => 'Está utilizando una versión desactualizada de este producto. La última versión disponible es [latestversion].', 'no_default_keywords' => 'No hay palabras clave disponibles', 'no_docs_checked_out' => '', @@ -939,7 +940,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Subidas recientes', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1249,8 +1250,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Habilite/Deshabilite el área de drop en la pagina \'\'Ver folder\' para subir archivos por Drag&Drop', 'settings_enableDuplicateDocNames' => 'Permite tener nombres de documento duplicados', 'settings_enableDuplicateDocNames_desc' => 'Permite tener un nombre de documento duplicado en una carpeta.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Permitir nombres de subcarpetas duplicados', +'settings_enableDuplicateSubFolderNames_desc' => 'Permite tener nombres duplicados de subcarpetas dentro de una carpeta', 'settings_enableEmail' => 'Habilitar E-mail', 'settings_enableEmail_desc' => 'Habilitar/Deshabilitar notificación automática por correo electrónico', 'settings_enableFilterReceipt' => '', @@ -1291,6 +1292,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Habilitar cuenta de documento/carpeta recursivo', 'settings_enableRecursiveCount_desc' => 'Si cambia a activado, el número de documentos y carpetas en la carpeta será determinado por la cuenta de todos los objetos recursivos procesados de la carpeta y una vez contados el usuarios tendrá permiso para acceder.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', @@ -1519,8 +1522,8 @@ URL: [url]', 'sign_out_user' => 'Desconectar usuario', 'sk_SK' => 'Slovaco', 'sort_by_date' => 'Ordenar por Fecha', -'sort_by_name' => 'Ordenar por Nombre', -'sort_by_sequence' => 'Ordenar por Secuencia', +'sort_by_name' => 'Ordenar por nombre', +'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' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 70f818ab9..9cb33d667 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1091), jeromerobert (50), lonnnew (9), Oudiceval (755) +// Translators: Admin (1093), jeromerobert (50), lonnnew (9), Oudiceval (755) $text = array( '2_factor_auth' => 'Authentification forte', @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'Aucune action n\'est nécessaire', 'no_approval_needed' => 'Aucune approbation en attente', 'no_attached_files' => 'Aucun fichier attaché', +'no_backup_dir' => '', 'no_current_version' => 'Vous utilisez une vieille version de SeedDMS. La dernière version disponible est la [latestversion].', 'no_default_keywords' => 'Aucun mot-clé disponible', 'no_docs_checked_out' => '', @@ -979,7 +980,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' => '', +'recent_uploads' => 'Téléchargements récents', 'reception' => 'Réception', 'reception_acknowleged' => 'Réception confirmée', 'reception_noaction' => 'Aucune action', @@ -1344,8 +1345,10 @@ Nom : [username] 'settings_enableReceiptWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.', 'settings_enableRecursiveCount' => 'Décompte récursif des documents/dossiers', 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.', -'settings_enableRevisionOnVoteReject' => 'Rejet par un réviseur', -'settings_enableRevisionOnVoteReject_desc' => 'Si activé, le document sera rejeté si un réviseur rejette le document.', +'settings_enableRevisionOneVoteReject' => 'Rejet par un réviseur', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Activer la révision des documents', 'settings_enableRevisionWorkflow_desc' => 'Activer afin de pouvoir lancer un flux de travail pour réviser un document après une période donnée.', 'settings_enableSelfReceipt' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 125a66c62..14b61726a 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1222), marbanas (16) +// Translators: Admin (1223), marbanas (16) $text = array( '2_factor_auth' => '', @@ -833,6 +833,7 @@ Internet poveznica: [url]', 'no_action' => 'Nema zahtjevane radnje', 'no_approval_needed' => 'Nema odobrenja na čekanju.', 'no_attached_files' => 'Nema priloženih datoteka', +'no_backup_dir' => '', 'no_current_version' => 'Koristite na staru verziju ProsperaDMS-a. Najnovija dostupna verzija je[latestversion].', 'no_default_keywords' => 'Nema dostupnih ključnih riječi', 'no_docs_checked_out' => 'Niti jedan dokument nije odjavljen', @@ -943,7 +944,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' => '', +'recent_uploads' => 'Poslijedni Prenosi', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1312,6 +1313,8 @@ Internet poveznica: [url]', 'settings_enableReceiptWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.', 'settings_enableRecursiveCount' => 'Omogući rekurzivno brojanje dokumenta/mape', 'settings_enableRecursiveCount_desc' => 'Ako je uključeno, broj dokumenata i mapa u pregledu mape će biti određen brojanjem svih objekata rekurzivnom obradom mapa i brojanjem tih dokumenata i mapa kojima je korisniku omogućen pristup.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Omogućavanje revizije dokumenata', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 2f080ed58..6e68cf456 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (633), ribaz (1036) +// Translators: Admin (634), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -829,6 +829,7 @@ URL: [url]', 'no_action' => 'Nincs teendő', 'no_approval_needed' => 'Nincs folyamatban lévő jóváhagyás.', 'no_attached_files' => 'Nincsenek csatolt állományok', +'no_backup_dir' => '', 'no_current_version' => 'Ön a SeedDMS régebbi változatát futtatja. A legutolsó elérhető verzió [latestversion].', 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak', 'no_docs_checked_out' => '', @@ -939,7 +940,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' => '', +'recent_uploads' => 'Legutóbbi feltöltések', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1290,6 +1291,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Engedélyezi a rekurzív dokumentum/mappa számot', 'settings_enableRecursiveCount_desc' => 'Ha be van kapcsolva a mappa nézetben a dokumentumok és mappák száma minden objektum rekurzív feldolgozásával kerül meghatározásra és a dokumentumok és mappák száma a felhasználó számára engedélyezett.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 164cc2663..f4674863b 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,11 +19,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1628), rickr (144), s.pnt (26) +// Translators: Admin (2014), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', -'2_factor_auth_info' => 'Questo sistema usa autenticazione a due fattori. Sarà necessario il “Google Authenticator” sul tuo telephono cellulare. Qui potete vedere due codici QR. Quello di destra è il tuo segreto. è sulla sinistra chè un nuovo segreto. Se si imposta un nuovo segreto per assicurarsi si deve scansione con “Google Authenticator” di nouvo.', +'2_factor_auth_info' => 'Questo sistema usa autenticazione a due fattori. Sarà necessario il “Google Authenticator” sul tuo telephono cellulare. Qui potete vedere due codici QR. Quello di destra è il tuo segreto. è sulla sinistra chè un nuovo segreto. Se si imposta un nuovo segreto per assicurarsi si deve scansione con “Google Authenticator” di nuovo.', '2_fact_auth_secret' => 'Segreto', 'accept' => 'Accetta', 'access_control' => 'Il controllo degli accessi', @@ -50,53 +50,53 @@ URL: [url]', 'action_is_complete' => 'Completata', 'action_is_not_complete' => 'Non completata', 'action_reject' => 'Rifiuta', -'action_review' => 'Rivedi', -'action_revise' => 'Revisiona', +'action_review' => 'Revisiona', +'action_revise' => 'Riesamina', 'add' => 'Aggiungi', 'add_approval' => 'Invio approvazione', 'add_attrdefgroup' => 'Aggiungi nuovo gruppo attributo', 'add_document' => 'Aggiungi documento', 'add_document_link' => 'Aggiungi collegamento', 'add_document_notify' => 'Notifica a', -'add_doc_reviewer_approver_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato assegnato un revisore o un approvatore.', -'add_doc_workflow_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato istituito un flusso di lavoro.', +'add_doc_reviewer_approver_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come pubblicati se non è stato assegnato un revisore o un approvatore.', +'add_doc_workflow_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come pubblicati se non è stato istituito un flusso di lavoro.', 'add_event' => 'Aggiungi un evento', 'add_group' => 'Aggiungi un nuovo gruppo', 'add_member' => 'Aggiungi un membro', 'add_multiple_documents' => 'Aggiungi documenti multipli', 'add_multiple_files' => 'Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)', -'add_receipt' => 'invio ricevuta', -'add_review' => 'Invio revisione', -'add_revision' => 'Aggiungi approvazione', +'add_receipt' => 'Conferma ricezione', +'add_review' => 'Aggiungi revisione', +'add_revision' => 'Aggiungi riesame', 'add_role' => 'Aggiungi nuova responsabilità', 'add_subfolder' => 'Aggiungi sottocartella', -'add_task' => '', +'add_task' => 'Aggiungi attività', 'add_to_clipboard' => 'Aggiungi agli appunti', 'add_to_transmittal' => 'Aggiungi alla trasmissione', 'add_transmittal' => 'Aggiungi trasmissione', 'add_user' => 'Aggiungi un nuovo utente', 'add_user_to_group' => 'Aggiungi un utente al gruppo', -'add_workflow' => 'Crea un flusso di lavoro', -'add_workflow_action' => 'Nuova azione del flusso di lavoro', -'add_workflow_state' => 'Nuovo stato del flusso di lavoro', +'add_workflow' => 'Aggiungi nuovo flusso di lavoro', +'add_workflow_action' => 'Aggiungi nuova azione flusso di lavoro', +'add_workflow_state' => 'Aggiungi nuovo stato flusso di lavoro', 'admin' => 'Amministratore', -'admin_tools' => 'Strumenti di Amministrazione', +'admin_tools' => 'Strumenti di amministrazione', 'all' => 'Tutto', -'all_categories' => 'Tutte le Categorie', -'all_documents' => 'Tutti i Documenti', -'all_pages' => 'Tutte le Pagine', -'all_users' => 'Tutti gli Utenti', +'all_categories' => 'Tutte le categorie', +'all_documents' => 'Tutti i documenti', +'all_pages' => 'Tutte le pagine', +'all_users' => 'Tutti gli utenti', 'already_subscribed' => 'L\'oggetto è già stato sottoscritto', 'and' => 'e', 'apply' => 'Applica', -'approvals_accepted' => '', -'approvals_and_reviews_accepted' => '', -'approvals_and_reviews_not_touched' => '', -'approvals_and_reviews_rejected' => '', -'approvals_not_touched' => '', -'approvals_rejected' => '', -'approvals_without_group' => '', -'approvals_without_user' => '', +'approvals_accepted' => '[no_approvals] approvazioni già accettate', +'approvals_and_reviews_accepted' => '[no_approvals] approvazioni e [no_reviews] revisioni già accettate', +'approvals_and_reviews_not_touched' => '[no_approvals] approvazioni e [no_reviews] revisioni non gestite', +'approvals_and_reviews_rejected' => '[no_approvals] approvazioni e [no_reviews] revisioni già rifiutate', +'approvals_not_touched' => '[no_approvals] approvazioni non gestite', +'approvals_rejected' => '[no_approvals] approvazioni già rifiutate', +'approvals_without_group' => 'Approvazioni senza gruppo', +'approvals_without_user' => 'Approvazioni senza utente', 'approval_deletion_email' => 'Richiesta di approvazione cancellata', 'approval_deletion_email_body' => 'Richiesta di approvazione cancellata. Documento: [name] @@ -133,15 +133,15 @@ URL: [url]', 'approver_already_assigned' => 'Utente già approvatore', 'approver_already_removed' => 'Utente già rimosso dal processo di approvazione o ha già approvato', 'april' => 'Aprile', -'archive' => '', -'archive_creation' => 'Creazione archivi', +'archive' => 'Archivio', +'archive_creation' => 'Creazione archivio', 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.', 'ar_EG' => 'Arabo', -'assign_approvers' => 'Assegna Approvatori', -'assign_recipients' => '', -'assign_reviewers' => 'Assegna Revisori', +'assign_approvers' => 'Assegna approvatori', +'assign_recipients' => 'Assegna destinatari', +'assign_reviewers' => 'Assegna revisori', 'assign_user_property_to' => 'Assegna le proprietà dell\'utente a', -'assumed_released' => 'Rilascio acquisito', +'assumed_released' => 'Pubblicazione acquisita', 'attrdefgroup_management' => 'Gestire gruppi di attributi', 'attrdefgrp_show_detail' => 'Dettagli', 'attrdefgrp_show_list' => 'Lista', @@ -149,16 +149,16 @@ URL: [url]', 'attrdefgrp_show_searchlist' => 'risultati trovati', 'attrdef_exists' => 'Definizione di Attributo già esistente', 'attrdef_info' => 'Informazione', -'attrdef_in_use' => 'Definizione di Attributo ancora in uso', -'attrdef_management' => 'Gestione Attributi', -'attrdef_maxvalues' => 'Numero di valori Max.', -'attrdef_minvalues' => 'Numero di valori Min.', +'attrdef_in_use' => 'Definizione di attributo ancora in uso', +'attrdef_management' => 'Gestione attributi', +'attrdef_maxvalues' => 'Numero di valori max.', +'attrdef_minvalues' => 'Numero di valori min.', 'attrdef_min_greater_max' => 'Il numero minimo di valori è maggiore del massimo', 'attrdef_multiple' => 'Permetti valori multipli', 'attrdef_multiple_needs_valueset' => 'Attributo definizione con i molteplici valori esigenze un valore impostato.', -'attrdef_must_be_multiple' => 'Gli Attributi devono avere più di un valore, ma non sono permessi valori multipli', +'attrdef_must_be_multiple' => 'Gli attributi devono avere più di un valore, ma non sono permessi valori multipli', 'attrdef_name' => 'Nome', -'attrdef_noname' => 'Nella definizione dell\'Attributo manca il nome', +'attrdef_noname' => 'Nella definizione dell\'attributo manca il nome', 'attrdef_objtype' => 'Tipo di oggetto', 'attrdef_regex' => 'Espressione regolare', 'attrdef_type' => 'Tipo', @@ -171,35 +171,34 @@ URL: [url]', 'attrdef_type_url' => 'URL', 'attrdef_valueset' => 'Set di valori', 'attributes' => 'Attributi', -'attribute_changed_email_body' => 'Attributo modificato -Documento: [name] -Versione: [version] -Attributo: [attribute_name] -Old value: [attribute_old_value] -New value: [attribute_new_value] -Cartella: [folder_path] -Utente: [username] +'attribute_changed_email_body' => 'Attributo modificato +Documento: [name] +Versione: [version] +Attributo: [attribute_name] +Old value: [attribute_old_value] +New value: [attribute_new_value] +Cartella: [folder_path] +Utente: [username] URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato', 'attribute_count' => 'Numero di utilizzi', -'attribute_value' => 'Valore dell\'Attributo', -'attribute_value_not_in_valueset' => '', -'attr_malformed_boolean' => '', -'attr_malformed_date' => '', -'attr_malformed_email' => 'Il valore di \'[value]\' dell, - => attributo \'[attrname]\' non é un URL valido.', -'attr_malformed_float' => '', -'attr_malformed_int' => '', -'attr_malformed_url' => 'Il valore dell\'attributo \'[valore]\' di attributo \'[attrname]\' non è un URL valido.', +'attribute_value' => 'Valore dell\'attributo', +'attribute_value_not_in_valueset' => 'Valore non presente nel gruppo di valori', +'attr_malformed_boolean' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un valore booleano valido.', +'attr_malformed_date' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è una data valida.', +'attr_malformed_email' => 'Il valore \'[value]\' dell\'attributo \'[attrname]\' non é un URL valido.', +'attr_malformed_float' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un numero in virgola mobile valido.', +'attr_malformed_int' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un intero valido.', +'attr_malformed_url' => 'Il valore \'[valore]\' dell\'attributo \'[attrname]\' non è un URL valido.', 'attr_max_values' => 'Il numero massimo dei valori richiesti per l\'Attributo [attrname] è superato.', 'attr_min_values' => 'Il numero minimo di valori richiesti per l\'Attributo [attrname] non è raggiunto.', -'attr_not_in_valueset' => '', -'attr_no_regex_match' => 'Il valore dell\'Attributo non è conforme ad un\'espressione regolare.', -'attr_validation_error' => '', +'attr_not_in_valueset' => 'Il valore \'[value]\' per l\'attributo \'[attrname]\' non è contenuto nel gruppo di valori.', +'attr_no_regex_match' => 'Il valore \'[value]\' dell\'attributo \'[attrname]\' non è conforme ad un\'espressione regolare.', +'attr_validation_error' => 'Il valore \'[value]\' dell\'attributo \'[attrname]\' non è valido', 'at_least_n_users_of_group' => 'Minimo [number_of_users] utenti del gruppo [group]', 'august' => 'Agosto', 'authentication' => 'Autenticazione', -'authentication_failed' => '', +'authentication_failed' => 'Autenticazione fallita', 'author' => 'Autore', 'automatic_status_update' => 'Modifica automatica dello stato', 'back' => 'Ritorna', @@ -211,7 +210,7 @@ URL: [url]', 'bg_BG' => 'Bulgaro', 'browse' => 'Scegli file', 'calendar' => 'Calendario', -'calendar_week' => 'Calendario Settimanale', +'calendar_week' => 'Calendario settimanale', 'cancel' => 'Annulla', 'cannot_assign_invalid_state' => 'Non è possibile modificare le assegnazioni di un documento obsoleto o rifiutato', 'cannot_change_final_states' => 'Attenzione: non si può modificare lo stato dei documenti rifiutati, scaduti o in attesa di revisione o approvazione', @@ -230,12 +229,12 @@ URL: [url]', 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.', 'category_noname' => 'Non è stato attribuito un nome alla categoria.', 'ca_ES' => 'Catalano', -'change_assignments' => 'Modifica le Assegnazioni', +'change_assignments' => 'Modifica le assegnazioni', 'change_password' => 'Cambia la password', 'change_password_message' => 'La password è stata cambiata', 'change_recipients' => 'Cambia lista cartelle', 'change_revisors' => 'Cambia reimmissione', -'change_status' => 'Modifica lo Stato', +'change_status' => 'Modifica lo stato', 'charts' => 'Grafici', 'chart_docsaccumulated_title' => 'Numero di documenti', 'chart_docspercategory_title' => 'Documenti per categoria', @@ -249,7 +248,7 @@ URL: [url]', 'checkedout_file_has_disappeared' => 'File documento approvato non trovato. Impossibile caricare.', 'checkedout_file_is_unchanged' => 'La versione approvata è uguale alla versione corrente. Impossibile caricare.', 'checkin_document' => 'Da approvare', -'checkoutpath_does_not_exist' => '', +'checkoutpath_does_not_exist' => 'Il percorso di approvazione non esiste', 'checkout_document' => 'Approvato', 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata', 'choose_attrdef' => 'Seleziona l\'Attributo', @@ -275,13 +274,13 @@ URL: [url]', 'comment' => 'Commento', 'comment_changed_email' => '', 'comment_for_current_version' => 'Commento per la versione', -'configure_extension' => '', +'configure_extension' => 'Configura estensione', 'confirm_clear_cache' => 'Vuoi davvero cancellare la cache? Questo eliminerà tutte le immagini di anteprima precalcolate.', 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!', 'confirm_move_document' => 'Conferma lo spostamento del documento.', 'confirm_move_folder' => 'Si prega di confermare lo spostamento della cartella.', 'confirm_pwd' => 'Conferma la password', -'confirm_rm_attr_value' => '', +'confirm_rm_attr_value' => 'Vuoi davvero rimuovere il valore dell\'attributo?', 'confirm_rm_backup' => 'Vuoi davvero rimuovere il file "[arkname]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_document' => 'Vuoi veramente eliminare il documento "[documentname]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_dump' => 'Vuoi davvero rimuovere il file "[dumpname]"? Attenzione: questa operazione non può essere annullata.', @@ -294,17 +293,17 @@ URL: [url]', 'confirm_rm_transmittal' => 'Si prega di confermare l\'eliminazione della trasmissione.', 'confirm_rm_transmittalitem' => 'Conferma rimozione', 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.', -'confirm_rm_user_from_processes' => 'Processo', +'confirm_rm_user_from_processes' => 'Vuoi veramente eliminare rimuovere l\'utente "[username]" da tutti i processi?
Attenzione: questa azione può portare alla pubblicazione di documenti se l\'utente era l\'unico o l\'ultimo responsabile dell\'approvazione.', '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_transfer_link_document' => 'Seleziona se vuoi collegare il documento trascinato o trasferire il suo contenuto al documento di destinazione come nuova versione. Solo i documenti con una versione possono essere trasferiti. Il documento trascinato verrà rimosso in seguito.', +'confirm_transfer_objects' => 'Vuoi veramente trasferire i documenti, le cartelle, ecc. dell\'utente "[username]"?
Attenzione: questa operazione non può essere annullata', 'confirm_update_transmittalitem' => 'Conferma aggiornamento', 'content' => 'Contenuto', 'continue' => 'Continua', 'converter_new_cmd' => 'Comando', 'converter_new_mimetype' => 'Nuovo mimetype', 'copied_to_checkout_as' => 'File copiato come \'[filename]\'', -'create_download_link' => '', +'create_download_link' => 'Crea collegamento di scaricamento', 'create_fulltext_index' => 'Crea indice fulltext', 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.', 'creation_date' => 'Data creazione', @@ -328,8 +327,8 @@ URL: [url]', 'de_DE' => 'Tedesco', 'disclaimer' => 'Questa è un\'area riservata. L\'accesso è consentito solo agli utenti autorizzati. Qualunque violazione sarà perseguita a norma delle leggi italiane ed internazionali.', 'discspace' => 'Spazio su disco', -'docs_in_reception_no_access' => '', -'docs_in_revision_no_access' => '', +'docs_in_reception_no_access' => 'Documenti con ricezione senza accesso dai destinatari', +'docs_in_revision_no_access' => 'Documenti in riesame senza accesso dai revisori', 'document' => 'Documento', 'documentcontent' => 'Contenuto documento', 'documents' => 'Documenti', @@ -340,25 +339,25 @@ URL: [url]', 'documents_locked_by_you' => 'Documenti bloccati da te', 'documents_only' => 'Solo documenti', 'documents_to_approve' => 'Documenti in attesa della tua approvazione', -'documents_to_correct' => '', +'documents_to_correct' => 'Documenti in attesa della tua correzione', 'documents_to_process' => 'I documenti che necessitano di trattamento', 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione', 'documents_to_review' => 'Documenti in attesa della tua revisione', -'documents_to_revise' => 'Documenti da revisionare.', -'documents_to_trigger_workflow' => '', -'documents_user_draft' => '', -'documents_user_expiration' => '', -'documents_user_needs_correction' => '', -'documents_user_no_reception' => '', -'documents_user_obsolete' => '', -'documents_user_reception' => '', +'documents_to_revise' => 'Documenti da riesaminare.', +'documents_to_trigger_workflow' => 'Documenti nel flusso di lavoro', +'documents_user_draft' => 'Bozze', +'documents_user_expiration' => 'Scadenza documenti', +'documents_user_needs_correction' => 'Documenti che devono essere corretti', +'documents_user_no_reception' => 'Documenti senza ricezioni', +'documents_user_obsolete' => 'Documenti obsoleti', +'documents_user_reception' => 'Documenti in attesa di ricezione', 'documents_user_rejected' => 'Documenti rifiutati', 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione', -'documents_with_notification' => '', +'documents_with_notification' => 'Documenti con notifica', 'document_already_checkedout' => 'Questo documento è già approvato', 'document_already_locked' => 'Questo documento è già bloccato', -'document_attribute_changed_email_body' => '', -'document_attribute_changed_email_subject' => '', +'document_attribute_changed_email_body' => 'Attributo modificato', +'document_attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato', 'document_comment_changed_email' => 'Commento modificato', 'document_comment_changed_email_body' => 'Commento modificato Documento: [name] @@ -409,8 +408,13 @@ Utente: [username] URL: [url]', 'document_status_changed_email_subject' => '[sitename]: [name] - Modificato lo stato di un documento', 'document_title' => 'Documento \'[documentname]\'', -'document_transfered_email_body' => '', -'document_transfered_email_subject' => '', +'document_transfered_email_body' => 'Documento trasferito ad altro utente +Documento: [name] +Nuovo proprietario: [newuser] +Cartella: [folder_path] +Utente: [username] +URL: [url]', +'document_transfered_email_subject' => '[sitename]: [name] - Documento trasferito', 'document_updated_email' => 'Documento aggiornato', 'document_updated_email_body' => 'Documento aggiornato Documento: [name] @@ -423,10 +427,17 @@ URL: [url]', 'does_not_expire' => 'Nessuna scadenza', 'does_not_inherit_access_msg' => 'Imposta permessi ereditari', 'download' => 'Scarica', -'download_extension' => '', -'download_links' => '', -'download_link_email_body' => '', -'download_link_email_subject' => '', +'download_extension' => 'Scarica estensione come file zip', +'download_links' => 'Collegamenti di scaricamento', +'download_link_email_body' => 'Fare clic sul collegamento sottostante per scaricare la versione [version] del documento +\'[docname]\'. + +[url] + +Il collegamento The link è ancora valido fino a [valid]. + +[comment]', +'download_link_email_subject' => 'Collegamento di scaricamento', 'do_object_repair' => 'Ripara tutte le cartelle e i documenti.', 'do_object_setchecksum' => 'Imposta il checksum', 'do_object_setfilesize' => 'Imposta la dimensione del file', @@ -438,14 +449,14 @@ URL: [url]', 'dropfolderdir_missing' => 'La vostra cartella di personale non esiste sul server! Si prega di chiedere all\'amministratore di creare per te.', 'dropfolder_file' => 'Scegli file dal server', 'dropfolder_folder' => 'Cartella per il cartella di ricezione', -'dropupload' => 'Caricamento Rapido', +'dropupload' => 'Caricamento rapido', 'drop_files_here' => 'Trascina qui il file', -'dump_creation' => 'Creazione del DB dump', +'dump_creation' => 'Creazione del dump del DB', 'dump_creation_warning' => 'Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.', 'dump_list' => 'List dei dump presenti', 'dump_remove' => 'Cancella il file di dump', 'duplicates' => 'Duplicati', -'duplicate_content' => 'Contenuto Duplicato', +'duplicate_content' => 'Contenuto duplicato', 'edit' => 'Modifica', 'edit_attributes' => 'Modifica gli attributi', 'edit_comment' => 'Modifica il commento', @@ -463,7 +474,7 @@ URL: [url]', 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', 'edit_online' => 'Modifica online', -'edit_task' => '', +'edit_task' => 'Modifica attività', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', 'edit_user_details' => 'Modifica i dettagli utente', @@ -476,7 +487,7 @@ URL: [url]', 'email_not_given' => 'Inserisci un indirizzo email valido.', 'empty_attribute_group_list' => 'Nessun gruppo di attributi', 'empty_folder_list' => 'Cartella vuota', -'empty_list' => '', +'empty_list' => 'Nessuna voce', 'empty_notify_list' => 'Nessun record', 'en_GB' => 'Inglese (GB)', 'equal_transition_states' => 'Lo stato iniziale e quello finale sono identici', @@ -484,40 +495,40 @@ URL: [url]', 'error_add_aro' => 'Errore durante l\'accesso aggiungendo richiesta oggetto', 'error_add_permission' => 'Errore durante l\'aggiunta di permesso', 'error_cleared_cache' => 'Errore durante svuotare la cache', -'error_edit_task' => '', -'error_extension_getlist' => '', +'error_edit_task' => 'Modifica attività', +'error_extension_getlist' => 'Errore nel recuperare l\'elenco delle estensioni dal repository', 'error_importfs' => 'Errore durante l\'importazione dal file system', 'error_no_document_selected' => 'Nessun documento selezionato', 'error_no_folder_selected' => 'Nessuna cartella selezionata', 'error_occured' => 'Ooops... Si è verificato un errore', -'error_remove_document' => '', -'error_remove_folder' => '', +'error_remove_document' => 'Errore durante la rimozione del documento', +'error_remove_folder' => 'Errore durante la rimozione della cartella', 'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni', -'error_rm_workflow' => '', -'error_rm_workflow_action' => '', -'error_rm_workflow_state' => '', +'error_rm_workflow' => 'Errore durante la rimozione del flusso di lavoro', +'error_rm_workflow_action' => 'Errore durante la rimozione dell\'azione del flusso di lavoro', +'error_rm_workflow_state' => 'Errore durante la rimozione dello stato del flusso di lavoro', 'error_toogle_permission' => 'Errore durante la modifica permessi', -'error_transfer_document' => '', -'error_trigger_workflow' => '', -'error_update_document' => '', -'error_uploading_reviewer_only' => '', +'error_transfer_document' => 'Errore durante il trasferimento del documento', +'error_trigger_workflow' => 'Errore durante l\'esecuzione di una transizione del flusso di lavoro', +'error_update_document' => 'Errore durante l\'aggiornamento del documento', +'error_uploading_reviewer_only' => 'Errore durante la creazione del documento. Il documento ha un revisore, ma non un approvatore.', 'es_ES' => 'Spagnolo', 'event_details' => 'Dettagli evento', -'exclude_items' => 'Escludi Elementi', +'exclude_items' => 'Escludi elementi', 'expired' => 'Scaduto', -'expired_at_date' => '', +'expired_at_date' => 'Scadenza il [datetime]', 'expired_documents' => 'Documenti scaduti', 'expires' => 'Scadenza', -'expire_by_date' => 'Scadenza per Data', -'expire_in_1d' => '', -'expire_in_1h' => '', -'expire_in_1m' => '1 Mese', -'expire_in_1w' => '7 Giorni', -'expire_in_1y' => '1 Anno', -'expire_in_2h' => '', -'expire_in_2y' => '2 Anni', -'expire_today' => '', -'expire_tomorrow' => '', +'expire_by_date' => 'Scadenza per data', +'expire_in_1d' => 'Scade in 1 giorno', +'expire_in_1h' => 'Scade in 1 ora', +'expire_in_1m' => 'Scade in 1 mese', +'expire_in_1w' => 'Scade in 7 giorni', +'expire_in_1y' => 'Scade in 1 anno', +'expire_in_2h' => 'Scade in 2 ore', +'expire_in_2y' => 'Scade in 2 anni', +'expire_today' => 'Scade oggi', +'expire_tomorrow' => 'Scade domani', 'expiry_changed_email' => 'Scadenza cambiata', 'expiry_changed_email_body' => 'Data di scadenza cambiata Documento: [name] @@ -526,8 +537,8 @@ Utente: [username] URL: [url]', 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata', 'export' => 'Esporta', -'extension_archive' => '', -'extension_changelog' => '', +'extension_archive' => 'Archivio estensioni', +'extension_changelog' => 'Registro delle modifiche delle estensioni', 'extension_loading' => 'Caricamento estensioni...', 'extension_manager' => 'Gestisci le estensioni dei files', 'extension_mgr_installed' => 'Installato', @@ -546,9 +557,9 @@ URL: [url]', 'folder' => 'Cartella', 'folders' => 'Cartelle', 'folders_and_documents_statistic' => 'Visualizzazione generale', -'folders_with_notification' => '', -'folder_attribute_changed_email_body' => '', -'folder_attribute_changed_email_subject' => '', +'folders_with_notification' => 'Cartelle con notifica', +'folder_attribute_changed_email_body' => 'Attributo cartella modificato', +'folder_attribute_changed_email_subject' => 'Attributo cartella modificato', 'folder_comment_changed_email' => 'Commento modificato per la Cartella', 'folder_comment_changed_email_body' => 'Commento modificato per la Cartella Cartella: [name] @@ -591,7 +602,7 @@ URL: [url]', 'fr_FR' => 'Francese', 'fullsearch' => 'Ricerca Fulltext', 'fullsearch_hint' => 'Usa l\'indice fulltext', -'fulltextsearch_disabled' => '', +'fulltextsearch_disabled' => 'Ricerca Fulltext disabilitata', 'fulltext_converters' => 'Indice di conversione documenti', 'fulltext_info' => 'Info indice Fulltext', 'global_attributedefinitiongroups' => 'Attributo gruppi', @@ -612,7 +623,7 @@ URL: [url]', 'group_review_summary' => 'Dettaglio revisioni di gruppo', 'guest_login' => 'Login come Ospite', 'guest_login_disabled' => 'Il login come Ospite è disabilitato.', -'hash' => '', +'hash' => 'Hash', 'help' => 'Aiuto', 'home_folder' => 'Cartella Utente', 'hook_name' => 'Nome del gangio', @@ -624,28 +635,28 @@ URL: [url]', 'id' => 'ID', 'identical_version' => 'La nuova versione è identica a quella attuale.', 'import' => 'Importa', -'importfs' => 'Importa da File System / disco', -'import_extension' => '', +'importfs' => 'Importa da file system/disco', +'import_extension' => 'Importa estensione', 'import_fs' => 'Importa dalla cartella di sistema', -'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno rilasciati immediatamente.', +'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno pubblicati immediatamente.', 'include_content' => 'Includi contenuto', 'include_documents' => 'Includi documenti', 'include_subdirectories' => 'Includi sottocartelle', 'indexing_tasks_in_queue' => 'Operazione di indicizzazione in corso', 'index_converters' => '', -'index_done' => '', -'index_error' => '', +'index_done' => 'Eseguito', +'index_error' => 'Errore di indicizzazione', 'index_folder' => 'Indicizza cartella', -'index_no_content' => '', -'index_pending' => '', +'index_no_content' => 'Non indicizzare contenuti', +'index_pending' => 'Indicizzazione pendente', 'index_waiting' => 'Attendi', 'individuals' => 'Singoli', 'individuals_in_groups' => 'I membri de la gruppo', -'info_recipients_tab_not_released' => '', +'info_recipients_tab_not_released' => 'Non è possibile confermare la ricezione di questa versione del documento, poiché la versione non è stata rilasciata.', 'inherited' => 'ereditato', 'inherits_access_copy_msg' => 'Copia la lista degli accessi ereditati', 'inherits_access_empty_msg' => 'Reimposta una lista di permessi vuota', -'inherits_access_msg' => 'E\' impostato il permesso ereditario.', +'inherits_access_msg' => 'È impostato il permesso ereditario.', 'internal_error' => 'Errore interno', 'internal_error_exit' => 'Errore interno. Impossibile completare la richiesta.', 'invalid_access_mode' => 'Permessi non validi', @@ -654,7 +665,7 @@ URL: [url]', 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale', 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale', 'invalid_doc_id' => 'ID del documento non valido', -'invalid_dropfolder_folder' => 'cartella non valido nella cartella goccia', +'invalid_dropfolder_folder' => 'cartella non valido nella cartella di pubblicazione', 'invalid_expiration_date_end' => 'Data di fine non è valida per l\'intervallo di data di scadenza.', 'invalid_expiration_date_start' => 'Data di inizio non valida per l\'intervallo di date di scadenza.', 'invalid_file_id' => 'ID del file non valido', @@ -670,25 +681,25 @@ URL: [url]', 'invalid_user_id' => 'ID utente non valido', 'invalid_version' => 'Versione del documento non valida', 'in_folder' => 'nella cartella', -'in_revision' => 'In fase di revisione', -'in_workflow' => 'In fase di lavorazione', -'is_disabled' => 'Account Disabilitato', +'in_revision' => 'In riesame', +'in_workflow' => 'In lavorazione', +'is_disabled' => 'Account disabilitato', 'is_hidden' => 'Nascondi dalla lista utenti', 'it_IT' => 'Italiano', 'january' => 'Gennaio', -'js_form_error' => '', -'js_form_errors' => '', -'js_invalid_email' => '', +'js_form_error' => 'Il modulo contiene ancora # errore.', +'js_form_errors' => 'Il modulo contiene ancora # errori.', +'js_invalid_email' => 'Indirizzo email non valido', 'js_no_approval_group' => 'Si prega di selezionare un gruppo di approvazione', 'js_no_approval_status' => 'Si prega di selezionare lo stato di approvazione', 'js_no_comment' => 'Non ci sono commenti', -'js_no_currentpwd' => '', -'js_no_email' => 'Scrivi il tuo indirizzo di Email', +'js_no_currentpwd' => 'Per favore inserire la propria password attuale', +'js_no_email' => 'Scrivi il tuo indirizzo di email', 'js_no_file' => 'Per favore seleziona un file', 'js_no_keywords' => 'Specifica alcune parole-chiave', 'js_no_login' => 'Per favore digita un ID utente', 'js_no_name' => 'Per favore digita un nome', -'js_no_override_status' => 'E\' necessario selezionare un nuovo [override] stato', +'js_no_override_status' => 'È necessario selezionare un nuovo [override] stato', 'js_no_pwd' => 'La password è necessaria', 'js_no_query' => 'Scrivi una query', 'js_no_review_group' => 'Per favore seleziona un gruppo di revisori', @@ -696,7 +707,7 @@ URL: [url]', 'js_pwd_not_conf' => 'La password inserita e quella di conferma non corrispondono', 'js_select_user' => 'Per favore seleziona un utente', 'js_select_user_or_group' => 'Selezionare almeno un utente o un gruppo', -'js_unequal_passwords' => '', +'js_unequal_passwords' => 'Le password non coincidono', 'july' => 'Luglio', 'june' => 'Giugno', 'keep' => 'Non cambiare', @@ -712,16 +723,16 @@ URL: [url]', 'librarydoc' => 'Documento da cartella', 'linked_documents' => 'Documenti collegati', 'linked_files' => 'Allegati', -'linked_to_current_version' => '', +'linked_to_current_version' => 'Collegato al documento attuale', 'linked_to_document' => 'Collegato al documento', -'linked_to_this_version' => '', +'linked_to_this_version' => 'Collegato a questa versione', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', -'link_document' => '', -'link_to_version' => '', +'link_document' => 'Collegamento al documento', +'link_to_version' => 'Collega alla versione', 'list_access_rights' => 'Elenca tutti i diritti di accesso...', -'list_contains_no_access_docs' => '', -'list_hooks' => 'Lista ganci', -'list_tasks' => '', +'list_contains_no_access_docs' => 'L\'elenco contiene più documenti ai quali non si ha accesso e non vengono visualizzati.', +'list_hooks' => 'Elenco hooks', +'list_tasks' => 'Elenco attività', 'local_file' => 'File locale', 'locked_by' => 'Bloccato da', 'lock_document' => 'Blocca', @@ -729,45 +740,45 @@ URL: [url]', 'lock_status' => 'Stato bloccaggio', 'login' => 'Accesso', 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.', -'login_disabled_title' => 'L\'Account è disabilitato', +'login_disabled_title' => 'L\'account è disabilitato', 'login_error_text' => 'Errore nel login. ID utente o password errati.', 'login_error_title' => 'Errore di login', 'login_not_given' => 'Non è stato inserito il nome utente', 'login_ok' => 'Login eseguito', -'login_restrictions_apply' => '', +'login_restrictions_apply' => 'Login fallito a causa di limitazioni', 'logout' => 'Logout', 'log_management' => 'Amministrazione file di log', 'lo_LA' => 'Laotiano', -'malformed_expiration_date' => '', +'malformed_expiration_date' => 'Data di scadenza con formato errato', 'manager' => 'Manager', -'manager_of_group' => 'Tu sei l\'Amministratore di questo gruppo', -'mandatory_approvergroups' => 'Gruppi di Approvatori necessari', -'mandatory_approvergroup_no_access' => 'Il Gruppo di Approvatori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', +'manager_of_group' => 'Tu sei l\'amministratore di questo gruppo', +'mandatory_approvergroups' => 'Gruppi di approvatori necessari', +'mandatory_approvergroup_no_access' => 'Il gruppo di approvatori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', 'mandatory_approvers' => 'Approvatori necessari', -'mandatory_approver_no_access' => 'L\'Approvatore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', -'mandatory_reviewergroups' => 'Gruppi di Revisori necessari', -'mandatory_reviewergroup_no_access' => 'Il Gruppo di Revisori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', +'mandatory_approver_no_access' => 'L\'approvatore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', +'mandatory_reviewergroups' => 'Gruppi di revisori necessari', +'mandatory_reviewergroup_no_access' => 'Il gruppo di revisori necessari \'[group]\' non ha sufficienti permessi d\'accesso.', 'mandatory_reviewers' => 'Revisori necessari', -'mandatory_reviewer_no_access' => 'Il Revisore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', +'mandatory_reviewer_no_access' => 'Il revisore necessario \'[user]\' non ha sufficienti permessi d\'accesso.', 'march' => 'Marzo', 'max_upload_size' => 'Dimensione massima caricabile per ogni file', 'may' => 'Maggio', -'menu_dropfolder' => '', -'menu_upload_from_dropfolder' => '', +'menu_dropfolder' => 'Cartella di pubblicazione', +'menu_upload_from_dropfolder' => 'Importa questo file', 'mimetype' => 'Tipo (MIME)', 'minutes' => 'minuti', 'misc' => 'Varie', 'missing_checksum' => 'Checksum mancante', 'missing_file' => 'File mancante', 'missing_filesize' => 'Dimensione mancante', -'missing_reception' => '', +'missing_reception' => 'Ricezione mancante', 'missing_request_object' => 'Manca oggetto di richiesta', 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti', 'monday' => 'Lunedì', 'monday_abbr' => 'Lun', 'monthly' => 'Mensile', 'month_view' => 'Vista mensile', -'more_objects_loading' => '', +'more_objects_loading' => 'Più oggetti in caricamento...', 'move' => 'Sposta', 'move_clipboard' => 'Sposta appunti', 'move_document' => 'Sposta documento', @@ -776,7 +787,7 @@ URL: [url]', 'my_documents' => 'Documenti personali', 'my_transmittals' => 'Mie trasmissioni', 'name' => 'Nome', -'needs_correction' => '', +'needs_correction' => 'Necessita correzioni', 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.', 'network_drive' => 'Network drive', 'never' => 'Mai', @@ -835,17 +846,18 @@ URL: [url]', 'no_action' => 'Non è richiesto alcun intervento', 'no_approval_needed' => 'Non è richiesta approvazione.', 'no_attached_files' => 'Nessun file allegato', +'no_backup_dir' => '', 'no_current_version' => 'La corrente versione di SeedDMS non è aggiornata. La versione più recente disponibile è la [latestversion].', 'no_default_keywords' => 'Nessuna parola-chiave disponibile', 'no_docs_checked_out' => 'Nessun documento approvato', 'no_docs_locked' => 'Nessun documento bloccato.', -'no_docs_needs_correction' => '', +'no_docs_needs_correction' => 'Nessun documento che necessita di correzioni', 'no_docs_rejected' => 'Nessun documento rifiutato', 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.', 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.', 'no_docs_to_receipt' => 'Nessuna cartella richiesta.', 'no_docs_to_review' => 'Non ci sono documenti che richiedano revisioni.', -'no_docs_to_revise' => 'Non ci sono documenti che richiedano approvazione.', +'no_docs_to_revise' => 'Non ci sono documenti che richiedano riesame.', 'no_email_or_login' => 'Login ed email devono essere digitate', 'no_fulltextindex' => 'Nessun indice fulltext disponibile', 'no_groups' => 'Nessun gruppo', @@ -853,17 +865,17 @@ URL: [url]', 'no_linked_files' => 'Nessun file collegato', 'no_previous_versions' => 'Nessun\'altra versione trovata', 'no_receipt_needed' => 'Rete disco', -'no_review_needed' => 'Nessuna revisione in sospeso.', -'no_revision_needed' => 'Nessuna revisione in corso.', -'no_revision_planed' => 'Nessuna revisione pianificata.', +'no_review_needed' => 'Nessuna revisione in corso.', +'no_revision_needed' => 'Nessun riesame in corso.', +'no_revision_planed' => 'Nessun riesame pianificato.', 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.', 'no_user_image' => 'Nessuna immagine trovata', 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.', 'no_version_modification' => 'Nessuna modifica versione', 'no_workflow_available' => 'Nessun flusso di lavoro disponibile', 'objectcheck' => 'Controllo cartelle o documenti', -'object_check_critical' => '', -'object_check_warning' => '', +'object_check_critical' => 'Errori critici', +'object_check_warning' => 'Avvertenze', 'obsolete' => 'Obsoleto', 'october' => 'Ottobre', 'old' => 'Vecchio', @@ -896,7 +908,7 @@ Per farlo cliccare sul seguente link: [url_prefix]out/out.ChangePassword.php?hash=[hash] -Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di Sistema.', +Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di sistema.', 'password_forgotten_email_subject' => '[sitename]: Password dimenticata', 'password_forgotten_send_hash' => 'Le istruzioni su come procedere sono state inviate all\'indirizzo e-mail dell\'utente', 'password_forgotten_text' => 'Compilare i campi seguenti e seguire le istruzioni nell\'e-mail che sarà inviata a breve.', @@ -909,10 +921,10 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'password_wrong' => 'Password errata', 'pdf_converters' => 'Convertitore a PDF', 'pending_approvals' => 'Approvazioni in sospeso', -'pending_receipt' => '', -'pending_reviews' => 'In attesa di recensioni', -'pending_revision' => '', -'pending_workflows' => 'I flussi di lavoro in sospeso', +'pending_receipt' => 'In attesa di ricezione', +'pending_reviews' => 'In attesa di revisione', +'pending_revision' => 'In attesa di riesame', +'pending_workflows' => 'Flussi di lavoro in sospeso', 'personal_default_keywords' => 'Parole-chiave personali', 'pl_PL' => 'Polacco', 'possible_substitutes' => 'Sostituti', @@ -920,8 +932,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'preview' => 'Anteprima', 'preview_converters' => 'Anteprima convesione documento', 'preview_images' => 'Immagini di anteprima', -'preview_markdown' => 'Riduione ribasso', -'preview_pdf' => '', +'preview_markdown' => 'Riduzione ribasso', +'preview_pdf' => 'Anteprima come PDF', 'preview_plain' => 'Testo', 'previous_state' => 'Stato precedente', 'previous_versions' => 'Versioni precedenti', @@ -932,13 +944,19 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].', 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.', 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.', -'receipts_accepted' => '', -'receipts_not_touched' => '', -'receipts_rejected' => '', -'receipts_without_group' => '', -'receipts_without_user' => '', -'receipt_deletion_email_body' => '', -'receipt_deletion_email_subject' => '', +'receipts_accepted' => '[no_receipts] ricevute già accettate', +'receipts_not_touched' => '[no_receipts] ricevute non gestite', +'receipts_rejected' => '[no_receipts] ricevute già rifiutate', +'receipts_without_group' => 'Ricevute senza gruppo', +'receipts_without_user' => 'Ricevute senza gruppo', +'receipt_deletion_email_body' => 'Utente rimosso dall\'elenco dei destinatari +Documento: [name] +Versione: [version] +Cartella: [folder_path] +Destinatario: [recipient] +Utente: [username] +URL: [url]', +'receipt_deletion_email_subject' => '[sitename]: [name] - Destinatario rimosso', 'receipt_log' => 'Ricezione Log', 'receipt_request_email_body' => 'Richiesta di ricezione Document: [name] @@ -949,18 +967,18 @@ URL: [url]', 'receipt_request_email_subject' => '[sitename]: [name] - Richiesta di ricezione', 'receipt_status' => 'Status', 'receipt_summary' => 'Sommario ricezione', -'receipt_update_failed' => '', -'recent_uploads' => '', -'reception' => '', -'reception_acknowleged' => '', -'reception_noaction' => '', -'reception_rejected' => '', +'receipt_update_failed' => 'Conferma della ricezione non riuscita', +'recent_uploads' => 'Caricamenti recenti', +'reception' => 'Ricezione', +'reception_acknowleged' => 'Ricezione confermata', +'reception_noaction' => 'Nessuna azione', +'reception_rejected' => 'Ricezione respinta', 'recipients' => 'Cartelle', -'recipient_already_removed' => '', -'redraw' => '', +'recipient_already_removed' => 'Il destinatario è già stato rimosso o riconosciuto come destinatario.', +'redraw' => 'Ridisegna', 'refresh' => 'Ricarica', 'rejected' => 'Rifiutato', -'released' => 'Rilasciato', +'released' => 'Pubblicato', 'removed_approver' => 'Rimosso dalla lista degli approvatori.', 'removed_file_email' => 'Allegato rimosso', 'removed_file_email_body' => 'Rimosso allegato @@ -979,7 +997,7 @@ Cartella: [folder_path] Utente: [username] URL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - Flusso di lavoro rimosso dalla versione del documento', -'removeFolderFromDropFolder' => 'Rimuovi la cartella dopo l\'importazione', +'removeFolderFromDropFolder' => 'Rimuovi la cartella di pubblicazione dopo l\'importazione', 'remove_marked_files' => 'Rimuovi i files contrassegnati', 'repaired' => 'riparato', 'repairing_objects' => 'Riparazione documenti e cartelle in corso...', @@ -1009,11 +1027,11 @@ URL: [url]', 'reviewers' => 'Revisori', 'reviewer_already_assigned' => 'è già assegnato come revisore', 'reviewer_already_removed' => 'è già stato rimosso dal processo di revisione oppure ha già inserito una revisione.', -'reviews_accepted' => '', -'reviews_not_touched' => '', -'reviews_rejected' => '', -'reviews_without_group' => '', -'reviews_without_user' => '', +'reviews_accepted' => '[no_reviews] revisioni già accettate', +'reviews_not_touched' => '[no_reviews] revisioni non gestite', +'reviews_rejected' => '[no_reviews] revisioni già rifiutate', +'reviews_without_group' => 'Revisioni senza gruppo', +'reviews_without_user' => 'Revisioni senza utente', 'review_deletion_email' => 'Richiesta di revisione cancellata', 'review_deletion_email_body' => 'Richiesta di revisione cancellata. Documento: [name] @@ -1046,46 +1064,46 @@ URL: [url]', 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione', 'review_summary' => 'Dettaglio revisioni', 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.', -'revise_document' => 'Rivedi documento', -'revise_document_on' => 'Prossima revisione del documento il [date]', -'revisions_accepted' => '', -'revisions_not_touched' => '', -'revisions_pending' => '', -'revisions_rejected' => '', -'revisions_without_group' => '', -'revisions_without_user' => '', -'revision_date' => 'data revisione', -'revision_log' => 'Log revisione', -'revision_request_email_body' => 'Richiesta di ricezione +'revise_document' => 'Riesamina documento', +'revise_document_on' => 'Prossimo riesame del documento il [date]', +'revisions_accepted' => '[no_reviews] riesami già accettati', +'revisions_not_touched' => '[no_reviews] riesami non gestiti', +'revisions_pending' => '[no_reviews] riesami pendenti', +'revisions_rejected' => '[no_reviews] riesami già rifiutati', +'revisions_without_group' => 'Riesami senza gruppo', +'revisions_without_user' => 'Riesami senza utente', +'revision_date' => 'data riesame', +'revision_log' => 'Log riesame', +'revision_request_email_body' => 'Richiesta di riesame Document: [name] Version: [version] Parent folder: [folder_path] User: [username] URL: [url]', -'revision_request_email_subject' => '[sitename]: [name] - Richiesta di revisione', +'revision_request_email_subject' => '[sitename]: [name] - Richiesta di riesame', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', 'revisors' => 'Revisori', 'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore', -'revisor_already_removed' => 'Revisore già rimosso dal processo di revisione o ha già revisionato documento.', -'rewind_workflow' => 'Inverti il flusso di lavoro', -'rewind_workflow_email_body' => 'Il flusso di lavoro è stato invertito +'revisor_already_removed' => 'Revisore già rimosso dal processo di riesame o ha già riesaminato il documento.', +'rewind_workflow' => 'Fa ripartire il flusso di lavoro', +'rewind_workflow_email_body' => 'Il flusso di lavoro è stato fatto ripartire Document: [name] Version: [version] Workflow: [workflow] Parent folder: [folder_path] User: [username] URL: [url]', -'rewind_workflow_email_subject' => '[sitename]: [name] - Il flusso di lavoro è stato invertito', -'rewind_workflow_warning' => 'Se si inverte un flusso di lavoro al suo stato iniziale ogni traccia del flusso di lavoro originale per questo documento sarà cancellata permanentemente.', +'rewind_workflow_email_subject' => '[sitename]: [name] - Il flusso di lavoro è stato fatto ripartire', +'rewind_workflow_warning' => 'Se si fa ripartire un flusso di lavoro al suo stato iniziale ogni traccia del flusso di lavoro originale per questo documento sarà cancellata permanentemente.', 'rm_attrdef' => 'Rimuovi attributo', 'rm_attrdefgroup' => 'Rimuovere questo gruppo di attributi', -'rm_attr_value' => '', +'rm_attr_value' => 'Rimuovi valore attributo', 'rm_default_keyword_category' => 'Rimuovi categoria', 'rm_document' => 'Rimuovi documento', 'rm_document_category' => 'Rimuovi categoria', -'rm_event' => '', +'rm_event' => 'Rimuovi evento', 'rm_file' => 'Rimuovi file', 'rm_folder' => 'Rimuovi cartella', 'rm_from_clipboard' => 'Rimuovi dalla clipboard', @@ -1094,7 +1112,7 @@ URL: [url]', 'rm_transmittal' => 'Rimuovi trasmissione', 'rm_transmittalitem' => 'Rimuovi oggetto', 'rm_user' => 'Rimuovi questo utente', -'rm_user_from_processes' => '', +'rm_user_from_processes' => 'Rimuovi utente dai processi', 'rm_version' => 'Rimuovi versione', 'rm_workflow' => 'Rimuovi flusso di lavoro', 'rm_workflow_action' => 'Rimuovi azione del flusso di lavoro', @@ -1123,58 +1141,63 @@ URL: [url]', 'saturday' => 'Sabato', 'saturday_abbr' => 'Sab', 'save' => 'Salva', -'scheduler_class' => '', -'scheduler_class_description' => '', -'scheduler_class_parameter' => '', -'scheduler_class_tasks' => '', -'scheduler_task_mgr' => '', +'scheduler_class' => 'Classe', +'scheduler_class_description' => 'Descrizione', +'scheduler_class_parameter' => 'Parametro', +'scheduler_class_tasks' => 'Attività della classe', +'scheduler_task_mgr' => 'Pianificatore', 'search' => 'Ricerca', 'search_fulltext' => 'Ricerca fulltext', 'search_in' => 'Cerca in', 'search_mode_and' => 'tutte le parole', -'search_mode_documents' => 'Solo Documenti', -'search_mode_folders' => 'Solo Cartelle', +'search_mode_documents' => 'Solo documenti', +'search_mode_folders' => 'Solo cartelle', 'search_mode_or' => 'almeno una parola', 'search_no_results' => 'Non ci sono documenti che soddisfino la vostra ricerca', 'search_query' => 'Cerca per', 'search_report' => 'Trovati [doccount] documenti e [foldercount] cartelle in [searchtime] secondi.', 'search_report_fulltext' => 'Trovati [doccount] documenti', -'search_resultmode' => 'Risultato Ricerca', -'search_resultmode_both' => 'Documenti e Cartelle', +'search_resultmode' => 'Risultato ricerca', +'search_resultmode_both' => 'Documenti e cartelle', 'search_results' => 'Risultato ricerca', 'search_results_access_filtered' => 'La ricerca può produrre risultati al cui contenuto è negato l\'accesso.', 'search_time' => 'Tempo trascorso: [time] secondi.', 'seconds' => 'secondi', 'selection' => 'Selezione', 'select_attrdefgrp_show' => 'Scegli quando mostrare', -'select_attribute_value' => '', +'select_attribute_value' => 'Seleziona il valore dell\'attributo', 'select_category' => 'Clicca per selezionare la categoria', -'select_group' => 'Seleziona Gruppo', +'select_group' => 'Seleziona gruppo', 'select_groups' => 'Clicca per selezionare i gruppi', 'select_grp_approvers' => 'Seleziona gruppo approvatore', -'select_grp_ind_approvers' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_notification' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_recipients' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_reviewers' => 'Fare clic per scegliere il gruppo', -'select_grp_ind_revisors' => '', -'select_grp_notification' => 'Seleziona Gruppo', -'select_grp_recipients' => 'Seleziona gruppo cartelle', -'select_grp_reviewers' => 'Seleziona gruppo revisore', -'select_grp_revisors' => 'Seleziona gruppo revisori', -'select_ind_approvers' => 'Seleziona approvatore', -'select_ind_notification' => 'Seleziona Utente', -'select_ind_recipients' => 'Seleziona singole cartelle', -'select_ind_reviewers' => 'Seleziona revisore', -'select_ind_revisors' => 'Seleziona singoli revisori', +'select_grp_ind_approvers' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_notification' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_recipients' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_reviewers' => 'Fare clic per selezionare il gruppo', +'select_grp_ind_revisors' => 'Fare clic per selezionare il gruppo', +'select_grp_notification' => 'Fare clic per selezionare notifiche di gruppo', +'select_grp_recipients' => 'Fare clic per selezionare un gruppo di destinatari', +'select_grp_reviewers' => 'Fare clic per selezionare un gruppo di revisori', +'select_grp_revisors' => 'Fare clic per selezionare un gruppo di riesaminatori', +'select_ind_approvers' => 'Fare clic per selezionare un approvatore individuale', +'select_ind_notification' => 'Fare clic per selezionare la notifica individuale', +'select_ind_recipients' => 'Fare clic per selezionare un destinatario individuale', +'select_ind_reviewers' => 'Fare clic per selezionare un revisore individuale', +'select_ind_revisors' => 'Fare clic per selezionare un riesaminatore individuale', 'select_one' => 'Seleziona uno', -'select_user' => 'Seleziona Utente', +'select_user' => 'Seleziona utente', 'select_users' => 'Clicca per selezionare gli utenti', 'select_value' => 'Selezionare un valore', 'select_workflow' => 'Seleziona il flusso di lavoro', -'send_email' => '', -'send_login_data' => '', -'send_login_data_body' => '', -'send_login_data_subject' => '', +'send_email' => 'Invia messaggio', +'send_login_data' => 'Invia dati di login', +'send_login_data_body' => 'Dati di login + +Login: [login] +Name: [username] + +[comment]', +'send_login_data_subject' => '[sitename]: [login] - I tuoi dati di login', 'send_test_mail' => 'Invia messagio di prova', 'september' => 'Settembre', 'sequence' => 'Posizione', @@ -1182,21 +1205,21 @@ URL: [url]', 'seq_end' => 'Alla fine', 'seq_keep' => 'Mantieni la posizione', 'seq_start' => 'Prima posizione', -'sessions' => '', +'sessions' => 'Utenti online', 'setDateFromFile' => 'Prende la data dal file importato', 'setDateFromFolder' => 'Prende la data dalla cartella importata', 'settings' => 'Impostazioni', 'settings_activate_module' => 'Attivazione modulo', 'settings_activate_php_extension' => 'Attivazione estensione PHP', 'settings_adminIP' => 'IP Amministratore', -'settings_adminIP_desc' => 'Se attivato l\'Amministratore si può collegare solo da un IP specifico; lasciare vuoto per evitare il controllo. NOTA: funziona solo con autenticazione locale (no LDAP)', +'settings_adminIP_desc' => 'Se attivato l\'amministratore si può collegare solo da un IP specifico; lasciare vuoto per evitare il controllo. NOTA: funziona solo con autenticazione locale (no LDAP)', 'settings_Advanced' => 'Avanzate', 'settings_advancedAcl' => 'Avanzate controlo accesso', -'settings_advancedAcl_desc' => 'Avanzatoa controlo di accesso consente di attivare / diattivare alcuni moduli di software. Non può essere utilizzato per i diritti di accesso su documenti e cartelle.', -'settings_allowChangeRevAppInProcess' => '', -'settings_allowChangeRevAppInProcess_desc' => '', +'settings_advancedAcl_desc' => 'Avanzatoa controlo di accesso consente di attivare/diattivare alcuni moduli di software. Non può essere utilizzato per i diritti di accesso su documenti e cartelle.', +'settings_allowChangeRevAppInProcess' => 'Consenti modifica revisore/approvatore dopo l\'avvio del processo', +'settings_allowChangeRevAppInProcess_desc' => 'Per impostazione predefinita, i revisori e gli approvatori non possono più essere modificati dopo l\'invio di una revisione o di un\'approvazione. Questa opzione consentirà agli amministratori di farlo purché il documento non venga rilasciato o rifiutato.', 'settings_allowReviewerOnly' => 'Abilita l\'impostazione del solo revisore', -'settings_allowReviewerOnly_desc' => 'Abilita se si vuole concedere di impostare solo un revisore ma non un apporvatore nel workflow tradizionale', +'settings_allowReviewerOnly_desc' => 'Abilita se si vuole concedere di impostare solo un revisore ma non un apporvatore nel flusso di lavoro tradizionale', 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite', 'settings_Authentication' => 'Impostazioni di Autenticazione', 'settings_autoLoginUser' => 'Login automatico', @@ -1253,21 +1276,21 @@ URL: [url]', 'settings_defaultSearchMethod_valdatabase' => 'database', 'settings_defaultSearchMethod_valfulltext' => 'Testo intero', 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.', -'settings_disableSelfEdit' => 'Disabilita Auto-Modifica', +'settings_disableSelfEdit' => 'Disabilita auto-modifica', 'settings_disableSelfEdit_desc' => 'Se selezionato l\'utente non può modificare il proprio profilo', 'settings_disable_install' => 'Prova ad eliminare il file ENABLE_INSTALL_TOOL se possibile', 'settings_Display' => 'Impostazioni di visualizzazione', -'settings_dropFolderDir' => 'Cartella per il drop', -'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.', +'settings_dropFolderDir' => 'Cartella per la pubblicazione', +'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per pubblicare file sul server, importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare file in questo modo.', 'settings_Edition' => 'Impostazioni di edizione', 'settings_editOnlineFileTypes' => 'Tipi di files modificabili Online', 'settings_editOnlineFileTypes_desc' => 'I file con uno dei seguenti terminali possono essere modificati on-line (usare solo caratteri minuscoli)', 'settings_enable2FactorAuthentication' => 'Permettere autenticazione a due fattori', -'settings_enable2FactorAuthentication_desc' => 'Abilitare / disabilitare autenticazione a due fattori. Gli utenti avranno bisogno di "Google Authenticator" sul tuo telefono cellulare.', -'settings_enableAcknowledgeWorkflow' => '', -'settings_enableAcknowledgeWorkflow_desc' => '', -'settings_enableAdminReceipt' => '', -'settings_enableAdminReceipt_desc' => '', +'settings_enable2FactorAuthentication_desc' => 'Abilitare/disabilitare autenticazione a due fattori. Gli utenti avranno bisogno di "Google Authenticator" sul tuo telefono cellulare.', +'settings_enableAcknowledgeWorkflow' => 'Consenti la ricezione di documenti per gli amministratori', +'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare questa opzione se si desidera che gli amministratori vengano elencati come destinatari dei documenti.', +'settings_enableAdminReceipt' => 'Consenti revisione/approvazione per gli amministratori', +'settings_enableAdminReceipt_desc' => 'Abilitare questa opzione se si desidera che gli amministratori vengano elencati come revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori', 'settings_enableAdminRevApp_desc' => 'Abilita per elencare gli amministratori tra i revisori/approvatori e per le transizioni del flusso di lavoro', 'settings_enableCalendar' => 'Abilita calendario', @@ -1276,23 +1299,23 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Abilita/disabilita la clipboard sulla pagina \'Vista cartella\'', 'settings_enableConverting' => 'Abilita conversione', 'settings_enableConverting_desc' => 'Abilita/disabilita la conversione dei files', -'settings_enableDropFolderList' => 'Abilita lista dei file nella cartella di rilasco', -'settings_enableDropFolderList_desc' => 'Abilita la lista dei file nella cartella di rilascio. La lista viene mostrata nel menù principale.', -'settings_enableDropUpload' => 'Abilita upload veloce', -'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di rilascio nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).', +'settings_enableDropFolderList' => 'Abilita lista dei file nella cartella di pubblicazione', +'settings_enableDropFolderList_desc' => 'Abilita la lista dei file nella cartella di pubblicazione. La lista viene mostrata nel menù principale.', +'settings_enableDropUpload' => 'Abilita caricamento veloce', +'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di pubblicazione nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).', 'settings_enableDuplicateDocNames' => 'Permetti documenti con lo stesso nome', 'settings_enableDuplicateDocNames_desc' => 'Permetti documenti con lo stesso nome nella stessa cartella', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Permetti nomi sottocartelle duplicati', +'settings_enableDuplicateSubFolderNames_desc' => 'Permetti di avere nomi duplicati di sottocartelle in una cartella.', 'settings_enableEmail' => 'Abilita l\'email', 'settings_enableEmail_desc' => 'Abilita/disabilita la notifica automatica via email', -'settings_enableFilterReceipt' => '', -'settings_enableFilterReceipt_desc' => '', +'settings_enableFilterReceipt' => 'Filtra per proprietario, revisore, ecc. dall\'elenco delle ricezioni', +'settings_enableFilterReceipt_desc' => 'Abilita, per poter filtrare dei destinatari da un elenco di ricezioni se i membri di un gruppo sono selezionati.', 'settings_enableFolderTree' => 'Visualizza la struttura ad albero', 'settings_enableFolderTree_desc' => 'Abilita/disabilita la visualizzaione della struttura ad albero nella pagina \'Vista cartella\'', 'settings_enableFullSearch' => 'Abilita ricerca fulltext', 'settings_enableFullSearch_desc' => 'Abilita/disabilita la ricerca fulltext', -'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité', +'settings_enableGuestAutoLogin' => 'Abilita l\'auto login per gli ospiti', 'settings_enableGuestAutoLogin_desc' => 'Se il login ospite e il login automatico è abilitato, il login ospite sarà usato automaticamente.', 'settings_enableGuestLogin' => 'Permetti login come ospite', 'settings_enableGuestLogin_desc' => 'Per impedire il login come ospite, selezionare questa opzione. Nota bene: il login come ospite dovrebbe essere permesso soltanto in un ambiente fidato.', @@ -1303,7 +1326,7 @@ URL: [url]', 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files', 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.', 'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù', -'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.', +'settings_enableMenuTasks_desc' => 'Abilita/disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.', 'settings_enableMultiUpload' => 'Consenti il caricamento di più files', 'settings_enableMultiUpload_desc' => 'Quando viene creato un nuovo documento, possono essere caricati più files. Ogniuno di essi genera un nuovo documento.', 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore', @@ -1312,34 +1335,36 @@ URL: [url]', 'settings_enableNotificationWorkflow_desc' => 'Se questa opzione è selezionata, gli utenti o i gruppi che sono coinvolti nella successiva transizione del flusso di lavoro riceveranno un avviso, anche se non hanno impostato notifiche riguardanti il documento.', 'settings_enableOwnerNotification' => 'Abilita/disabilita notifica al proprietario', 'settings_enableOwnerNotification_desc' => 'Spuntare per inviare una notifica al proprietario del documento nel momento in cui questo viene aggiunto.', -'settings_enableOwnerReceipt' => '', -'settings_enableOwnerReceipt_desc' => '', +'settings_enableOwnerReceipt' => 'Consentire la ricezione di documenti da parte del proprietario', +'settings_enableOwnerReceipt_desc' => 'Abilitare questa opzione se si desidera che il proprietario di un documento sia elencato come destinatario.', 'settings_enableOwnerRevApp' => 'Permetti la revisione/approvazione per il proprietario', 'settings_enableOwnerRevApp_desc' => 'Spuntare per aggiungere il proprietario del documento alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enablePasswordForgotten' => 'Abilita recupero password', 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.', -'settings_enableReceiptReject' => '', -'settings_enableReceiptReject_desc' => '', +'settings_enableReceiptReject' => 'Abilita il rifiuto dei ricevimenti', +'settings_enableReceiptReject_desc' => 'Abilita per attivare il rifiuto dei ricevimenti.', 'settings_enableReceiptWorkflow' => 'Abilitare per notifiche', -'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', +'settings_enableReceiptWorkflow_desc' => 'Abilitare per attivare le ricevute di notifica nel flusso di lavoro.', 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle', 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.', -'settings_enableRevisionOnVoteReject' => '', -'settings_enableRevisionOnVoteReject_desc' => '', -'settings_enableRevisionWorkflow' => 'Abilita revisione documenti', -'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.', -'settings_enableSelfReceipt' => '', -'settings_enableSelfReceipt_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => 'Rifiutato da un revisore', +'settings_enableRevisionOnVoteReject_desc' => 'Se impostato, il documento verrà rifiutato se un revisore rifiuta il documento.', +'settings_enableRevisionWorkflow' => 'Abilita riesame dei documenti', +'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare flusso di lavoro su riesame documenti dopo scadenza.', +'settings_enableSelfReceipt' => 'Consenti la ricezione di documenti per l\'utente che ha effettuato l\'accesso', +'settings_enableSelfReceipt_desc' => 'Abilitare questa opzione se si desidera che l\'utente attualmente connesso sia elencato come destinatario di un documento.', 'settings_enableSelfRevApp' => 'Permetti revisione/approvazione all\'utente registrato', 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enableSessionList' => 'Abilita lista utenti online nel menu', 'settings_enableSessionList_desc' => 'Abilita lista degli utenti loggati nel menu', 'settings_enableThemeSelector' => 'Selezione tema grafico', 'settings_enableThemeSelector_desc' => 'Abilita/disabilita il selettore di tema grafico nella finestra di login', -'settings_enableUpdateReceipt' => '', -'settings_enableUpdateReceipt_desc' => '', -'settings_enableUpdateRevApp' => 'Consenti la modifica della revisione / approvazione estesa', -'settings_enableUpdateRevApp_desc' => 'Abilita questo, se l\'utente che ha effettuato una revisione / approvazione può modificare la decisione finché il passaggio di flusso di lavoro corrente non è stato completato.', +'settings_enableUpdateReceipt' => 'Consenti modifica della ricezione esistente', +'settings_enableUpdateReceipt_desc' => 'Abilitare questa opzione se l\'utente che ha effettuato una ricezione può modificare la decisione.', +'settings_enableUpdateRevApp' => 'Consenti la modifica della revisione/approvazione estesa', +'settings_enableUpdateRevApp_desc' => 'Abilita questo, se l\'utente che ha effettuato una revisione/approvazione può modificare la decisione finché il passaggio di flusso di lavoro corrente non è stato completato.', 'settings_enableUserImage' => 'Abilita immagine utente', 'settings_enableUserImage_desc' => 'L\'opzione permette di attribuire un\'immagine a ciascun utente', 'settings_enableUsersView' => 'Abilita visualizzazione utenti', @@ -1349,9 +1374,9 @@ URL: [url]', 'settings_enableVersionModification' => 'Abilita modifica della versione', 'settings_enableVersionModification_desc' => 'Abilita/disabilita il permesso di modificare le versioni di un documento da parte di un qualsiasi utente. Gli Amministratori hanno sempre e comunque tale facoltà.', 'settings_enableWebdavReplaceDoc' => 'Sostituisci il documento durante il salvataggio', -'settings_enableWebdavReplaceDoc_desc' => 'Se abilitato, durante il salvataggio il documento verrà sostituito invece di crearne uno nuovo. Si applica solo se l\'utente, estensione e nome del file sono uguali all\'ultima versione. E\' utile per applicazioni che ad intervalli regolari salvano un documento.', +'settings_enableWebdavReplaceDoc_desc' => 'Se abilitato, durante il salvataggio il documento verrà sostituito invece di crearne uno nuovo. Si applica solo se l\'utente, estensione e nome del file sono uguali all\'ultima versione. È utile per applicazioni che ad intervalli regolari salvano un documento.', 'settings_enableXsendfile' => 'Usa il modulo apache xsendfile', -'settings_enableXsendfile_desc' => 'Se selezionato ed e\' installato il modulo apache xsendfile, questo puo\' essere usato per inviare immagini', +'settings_enableXsendfile_desc' => 'Se selezionato ed è installato il modulo apache xsendfile, questo puo\' essere usato per inviare immagini', 'settings_encryptionKey' => 'Chiave di criptazione', 'settings_encryptionKey_desc' => 'La chiave viene usata per creare un identificatore unico da aggiungere come campo nascosto ad un formulario per protezione da attacchi CSRF.', 'settings_error' => 'Errore', @@ -1380,7 +1405,7 @@ URL: [url]', 'settings_initialDocumentStatus' => 'Stato iniziale documento', 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento', 'settings_initialDocumentStatus_draft' => 'Bozza', -'settings_initialDocumentStatus_released' => 'Rilasciato', +'settings_initialDocumentStatus_released' => 'Pubblicato', 'settings_installADOdb' => 'Installa ADOdb', 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.', 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear', @@ -1403,15 +1428,15 @@ URL: [url]', 'settings_luceneClassDir_desc' => 'Cartella del pacchetto SeedDMS_Lucene (opzionale). Lasciare il campo vuoto se SeedDMS_Lucene è stato installato in una cartella localizzabile dal PHP, ad esempio quella indicata per gli include PHP addizionali.', 'settings_luceneDir' => 'Cartella di indicizzazione fulltext', 'settings_luceneDir_desc' => 'Cartella di memorizzazione dell\'indice utilizzato da Lucene', -'settings_maxDirID' => 'Max numero di ID-Cartella', +'settings_maxDirID' => 'Max numero di ID cartella', 'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.', -'settings_maxExecutionTime' => 'Tempo Max di esecuzione (s)', +'settings_maxExecutionTime' => 'Tempo massimo di esecuzione (s)', 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.', 'settings_maxItemsPerPage' => 'Numero massimo di inserimenti per pagina', 'settings_maxItemsPerPage_desc' => 'Riduce numero di cartelle e documenti mostrati nell pagina di visualizzazione cartelle. Altri oggetti saranno caricati allo scorrimento verso la fine della pagina. Impostare 0 per visualizzare tutti gli elementi.', 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle', 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.', -'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea', +'settings_maxSizeForFullText' => 'La lunghezza massima del file per l\'indicizzazione istantanea', 'settings_maxSizeForFullText_desc' => 'Tutte le nuove versioni dei documenti più in basso della dimensione configurata saranno completamente indicizzati dopo il caricamento. In tutti gli altri casi sarà indicizzato solo i metadati.', 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', @@ -1445,17 +1470,17 @@ URL: [url]', 'settings_presetExpirationDate_desc' => 'Tutti i nuovi documenti caricati avranno la data di scadenza impostata su questo valore. La data inserita può essere specificata nel formato accettato dalla funzione strtotime() di PHP, ad esempio +5 settimane.', 'settings_previewWidthDetail' => 'Larghezza immagini di anteprima (dettagli)', 'settings_previewWidthDetail_desc' => 'Larghezza delle immagini di anteprima mostrate nella pagina dei dettagli', -'settings_previewWidthDropFolderList' => 'Larghezza immagine di anteprima (lista cartella rilascio)', -'settings_previewWidthDropFolderList_desc' => 'Larghezza immagine di anteprima mostrata nella lista, quando selezionato un file dalla cartella di rilascio', +'settings_previewWidthDropFolderList' => 'Larghezza immagine di anteprima (lista cartella di pubblicazione)', +'settings_previewWidthDropFolderList_desc' => 'Larghezza immagine di anteprima mostrata nella lista, quando selezionato un file dalla cartella di pubblicazione', 'settings_previewWidthList' => 'Larghezza delle immagini di anteprima (lista)', 'settings_previewWidthList_desc' => 'Larghezza delle immagini di anteprima mostrate nella lista', 'settings_previewWidthMenuList' => 'Larghezza immagine di anteprima (lista menu)', -'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di rilascio.', +'settings_previewWidthMenuList_desc' => 'Larghezza immagine di anteprima mostrata come articolo nel menu cartella di pubblicazione.', 'settings_printDisclaimer' => 'Mostra disclaimer', 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.', 'settings_quota' => 'Quota utente', 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.', -'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il successo di posto', +'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il caricamento', 'settings_removeFromDropFolder_desc' => 'Attivare questa, se un file è preso dalla cartella di ricezione, si è cancellata dopo il caricamento di successo.', 'settings_repositoryUrl' => 'URL del repository', 'settings_repositoryUrl_desc' => 'URL del repository per le estensioni', @@ -1509,14 +1534,14 @@ URL: [url]', 'settings_strictFormCheck_desc' => 'Rigido controllo sulla form. Se abilitato verrà richiesto che tutti i campi della form abbiano un valore. Se disabilitato la maggior parte dei commenti e dei campi parola-chiave diventano opzionali. NOTA: i commenti sono sempre necessari quando si carica una revisione o si scavalca lo stato di un documento.', 'settings_suggestionvalue' => 'Valore suggerito', 'settings_System' => 'Sistema', -'settings_tasksInMenu' => '', -'settings_tasksInMenu_approval' => '', -'settings_tasksInMenu_desc' => '', -'settings_tasksInMenu_needscorrection' => '', -'settings_tasksInMenu_receipt' => '', -'settings_tasksInMenu_review' => '', -'settings_tasksInMenu_revision' => '', -'settings_tasksInMenu_workflow' => '', +'settings_tasksInMenu' => 'Attività selezionate', +'settings_tasksInMenu_approval' => 'Approvazioni', +'settings_tasksInMenu_desc' => 'Seleziona le attività da conteggiare. Se non ne sono state selezionate, verranno conteggiate tutte le attività.', +'settings_tasksInMenu_needscorrection' => 'Correzioni necessarie', +'settings_tasksInMenu_receipt' => 'Ricevute', +'settings_tasksInMenu_review' => 'Revisioni', +'settings_tasksInMenu_revision' => 'Riesami', +'settings_tasksInMenu_workflow' => 'Flusso di lavoro', 'settings_theme' => 'Tema di default', 'settings_theme_desc' => 'Stile di default (nome della sottocartella nella cartella "styles")', 'settings_titleDisplayHack' => 'Visualizzazione titoli lunghi', @@ -1534,123 +1559,123 @@ URL: [url]', 'settings_viewOnlineFileTypes_desc' => 'Solo i files che terminano nella maniera seguente verranno visualizzati (UTILIZZARE SOLO IL MINUSCOLO)', 'settings_webdav' => 'WebDAV', 'settings_workflowMode' => 'Modalità flusso di lavoro', -'settings_workflowMode_desc' => 'Il flusso di lavoro \'avanzato\' permette di rilasciare un proprio flusso di lavoro per le versioni dei documenti', +'settings_workflowMode_desc' => 'Il flusso di lavoro \'avanzato\' permette di pubblicare un proprio flusso di lavoro per le versioni dei documenti', 'settings_workflowMode_valadvanced' => 'Avanzato', 'settings_workflowMode_valtraditional' => 'Tradizionale', -'settings_workflowMode_valtraditional_only_approval' => 'tradizionale (senza revisione)', +'settings_workflowMode_valtraditional_only_approval' => 'Tradizionale (senza revisione)', 'settings_zendframework' => 'Framework Zend', 'set_expiry' => 'Imposta scadenza', 'set_owner' => 'Conferma proprietario', 'set_owner_error' => 'Errore nell\'impostazione del proprietario', -'set_password' => 'Imposta Password', +'set_password' => 'Imposta password', 'set_workflow' => 'Imposta il flusso di lavoro', -'show_extension_changelog' => '', +'show_extension_changelog' => 'Registro delle modifiche dell\'estensione', 'show_extension_version_list' => 'Mostra lista delle versioni', 'signed_in_as' => 'Utente', 'sign_in' => 'Accesso', 'sign_out' => 'Disconnettiti', 'sign_out_user' => 'Disconnetti l\'utente', 'sk_SK' => 'Slovacco', -'sort_by_date' => 'Ordina per Data', -'sort_by_name' => 'Ordina per Nom', -'sort_by_sequence' => 'Ordina per Sequenza', +'sort_by_date' => 'Ordina per data', +'sort_by_name' => 'Ordina per nome', +'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' => '', +'splash_add_access' => 'Accesso aggiunto', 'splash_add_attribute' => 'Attributo aggiunto', 'splash_add_group' => 'Gruppo aggiunto', 'splash_add_group_member' => 'Membro aggiunto al gruppo', 'splash_add_role' => 'Aggiunto nuovo ruolo', 'splash_add_to_transmittal' => 'Aggiungere alla trasmissione', -'splash_add_transmittal' => '', +'splash_add_transmittal' => 'Aggiungere trasmissione', 'splash_add_user' => 'Utente aggiunto', 'splash_cleared_cache' => 'Cache cancellata', 'splash_cleared_clipboard' => 'Appunti cancellati', -'splash_delete_access' => '', +'splash_delete_access' => 'Diritto d\'accesso cancellato', 'splash_document_added' => 'Documento aggiunto', 'splash_document_checkedout' => 'Documento approvato', 'splash_document_edited' => 'Documento modificato', -'splash_document_indexed' => '', +'splash_document_indexed' => 'Documento indicizzato', 'splash_document_locked' => 'Documento bloccato', 'splash_document_unlocked' => 'Documento sbloccato', -'splash_edit_access' => '', +'splash_edit_access' => 'Accesso modificato', 'splash_edit_attribute' => 'Attributo modificato', -'splash_edit_event' => '', +'splash_edit_event' => 'Evento modificato', 'splash_edit_group' => 'Gruppo modificato', -'splash_edit_role' => 'Ruolo memorizzata', -'splash_edit_task' => '', +'splash_edit_role' => 'Ruolo memorizzato', +'splash_edit_task' => 'Attività modificata', 'splash_edit_user' => 'Utente modificato', 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione', -'splash_error_rm_download_link' => '', -'splash_error_send_download_link' => '', -'splash_extension_getlist' => '', -'splash_extension_import' => '', -'splash_extension_refresh' => '', -'splash_extension_upload' => '', +'splash_error_rm_download_link' => 'Errore durante la rimozione del collegamento di scaricamento', +'splash_error_send_download_link' => 'Errore durante l\'invio del collegamento di scaricamento', +'splash_extension_getlist' => 'Elenco estensioni aggiornate dal repository', +'splash_extension_import' => 'Extensition installed', +'splash_extension_refresh' => 'Refreshed list of extensions', +'splash_extension_upload' => 'Extension installed', 'splash_folder_edited' => 'Cartella modificata', 'splash_importfs' => 'Importati [Documenti] documenti e cartelle [cartelle]', -'splash_inherit_access' => '', +'splash_inherit_access' => 'Il diritto di accesso verrà ereditato', 'splash_invalid_folder_id' => 'ID cartella non valido', 'splash_invalid_searchterm' => 'Termine di ricerca non valido', -'splash_link_document' => '', +'splash_link_document' => 'Collegamento aggiunto', 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente', 'splash_move_document' => 'Documento spostato', 'splash_move_folder' => 'Cartella spostato', -'splash_notinherit_access' => '', -'splash_receipt_update_success' => '', +'splash_notinherit_access' => 'I diritti di accesso non sono più ereditati', +'splash_receipt_update_success' => 'Ricevuta aggiunta con successo', 'splash_removed_from_clipboard' => 'Rimosso dagli appunti', 'splash_rm_attribute' => 'Attributo rimosso', -'splash_rm_attr_value' => '', +'splash_rm_attr_value' => 'Valore attributo rimosso', 'splash_rm_document' => 'Documento rimosso', -'splash_rm_download_link' => '', +'splash_rm_download_link' => 'Collegamento di scaricamento rimosso', 'splash_rm_folder' => 'Cartella eliminata', 'splash_rm_group' => 'Gruppo eliminato', 'splash_rm_group_member' => 'Membro del gruppo eliminato', 'splash_rm_role' => 'Ruolo cancellato', 'splash_rm_transmittal' => 'Trasmissione cancellato', 'splash_rm_user' => 'Utente eliminato', -'splash_rm_user_processes' => '', -'splash_rm_workflow' => '', -'splash_rm_workflow_action' => '', -'splash_rm_workflow_state' => '', -'splash_saved_file' => '', -'splash_save_user_data' => '', -'splash_send_download_link' => '', -'splash_send_login_data' => '', -'splash_setowner' => '', +'splash_rm_user_processes' => 'Utente rimosso da tutti i processi', +'splash_rm_workflow' => 'flusso di lavoro rimosso', +'splash_rm_workflow_action' => 'Azione del flusso di lavoro rimossa', +'splash_rm_workflow_state' => 'Stato del flusso di lavoro rimosso', +'splash_saved_file' => 'Versione salvata', +'splash_save_user_data' => 'Dati utente salvati', +'splash_send_download_link' => 'Collegamento di scaricamento inviato via email.', +'splash_send_login_data' => 'Dati di login inviati', +'splash_setowner' => 'Imposta nuovo proprietario', 'splash_settings_saved' => 'Impostazioni salvate', -'splash_set_default_access' => '', +'splash_set_default_access' => 'Imposta accesso predefinito', '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' => '', +'splash_transfer_content' => 'Contenuto trasferito', +'splash_transfer_document' => 'Documento trasferito', +'splash_transfer_objects' => 'Oggetti trasferito', +'splash_trigger_workflow' => 'Attivata transizione del flusso di lavoro', 'state_and_next_state' => 'Stato/Prossimo stato', 'statistic' => 'Statistiche', 'status' => 'Stato', 'status_approval_rejected' => 'Bozza rifiutata', 'status_approved' => 'Approvato', 'status_approver_removed' => 'Approvatore rimosso dal processo', -'status_needs_correction' => '', +'status_needs_correction' => 'Necessita correzioni', 'status_not_approved' => 'Non ancora approvato', 'status_not_receipted' => 'Non ancora ricevuto', -'status_not_reviewed' => 'Non ancora revisionato', -'status_not_revised' => 'Non revisionato', +'status_not_reviewed' => 'Non revisionato', +'status_not_revised' => 'Non riesaminato', 'status_receipted' => 'Ricevuto', -'status_receipt_rejected' => 'Rigettato', +'status_receipt_rejected' => 'Rifiutato', 'status_recipient_removed' => 'Cartella rimossa dalla lista', 'status_reviewed' => 'Revisionato', 'status_reviewer_rejected' => 'Bozza rifiutata', 'status_reviewer_removed' => 'Revisore rimosso dal processo', -'status_revised' => 'Revisionato', -'status_revision_rejected' => 'Rigettato', -'status_revision_sleeping' => 'In attesa', +'status_revised' => 'riesaminato', +'status_revision_rejected' => 'Rifiutato', +'status_revision_sleeping' => 'in attesa', 'status_revisor_removed' => 'Revisore rimosso dalla lista', 'status_unknown' => 'Sconosciuto', 'storage_size' => 'Spazio di archiviazione', -'subfolder_duplicate_name' => '', +'subfolder_duplicate_name' => 'Nome sottocartella duplicato', 'submit_2_fact_auth' => 'Salva segreto', 'submit_approval' => 'Invio approvazione', 'submit_login' => 'Accedi', @@ -1658,9 +1683,9 @@ URL: [url]', 'submit_password_forgotten' => 'Inizio processo di recupero', 'submit_receipt' => 'Invio ricevuta', 'submit_review' => 'Invio revisione', -'submit_revision' => 'Aggiungere Revisione', +'submit_revision' => 'Aggiungi riesame', 'submit_userinfo' => 'Invio info utente', -'subsribe_timelinefeed' => '', +'subsribe_timelinefeed' => 'Iscriviti al feed della linea temporale', 'substitute_to_user' => 'Cambia in \'[username]\'', 'substitute_user' => 'Impersona utente', 'success_add_aro' => 'Aggiunto richiesta di accesso oggetto', @@ -1671,55 +1696,55 @@ URL: [url]', 'sunday_abbr' => 'Dom', 'sv_SE' => 'Svedese', 'switched_to' => 'Passato a', -'takeOverAttributeValue' => '', +'takeOverAttributeValue' => 'Riprendi il valore dell\'attributo dall\'ultima versione', 'takeOverGrpApprover' => 'Riprendi il gruppo degli approvatori dall\'ultima versione.', 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.', 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.', 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.', -'tasks' => 'Compiti', -'task_description' => '', -'task_disabled' => '', -'task_frequency' => '', -'task_last_run' => '', -'task_name' => '', -'task_next_run' => '', +'tasks' => 'Attività', +'task_description' => 'Descrizione', +'task_disabled' => 'Disabilitata', +'task_frequency' => 'Frequenza', +'task_last_run' => 'Ultima esecuzione', +'task_name' => 'Nome', +'task_next_run' => 'Prossima esecuzione', 'temp_jscode' => 'Codice javascript temporaneo', 'testmail_body' => 'Questo messaggio di posta elettronica è solo un test per verificare la configurazione del repository', 'testmail_subject' => 'Messaggio di test', 'theme' => 'Tema', 'thursday' => 'Giovedì', 'thursday_abbr' => 'Gio', -'timeline' => 'Linea del Tempo', +'timeline' => 'Linea temporale', 'timeline_add_file' => 'Nuovo allegato', 'timeline_add_version' => 'Nuova versione [version]', 'timeline_full_add_file' => '[document]
Nuovo attacco', 'timeline_full_add_version' => '[document]
Nuovo versione [version]', -'timeline_full_scheduled_revision' => '', +'timeline_full_scheduled_revision' => '[document]
Riesame della versione [version]', 'timeline_full_status_change' => '[document]
Versione [version]: [status]', -'timeline_scheduled_revision' => '', +'timeline_scheduled_revision' => 'Riesame della versione [version]', 'timeline_selected_item' => 'Documento selezionato', 'timeline_skip_add_file' => 'allegato aggiunto', -'timeline_skip_scheduled_revision' => '', +'timeline_skip_scheduled_revision' => 'Riesame programmato', 'timeline_skip_status_change_-1' => 'respinto', 'timeline_skip_status_change_-3' => 'scaduto', 'timeline_skip_status_change_0' => 'in attesa di revisione', 'timeline_skip_status_change_1' => 'in attesa di approvazione', -'timeline_skip_status_change_2' => 'rilasciato', -'timeline_skip_status_change_3' => 'nel workflow', -'timeline_skip_status_change_4' => '', -'timeline_skip_status_change_5' => '', +'timeline_skip_status_change_2' => 'pubblicato', +'timeline_skip_status_change_3' => 'nel flusso di lavoro', +'timeline_skip_status_change_4' => 'in riesame', +'timeline_skip_status_change_5' => 'bozza', 'timeline_status_change' => 'Versione [version]: Stato', 'to' => 'A', 'toggle_manager' => 'Gestore', -'toggle_qrcode' => 'Mostri / nascondi codice QR', +'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', -'transfer_objects' => '', -'transfer_objects_to_user' => '', -'transfer_to_user' => 'Trasferisci all`utente', +'transfer_content' => 'Trasferisci contenuto', +'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', +'transfer_objects' => 'Trasferisci oggetti', +'transfer_objects_to_user' => 'Trasferisci all\'utente', +'transfer_to_user' => 'Trasferisci all\'utente', 'transition_triggered_email' => 'Inizio transizione del flusso di lavoro', 'transition_triggered_email_body' => 'Transizione del flusso di lavoro iniziata Documento: [name] @@ -1734,7 +1759,7 @@ URL: [url]', 'transition_triggered_email_subject' => 'Transizione del flusso di lavoro iniziata', 'transmittal' => 'Trasmissione', 'transmittalitem_removed' => 'Oggetto trasmissione rimosso', -'transmittalitem_updated' => 'Documento aggiornato alla ultima versione', +'transmittalitem_updated' => 'Documento aggiornato all\'ultima versione', 'transmittal_comment' => 'Commento', 'transmittal_name' => 'Nome', 'transmittal_size' => 'Dimensione', @@ -1794,7 +1819,7 @@ URL: [url]', 'use_comment_of_document' => 'Utilizza il commento al documento', 'use_default_categories' => 'Usa categorie predefinite', 'use_default_keywords' => 'Usa parole-chiave predefinite', -'valid_till' => '', +'valid_till' => 'Valido fino a', 'version' => 'Versione', 'versioning_file_creation' => 'Creazione file di versione', 'versioning_file_creation_warning' => 'Con questa operazione è possibile creare un file di backup delle informazioni di versione dei documenti di un\'intera cartella. Dopo la creazione ogni file viene salvato nella cartella del relativo documento.', @@ -1817,30 +1842,30 @@ URL: [url]', 'weeks' => 'settimane', 'week_view' => 'Vista settimana', 'workflow' => 'Flusso di lavoro', -'workflows_involded' => '', +'workflows_involded' => 'Coinvolto nel flusso di lavoro', 'workflow_actions_management' => 'Gestione azioni del flusso di lavoro', 'workflow_action_in_use' => 'Questa azione è attualmente usata da alcuni flussi di lavoro', 'workflow_action_name' => 'Nome', 'workflow_editor' => 'Modifica flussi di lavoro', 'workflow_group_summary' => 'Sommario di gruppo', -'workflow_has_cycle' => '', +'workflow_has_cycle' => 'Il flusso di lavoro ha un ciclo', 'workflow_initstate' => 'Stato iniziale', 'workflow_in_use' => 'Questo flusso di lavoro è attualmente usato da alcuni documenti', -'workflow_layoutdata_saved' => '', +'workflow_layoutdata_saved' => 'Dati di layout salvati', 'workflow_management' => 'Gestione flusso di lavoro', 'workflow_name' => 'Nome', -'workflow_no_doc_rejected_state' => '', -'workflow_no_doc_released_state' => '', -'workflow_no_initial_state' => '', +'workflow_no_doc_rejected_state' => 'Il documento non verrà rifiutato in uno stato di flusso di lavoro!', +'workflow_no_doc_released_state' => 'Il documento non verrà rilasciato in uno stato di flusso di lavoro!', +'workflow_no_initial_state' => 'Nessuna delle transizioni inizia con lo stato iniziale del flusso di lavoro!', 'workflow_no_states' => 'Prima di aggiungere un flusso di lavoro occorre definirne prima gli stati.', -'workflow_save_layout' => '', +'workflow_save_layout' => 'Salva layout', 'workflow_state' => 'Stato del flusso di lavoro', 'workflow_states_management' => 'Gestione stati del flusso di lavoro', 'workflow_state_docstatus' => 'Stato del documento', 'workflow_state_in_use' => 'Questo stato è attualmente usato da alcuni flussi di lavoro', 'workflow_state_name' => 'Nome', 'workflow_summary' => 'Riepilogo flusso di lavoro', -'workflow_transition_without_user_group' => '', +'workflow_transition_without_user_group' => 'Almeno una delle transizioni non ha un utente o un gruppo!', 'workflow_user_summary' => 'Riepilogo utenti', 'x_more_objects' => '[number] altri oggetti', 'year_view' => 'Vista anno', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index e70270c90..ed9171373 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -835,6 +835,7 @@ URL : [url]', 'no_action' => '조치가 필요하지 않습니다', 'no_approval_needed' => '승인을 보류하지 않습니다', 'no_attached_files' => '첨부 파일 없음', +'no_backup_dir' => '', 'no_current_version' => '당신은 이전 버전의 SeedDMS를 사용하고 있습니다. 사용 가능한 최신 버전은 [latestversion] 입니다.', 'no_default_keywords' => '사용 가능한 키워드가 존재하지 않습니다.', 'no_docs_checked_out' => '체크아웃 문서가 없습니다.', @@ -1306,6 +1307,8 @@ URL : [url]', 'settings_enableReceiptWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.', 'settings_enableRecursiveCount' => '재귀적 문서 / 폴더 수 사용', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '문서의 개정 허용', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 5796aba51..e53d12553 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -839,6 +839,7 @@ URL: [url]', 'no_action' => 'ບໍ່ຕ້ອງດຳເນີນການໄດໆ', 'no_approval_needed' => 'ຍັງບໍ່ມີການອະນຸມັດ', 'no_attached_files' => 'ບໍ່ມີການແນບໄຟລມາ', +'no_backup_dir' => '', 'no_current_version' => 'ເຈົ້າກຳລັງນຳໄຊ້ເວີຊັນເກົ່າຄື ຊິສ DMS. ສວນເວີຊັນທີ່ມີຢູ່ລ້າສຸດຄື [latestversion]', 'no_default_keywords' => 'ບໍ່ມີຄຳຫລັກ', 'no_docs_checked_out' => 'ບໍ່ມີເອກະສານທີ່ເອົາອອກໄປ', @@ -1339,6 +1340,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'ເປີດໄຊ້ງານການນັບເອກະສານ/ໂຟລເດີນັບຊໍ້າ', 'settings_enableRecursiveCount_desc' => 'ຫາກເປີດໄຊ້ງານຈຳນວນເອກະສານແລະໂຟລເດີໃນມຸມມອງຂອງໂຟລເດີຈະຖືກກຳນົດໂດຍນັບວັດຖຸທັງໝົດໂດຍປະມວນຜົນໂຟລເດີໂຟລເດີຊຳ, ນັບເກະສານ ແລະໂຟລເດີທີຜູ້ໄຊ້ສາມາດເຂົ້າເຖິງໄດ້', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'ເປີກການໄຊ້ງານການແກ້ໄຂເອກະສານ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 0a58e0506..20bc78f30 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (770), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (772), gijsbertush (651), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( '2_factor_auth' => '2-factor-authenticatie', @@ -833,6 +833,7 @@ URL: [url]', 'no_action' => 'Geen actie nodig', 'no_approval_needed' => 'Geen goedkeuring gaande.', 'no_attached_files' => 'Geen bijlagen', +'no_backup_dir' => '', 'no_current_version' => 'U werkt met een oude versie van SeedDMS. De laatste versie beschikbaar is [latestversion].', 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar', 'no_docs_checked_out' => 'Geen documenten in gebruik genomen', @@ -955,7 +956,7 @@ URL: [url]', 'receipt_status' => 'Status ontvangst', 'receipt_summary' => 'Samenvatting', 'receipt_update_failed' => 'Update ontvangst mislukt', -'recent_uploads' => '', +'recent_uploads' => 'Recent Uploads', 'reception' => 'bestemming', 'reception_acknowleged' => 'bestemming OK', 'reception_noaction' => 'Geen actie', @@ -1336,6 +1337,8 @@ Name: [username] 'settings_enableReceiptWorkflow_desc' => 'Aanzetten workflow-stappen', 'settings_enableRecursiveCount' => 'Document/ map teller herhalen toestaan', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Herzieningsworkflow aanzetten', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 4716d5be8..75913e9ef 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (831), netixw (84), romi (93), uGn (112) +// Translators: Admin (832), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -822,6 +822,7 @@ URL: [url]', 'no_action' => 'Żadne działanie nie jest wymagane', 'no_approval_needed' => 'Nie ma dokumentów oczekujących na akceptację.', 'no_attached_files' => 'Brak załączonych plików', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => 'Nie ma słów kluczowych', 'no_docs_checked_out' => '', @@ -932,7 +933,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Najnowsze dodania', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1270,6 +1271,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Włącz licznik rekurencji dokumentu/folderu', 'settings_enableRecursiveCount_desc' => 'Jeżeli jest włączone, to liczba dokumentów i folderów w widoku będzie ustalona poprzez zliczenie wszystkich obiektów przez rekurencyjnie przetwarzane foldery i policzenia tych dokumentów i folderów do których użytkownik ma dostęp', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 790e080b6..46e715528 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1719), flaviove (627), lfcristofoli (352) +// Translators: Admin (1721), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => 'Autenticação de dois fatores', @@ -859,6 +859,7 @@ URL: [url]', 'no_action' => 'Nenhuma ação é requerida', 'no_approval_needed' => 'Nenhuma aprovação pendente.', 'no_attached_files' => 'Não há arquivos anexados', +'no_backup_dir' => '', 'no_current_version' => 'Você está executando uma versão antiga do SeedDMS. A última versão disponível é [latestversion].', 'no_default_keywords' => 'não há palavras-chave disponíveis', 'no_docs_checked_out' => 'Nenhum documento retirado', @@ -980,7 +981,7 @@ URL: [url]', 'receipt_status' => 'Estado', 'receipt_summary' => 'Resumo da entrada', 'receipt_update_failed' => 'Confirmação de entrada falhou', -'recent_uploads' => '', +'recent_uploads' => 'Uploads recentes', 'reception' => 'Entrada', 'reception_acknowleged' => 'Entrada reconhecida', 'reception_noaction' => 'Nenhuma ação', @@ -1358,8 +1359,10 @@ Nome: [username] 'settings_enableReceiptWorkflow_desc' => 'Habilitar para ativar o fluxo de trabalho para confirmar a entrada do documento.', 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva', 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.', -'settings_enableRevisionOnVoteReject' => 'Rejeitar por um revisor', -'settings_enableRevisionOnVoteReject_desc' => 'Se definido, o documento será rejeitado se um revisor rejeitar o documento.', +'settings_enableRevisionOneVoteReject' => 'Rejeitar por um revisor', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Habilitar revisão de documentos', 'settings_enableRevisionWorkflow_desc' => 'Habilitar para poder executar o fluxo de trabalho para revisar um documento após um determinado período de tempo.', 'settings_enableSelfReceipt' => 'Permitir a recepção de documentos para usuário conectado', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index fab5e2718..eae81c265 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1086), balan (87) +// Translators: Admin (1087), balan (87) $text = array( '2_factor_auth' => '', @@ -834,6 +834,7 @@ URL: [url]', 'no_action' => 'Nici o acțiune necesară', 'no_approval_needed' => 'Nici o aprobare în așteptare.', 'no_attached_files' => 'Nu sunt fișiere atașate', +'no_backup_dir' => '', 'no_current_version' => 'Utilizați o versiune veche de SeedDMS. Cea mai recentă versiune disponibilă este [latestversion].', 'no_default_keywords' => 'Nu există cuvinte cheie disponibile', 'no_docs_checked_out' => 'Nu exista documente verificate', @@ -944,7 +945,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Incarcari recente', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1313,6 +1314,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Activați numararea recursiva pentru documente/foldere', 'settings_enableRecursiveCount_desc' => 'Dacă este activată, numărul de documente și foldere din vizualizarea unui director va fi determinat prin numărarea tuturor obiectelor recursiv din folderele unde accesul utilizatorului este permis.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 164a90bb5..94cc06907 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1669) +// Translators: Admin (1671) $text = array( '2_factor_auth' => 'Двухфакторная аутентификация', @@ -531,7 +531,7 @@ URL: [url]', 'extension_manager' => 'Управление расширениями', 'extension_mgr_installed' => '', 'extension_mgr_no_upload' => '', -'extension_mgr_repository' => '', +'extension_mgr_repository' => 'Установленные', 'extension_version_list' => '', 'february' => 'Февраль', 'file' => 'Файл', @@ -833,6 +833,7 @@ URL: [url]', 'no_action' => 'Действие не требуется', 'no_approval_needed' => 'Утверждение не требуется', 'no_attached_files' => 'Нет вложений', +'no_backup_dir' => '', 'no_current_version' => 'Вы используете старую версию SeedDMS. Последняя доступная версия [latestversion].', 'no_default_keywords' => 'Нет меток', 'no_docs_checked_out' => 'Нет документов на рассмотрении', @@ -946,7 +947,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => 'Сводка по получению', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Последние загрузки', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1320,6 +1321,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => 'Включить для активации функции подтверждения получения документа', 'settings_enableRecursiveCount' => 'Рекурсивно подсчитывать
документы и каталоги', 'settings_enableRecursiveCount_desc' => 'Если включено, количество документов и каталогов в виде каталога будет определятся рекурсивным подсчётом всех документов и каталогов разрешённых для доступа пользователя.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Включить процесс ревизии', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 652190545..752d1e628 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1225), destinqo (19), pS2017 (508), ssebech (4) +// Translators: Admin (1226), destinqo (19), pS2017 (508), ssebech (4) $text = array( '2_factor_auth' => '2-faktorové overovanie', @@ -860,6 +860,7 @@ URL: [url]', 'no_action' => 'Nič sa nevykoná', 'no_approval_needed' => 'Neprebieha žiadne schvaľovanie.', 'no_attached_files' => 'Žiadne prílohy', +'no_backup_dir' => '', 'no_current_version' => 'Neaktualizovaná verzia', 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.', 'no_docs_checked_out' => 'No documents checked out', @@ -1360,8 +1361,10 @@ Meno: [username] 'settings_enableReceiptWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableRecursiveCount' => 'Enable recursive document/folder count', 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.', -'settings_enableRevisionOnVoteReject' => 'Reject by one revisor', -'settings_enableRevisionOnVoteReject_desc' => 'If set the document will be reject if one revisor rejects the document.', +'settings_enableRevisionOneVoteReject' => 'Reject by one revisor', +'settings_enableRevisionOneVoteReject_desc' => '', +'settings_enableRevisionOnVoteReject' => '', +'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Povoliť revíziu dokumentov', 'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.', 'settings_enableSelfReceipt' => 'Allow reception of documents for logged in user', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 1607dd21f..327b150f0 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1160), MagnusI (649), tmichelfelder (106) +// Translators: Admin (1161), MagnusI (649), tmichelfelder (106) $text = array( '2_factor_auth' => '2-faktors autentisering', @@ -847,6 +847,7 @@ URL: [url]', 'no_action' => 'Ingen åtgärd behövs.', 'no_approval_needed' => 'Inget godkännande behövs.', 'no_attached_files' => 'Inga filer har bifogats.', +'no_backup_dir' => '', 'no_current_version' => 'Du har en gammal version av SeedDMS. Senaste versionen är [latestversion].', 'no_default_keywords' => 'Inga nyckelord tillgängliga', 'no_docs_checked_out' => 'Inga utcheckade dokument', @@ -954,7 +955,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.', 'receipt_status' => 'Status', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Senast uppladdat', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => 'Ingen åtgärd', @@ -1333,6 +1334,8 @@ Kommentar: [comment]', 'settings_enableReceiptWorkflow_desc' => 'Aktivera notifiering av meddelanden i arbetsflödet.', 'settings_enableRecursiveCount' => 'Aktivera rekursiv räkning av dokument/katalog', 'settings_enableRecursiveCount_desc' => 'Om detta sätts på, kommer antal dokument och kataloger i katalogvyn fastställas genom att räkna alla objekter via rekursiv hantering av alla kataloger och räkna dessa dokument och kataloger som användaren har rättigheter till.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Aktivera revidering av dokument', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index fa3a9b4ca..63b1ba7a3 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1087), aydin (83) +// Translators: Admin (1089), aydin (83) $text = array( '2_factor_auth' => '', @@ -828,6 +828,7 @@ URL: [url]', 'no_action' => 'İşlem gerekmiyor', 'no_approval_needed' => 'Onay bekleyen yok.', 'no_attached_files' => 'Ek dosya yok', +'no_backup_dir' => '', 'no_current_version' => 'Kullandığınız SeedDMS versiyonu eski görünüyor. Son versiyon [latestversion].', 'no_default_keywords' => 'Anahtar kelime yok', 'no_docs_checked_out' => '', @@ -940,7 +941,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'En son yüklenenler', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1292,6 +1293,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => 'Özyinelenen doküman/klasör sayımını etkinleştir', 'settings_enableRecursiveCount_desc' => 'Aktif hale getirildiğinde, klasör içindeki dokümanlar ve diğer klasörlerin sayısı kullanıcının erişim hakkı olan tüm nesnelerin özyinelemeli olarak sayılması yolu ile bulunur.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 1379c1e32..2d6dc128c 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1338) +// Translators: Admin (1339) $text = array( '2_factor_auth' => '', @@ -833,6 +833,7 @@ URL: [url]', 'no_action' => 'Дій не потрібно', 'no_approval_needed' => 'Затвердження не потрібно', 'no_attached_files' => 'Немає додатків', +'no_backup_dir' => '', 'no_current_version' => 'Ви використовуєте застарілу версію SeedDMS. Остання версія [latestversion].', 'no_default_keywords' => 'Немає ключових слів', 'no_docs_checked_out' => 'Немає документів на опрацюванні', @@ -946,7 +947,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => 'Підсумки отримання', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Останні завантаження', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1313,6 +1314,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу', 'settings_enableRecursiveCount' => 'Рекурсивно підраховувати
документи і каталоги', 'settings_enableRecursiveCount_desc' => 'Якщо увімкнено, кількість документів і каталогів при перегляді каталогу буде підраховано рекурсивно для всіх документів до яких користувач має доступ.', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => 'Увімкнути процес ревізії', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index e688f1a7f..6b1896a55 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (765), archonwang (469), fengjohn (5), yang86 (1) +// Translators: Admin (766), archonwang (469), fengjohn (5), yang86 (1) $text = array( '2_factor_auth' => '双重认证', @@ -830,6 +830,7 @@ URL: [url]', 'no_action' => '无动作请求', 'no_approval_needed' => '无待审核的文件', 'no_attached_files' => '无附件', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => '无关键字', 'no_docs_checked_out' => '文档未签出', @@ -945,7 +946,7 @@ URL: [url]', 'receipt_status' => '状态', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => '最近上传', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1294,6 +1295,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '启用文档修订记录', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 207cfce69..14e0e47e3 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2417) +// Translators: Admin (2418) $text = array( '2_factor_auth' => '', @@ -731,6 +731,7 @@ URL: [url]', 'no_action' => '無動作請求', 'no_approval_needed' => '無待審核的檔', 'no_attached_files' => '無附件', +'no_backup_dir' => '', 'no_current_version' => '', 'no_default_keywords' => '無關鍵字', 'no_docs_checked_out' => '', @@ -827,7 +828,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => '最近上傳', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -1143,6 +1144,8 @@ URL: [url]', 'settings_enableReceiptWorkflow_desc' => '', 'settings_enableRecursiveCount' => '', 'settings_enableRecursiveCount_desc' => '', +'settings_enableRevisionOneVoteReject' => '', +'settings_enableRevisionOneVoteReject_desc' => '', 'settings_enableRevisionOnVoteReject' => '', 'settings_enableRevisionOnVoteReject_desc' => '', 'settings_enableRevisionWorkflow' => '', From 296e55e4814bdcc0b0a4d71871f4be27b9547c63 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 22 Oct 2019 06:57:08 +0200 Subject: [PATCH 080/198] add update of italian translation to 5.1.13 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b9d21eb00..66d9ed9b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ set to 'traditional without review'. - turn off auto complete for date fields - new hook pageNavigationBar in bootstrap, preContent, postContent in ViewDocument +- major update of italian translation -------------------------------------------------------------------------------- Changes in version 5.1.12 From 40dee4b9d2f9b8910bc71899597134c8cc570187 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Oct 2019 09:05:04 +0200 Subject: [PATCH 081/198] hook addDocumentContentAttribute and addDocumentAttribute may return a string --- views/bootstrap/class.AddDocument.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 7d4c25ee9..156ba0904 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -285,6 +285,8 @@ $(document).ready(function() { if($arr) { $this->formField($arr[0], $arr[1]); } + } elseif(is_string($arr)) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, '')); } @@ -342,6 +344,8 @@ $(document).ready(function() { $arr = $this->callHook('addDocumentContentAttribute', null, $attrdef); if(is_array($arr)) { $this->formField($arr[0], $arr[1]); + } elseif(is_string($arr)) { + echo $arr; } else { $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, '', 'attributes_version')); } From 75f3afdc84d63d28f297ad6bcf2ecf8ee0f502f6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Oct 2019 09:06:19 +0200 Subject: [PATCH 082/198] new hooks processConfig and showConfig hook 'showConfig' is anly called for extension variables if the type is set to 'hook'. 'processConfig' is called after the extension configuration is read --- views/bootstrap/class.Settings.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index c627bf913..a83cdf384 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -474,6 +474,8 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> $extconf) { + if($this->hasHook('processConfig')) + $extconf = $this->callHook('processConfig', $extname, $extconf); if($extconf['config']) { $this->showRawConfigHeadline("".$extconf['title']); foreach($extconf['config'] as $confkey=>$conf) { @@ -565,11 +567,14 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); } } break; + case 'hook': + echo $this->callHook('showConfig', $confkey, $extname, $extconf); + break; default: $this->showTextField("extensions[".$extname."][".$confkey."]", isset($settings->_extensions[$extname][$confkey]) ? $settings->_extensions[$extname][$confkey] : '', isset($conf['type']) ? $conf['type'] : '', isset($conf['placeholder']) ? $conf['placeholder'] : ''); } $html = ob_get_clean(); - $this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html); + $this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html); } } } From 38f2759c5fcef1d7dfd3fe4f904fefb076c9d7eb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Oct 2019 09:08:53 +0200 Subject: [PATCH 083/198] extension config vars are only save to settings.xml if a value is set previously even empty values has been saved, they just needed to be defined in the extension configuration. This may break extensions which do not check if a config var is set. --- inc/inc.ClassSettings.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 6eb59977d..5561d2fd4 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -1039,12 +1039,27 @@ class Settings { /* {{{ */ { // search XML node $extnode = $extnodes->addChild('extension'); - $this->setXMLAttributValue($extnode, 'name', $name); + $this->setXMLAttributValue($extnode, 'name', $name); + /* New code saves all parameters of the extension which have been set + * in configuration form. + */ + foreach($extension as $fieldname=>$confvalue) { + if($confvalue) { + $parameter = $extnode->addChild('parameter'); + $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; + $this->setXMLAttributValue($parameter, 'name', $fieldname); + } + } + /* Old code saves those parameters listed in the configuration + * of the extension. + */ + /* foreach($GLOBALS['EXT_CONF'][$name]['config'] as $fieldname=>$conf) { $parameter = $extnode->addChild('parameter'); $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; $this->setXMLAttributValue($parameter, 'name', $fieldname); } + */ } // foreach From ee88f44693067944ad3f70075cc1cb4fa0fd2ddb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 09:14:07 +0100 Subject: [PATCH 084/198] fix php warning $iRev is probably not needed anymore, but kept for now --- views/bootstrap/class.MyDocuments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index a3a25d66a..9e5da1249 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -143,12 +143,12 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $docIdx[$res["id"]][$res["version"]] = $res; } + $iRev = array(); // List the documents where a review has been requested. if($workflowmode == 'traditional') { $this->contentHeading(getMLText("documents_to_review")); $this->contentContainerStart(); $printheader=true; - $iRev = array(); $dList = array(); foreach ($reviewStatus["indstatus"] as $st) { From b705fdab44f599b8838451f08642bb9bbd058b42 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 09:26:35 +0100 Subject: [PATCH 085/198] fix up to parent button on ViewFolder page --- views/bootstrap/class.ViewFolder.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index b45acfff2..ab433cfeb 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -163,6 +163,15 @@ console.log("location: " + document.location + ", state: " + JSON.stringify(even console.log(JSON.stringify(event.state)); window.location = document.location; }; +/* catch click on 'goto parent button' */ +$('body').on('click', '#goto-parent', function(ev) { + attr_id = $(ev.currentTarget).data('parentid'); + folderSelected(attr_id, ''); + $([document.documentElement, document.body]).animate({ + scrollTop: 200 + }, 200); +}); +/* catch click on a folder row in the list folders and documents */ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) { attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; folderSelected(attr_id, ''); @@ -170,6 +179,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) scrollTop: 200 }, 200); }); +/* catch click on a document row in the list folders and documents */ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; @@ -326,7 +336,7 @@ $('body').on('click', '.order-btn', function(ev) { else { print ""; print "\n\n"; - print "\n"; + print "\n"; print ""; + return "getName(), ENT_QUOTES)."\">"; } /* }}} */ function documentListRowEnd($document) { /* {{{ */ @@ -2422,7 +2422,7 @@ $(document).ready( function() { * @return string starting tr tag for a table */ function folderListRowStart($folder, $class='') { /* {{{ */ - return "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('')."\">"; + return "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('')."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\">"; } /* }}} */ function folderListRowEnd($folder) { /* {{{ */ From b9bbb8739f28ba53a26a6ac046693ac115d6c29c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 19:55:55 +0100 Subject: [PATCH 091/198] add action data (currently not used) --- views/bootstrap/class.ViewFolder.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index ab433cfeb..3feed0202 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -36,6 +36,16 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { + function data() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + + $jsondata = array('name'=>$folder->getName()); + header('Content-Type: application/json'); + echo json_encode($jsondata); + } /* }}} */ + function getAccessModeText($defMode) { /* {{{ */ switch($defMode) { case M_NONE: From ff0d550144657874d506ca11789731fb86c4fec1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 19:56:43 +0100 Subject: [PATCH 092/198] show target and source document/folder when moving on object --- styles/bootstrap/application.js | 54 ++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 217d1c3a7..dfba97ef8 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -20,6 +20,17 @@ chzn_template_func = function (state) { var $newstate = $(html); return $newstate; }; +function escapeHtml(text) { + var map = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''' + }; + + return text.replace(/[&<>"']/g, function(m) { return map[m]; }); +} $(document).ready( function() { /* close popovers when clicking somewhere except in the popover or the * remove icon @@ -166,9 +177,7 @@ $(document).ready( function() { { command: 'addtoclipboard', type: type, id: id }, function(data) { if(data.success) { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') noty({ text: attr_msg, @@ -203,9 +212,7 @@ $(document).ready( function() { { command: 'removefromclipboard', type: type, id: id }, function(data) { if(data.success) { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') noty({ text: attr_msg, @@ -443,9 +450,7 @@ $(document).ready( function() { success: function(data){ if(data.success) { if(element.data('param1') == 'command=clearclipboard') { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') } noty({ @@ -481,16 +486,12 @@ function onAddClipboard(ev) { /* {{{ */ source_type = source_info.type; source_id = source_info.id; formtoken = source_info.formtoken; -// source_type = ev.originalEvent.dataTransfer.getData("type"); -// source_id = ev.originalEvent.dataTransfer.getData("id"); if(source_type == 'document' || source_type == 'folder') { $.get('../op/op.Ajax.php', { command: 'addtoclipboard', type: source_type, id: source_id }, function(data) { if(data.success) { -// $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') $("#main-clipboard").html('Loading').load('../out/out.Clipboard.php?action=mainclipboard') - //$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') $("#menu-clipboard").html('Loading').load('../out/out.Clipboard.php?action=menuclipboard') noty({ text: data.message, @@ -757,6 +758,7 @@ $(document).ready(function() { /* {{{ */ attr_rel = $(e.currentTarget).data('droptarget'); target_type = attr_rel.split("_")[0]; target_id = attr_rel.split("_")[1]; + target_name = $(e.currentTarget).data('name') if(target_type == 'folder') { var files = e.originalEvent.dataTransfer.files; if(files.length > 0) { @@ -769,7 +771,10 @@ $(document).ready(function() { /* {{{ */ formtoken = source_info.formtoken; console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id); if(source_type == 'document') { - bootbox.dialog(trans.confirm_move_document, [{ + var bootbox_message = trans.confirm_move_document; + if(source_info.name) + bootbox_message += "

"+escapeHtml(source_info.name)+' '+escapeHtml(target_name)+"

"; + bootbox.dialog(bootbox_message, [{ "label" : " "+trans.move_document, "class" : "btn-danger", "callback": function() { @@ -810,7 +815,10 @@ $(document).ready(function() { /* {{{ */ url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; // document.location = url; } else if(source_type == 'folder' && source_id != target_id) { - bootbox.dialog(trans.confirm_move_folder, [{ + var bootbox_message = trans.confirm_move_folder; + if(source_info.name) + bootbox_message += "

"+escapeHtml(source_info.name)+' '+escapeHtml(target_name)+"

"; + bootbox.dialog(bootbox_message, [{ "label" : " "+trans.move_folder, "class" : "btn-danger", "callback": function() { @@ -947,8 +955,22 @@ $(document).ready(function() { /* {{{ */ var dragStartInfo = { id : attr_rel.split("_")[1], type : "folder", - formtoken : $(e.target).attr('formtoken') + formtoken : $(e.target).attr('formtoken'), + name: $(e.target).data('name') }; + /* Currently not used + $.ajax({url: '../out/out.ViewFolder.php', + type: 'GET', + dataType: "json", + data: {action: 'data', folderid: attr_rel.split("_")[1]}, + success: function(data) { + if(data) { + dragStartInfo.source = data; + } + }, + timeout: 3000 + }); + */ e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); }); @@ -959,7 +981,8 @@ $(document).ready(function() { /* {{{ */ var dragStartInfo = { id : attr_rel.split("_")[1], type : "document", - formtoken : $(e.target).attr('formtoken') + formtoken : $(e.target).attr('formtoken'), + name: $(e.target).data('name') }; e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); }); @@ -1014,9 +1037,6 @@ $(document).ready(function() { /* {{{ */ source_type = source_info.type; source_id = source_info.id; formtoken = source_info.formtoken; -// source_type = e.originalEvent.dataTransfer.getData("type"); -// source_id = e.originalEvent.dataTransfer.getData("id"); -// formtoken = e.originalEvent.dataTransfer.getData("formtoken"); if(source_type == 'document') { bootbox.dialog(trans.confirm_move_document, [{ "label" : " "+trans.move_document, From 4f28cd19d14801daa5586434638ccc990d2201db Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Nov 2019 15:39:47 +0100 Subject: [PATCH 093/198] show preview for all images supported by browser --- views/bootstrap/class.ViewDocument.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index ffb59411b..27461d1a1 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -384,6 +384,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { contentHeading(getMLText("preview")); ?> From 28e25498664faf90a3aabb4b8ad5653b87deb7e0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Nov 2019 15:22:00 +0100 Subject: [PATCH 094/198] menuTasks returns complete menuItem --- styles/bootstrap/application.js | 2 +- views/bootstrap/class.Bootstrap.php | 9 +++++---- views/bootstrap/class.Tasks.php | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index dfba97ef8..55d587257 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1162,7 +1162,7 @@ $(document).ready(function() { /* {{{ */ if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) || (typeof data.data.review != 'undefined' && review_count != data.data.review.length) || (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) { - $("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') + $("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0; review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0; workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0; diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 95b11d2ea..d8c148740 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -336,11 +336,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if($this->params['enablemenutasks']) { echo "
"; - echo "
    \n"; - echo "
  • \n"; + echo "
    "; +// echo "
      \n"; +// echo "
    • \n"; // echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array())); - echo "
      • \n"; - echo "
    \n"; +// echo "
    • \n"; +// echo "
\n"; echo "
"; //$this->addFooterJS('checkTasks();'); } diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 4a8572366..8146e9beb 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -138,8 +138,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $tasks = $this->__myTasks(); $content = ''; -// $content .= " \n"; + $content .= " \n"; + $content .= " \n"; echo $content; } /* }}} */ From 05f7807b05c71ceae2fa693754816daf7e95ca57 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Nov 2019 15:28:19 +0100 Subject: [PATCH 095/198] use update on div.ajax for updating tasks in menu --- styles/bootstrap/application.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 55d587257..da9d4e291 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -1162,7 +1162,8 @@ $(document).ready(function() { /* {{{ */ if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) || (typeof data.data.review != 'undefined' && review_count != data.data.review.length) || (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) { - $("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') +// $("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500') + $('#menu-tasks > div.ajax').trigger('update', {folderid: seeddms_folder}); approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0; review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0; workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0; From 2b00423225e9263c0da0d72d7891e90bdc157d42 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 07:25:53 +0100 Subject: [PATCH 096/198] get latest version for later checking could be used to filter out older documents --- views/bootstrap/class.RemoveUserFromProcesses.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index f8cca27e3..0d1e7c5ca 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -54,6 +54,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $reviewStatus = $rmuser->getReviewStatus(); $tmpr = array(); foreach($reviewStatus['indstatus'] as $ri) { + $doc = $dms->getDocument($ri['documentID']); + $ri['latest'] = $doc->getLatestContent()->getVersion(); if(isset($tmpr[$ri['status']])) $tmpr[$ri['status']][] = $ri; else @@ -63,6 +65,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $approvalStatus = $rmuser->getApprovalStatus(); $tmpa = array(); foreach($approvalStatus['indstatus'] as $ai) { + $doc = $dms->getDocument($ri['documentID']); + $ai['latest'] = $doc->getLatestContent()->getVersion(); if(isset($tmpa[$ai['status']])) $tmpa[$ai['status']][] = $ai; else From 3a62afd084ee0ee4640770a515c33f3558b4d6e7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 09:34:41 +0100 Subject: [PATCH 097/198] count processes in latest version --- .../class.RemoveUserFromProcesses.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 0d1e7c5ca..ab3d8d27a 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -53,9 +53,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { getReviewStatus(); $tmpr = array(); + $cr = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($reviewStatus['indstatus'] as $ri) { $doc = $dms->getDocument($ri['documentID']); $ri['latest'] = $doc->getLatestContent()->getVersion(); + if($ri['latest'] == $ri['version']) + $cr[$ri['status']]++; if(isset($tmpr[$ri['status']])) $tmpr[$ri['status']][] = $ri; else @@ -64,9 +67,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $approvalStatus = $rmuser->getApprovalStatus(); $tmpa = array(); + $ca = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($approvalStatus['indstatus'] as $ai) { $doc = $dms->getDocument($ri['documentID']); $ai['latest'] = $doc->getLatestContent()->getVersion(); + if($ai['latest'] == $ai['version']) + $ca[$ai['status']]++; if(isset($tmpa[$ai['status']])) $tmpa[$ai['status']][] = $ai; else @@ -77,7 +83,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
@@ -86,7 +92,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
@@ -95,7 +101,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
@@ -105,7 +111,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
@@ -114,7 +120,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
@@ -123,7 +129,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
From 4aef495c03c62e8585c70230ac3f78ac282dfd1b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 10:04:49 +0100 Subject: [PATCH 098/198] fix wrong counting of documents --- views/bootstrap/class.RemoveUserFromProcesses.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index ab3d8d27a..768f09c49 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -69,7 +69,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { $tmpa = array(); $ca = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0); foreach($approvalStatus['indstatus'] as $ai) { - $doc = $dms->getDocument($ri['documentID']); + $doc = $dms->getDocument($ai['documentID']); $ai['latest'] = $doc->getLatestContent()->getVersion(); if($ai['latest'] == $ai['version']) $ca[$ai['status']]++; From 5ab528af72aeb7a6a1747f61e7ad04ff4d7753c7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 10:28:51 +0100 Subject: [PATCH 099/198] many more translation and new keys --- languages/ar_EG/lang.inc | 24 +++++++++++++++++++----- languages/bg_BG/lang.inc | 14 ++++++++++++++ languages/ca_ES/lang.inc | 14 ++++++++++++++ languages/cs_CZ/lang.inc | 14 ++++++++++++++ languages/de_DE/lang.inc | 16 +++++++++++++++- languages/el_GR/lang.inc | 14 ++++++++++++++ languages/en_GB/lang.inc | 16 +++++++++++++++- languages/es_ES/lang.inc | 28 +++++++++++++++++++++------- languages/fr_FR/lang.inc | 18 ++++++++++++++++-- languages/hr_HR/lang.inc | 14 ++++++++++++++ languages/hu_HU/lang.inc | 14 ++++++++++++++ languages/it_IT/lang.inc | 14 ++++++++++++++ languages/ko_KR/lang.inc | 14 ++++++++++++++ languages/lo_LA/lang.inc | 14 ++++++++++++++ languages/nl_NL/lang.inc | 14 ++++++++++++++ languages/pl_PL/lang.inc | 30 ++++++++++++++++++++++-------- languages/pt_BR/lang.inc | 14 ++++++++++++++ languages/ro_RO/lang.inc | 26 ++++++++++++++++++++------ languages/ru_RU/lang.inc | 28 +++++++++++++++++++++------- languages/sk_SK/lang.inc | 14 ++++++++++++++ languages/sv_SE/lang.inc | 14 ++++++++++++++ languages/tr_TR/lang.inc | 14 ++++++++++++++ languages/uk_UA/lang.inc | 14 ++++++++++++++ languages/zh_CN/lang.inc | 14 ++++++++++++++ languages/zh_TW/lang.inc | 14 ++++++++++++++ 25 files changed, 387 insertions(+), 37 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 6a99a05a9..fe76d37c6 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1307) +// Translators: Admin (1311) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'و', 'apply' => 'تطبيق', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'طلب الموافقة تم الغاؤه', @@ -425,13 +428,14 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'ملف من مجلد التجميع', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'رفع سريع', 'drop_files_here' => 'أفلت الملفات هنا!', 'dump_creation' => 'انشاء مستخرج من قاعدة البيانات', 'dump_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف مستخرج من محتوى قاعدة البيانات. بعد انشاء الملف المستخرج سيتم حفظه في مجلد البيانات الخاص بسيرفرك', 'dump_list' => 'ملف مستخرج حالي', 'dump_remove' => 'ازالة الملف المستخرج', -'duplicates' => '', +'duplicates' => 'ﻢﻛﺭﺭﺓ', 'duplicate_content' => '', 'edit' => 'تعديل', 'edit_attributes' => 'تعديل السمات', @@ -913,8 +917,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => 'اقصى مساحة للقرص الصلب تم تعديها بمقدار [bytes]. من فضلك قم بمسح بعض المستندات او اصدارات سابقة منها', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -925,7 +932,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'ﺂﺧﺭ ﺎﻠﻤﻠﻓﺎﺗ ﺎﻠﻣﺮﻓﻮﻋﺓ"', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -978,8 +985,11 @@ URL: [url]', 'reviewer_already_assigned' => 'بالفعل تم تخصيصة كمراجع', 'reviewer_already_removed' => 'بالفعل تم ازالته من عملية المراجعة او تم تقديمه للمراجعة', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'طلب المراجعة تم مسحه', @@ -1007,9 +1017,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1657,8 +1671,8 @@ URL: [url]', 'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_scheduled_revision' => '', -'timeline_skip_status_change_-1' => '', -'timeline_skip_status_change_-3' => '', +'timeline_skip_status_change_-1' => 'ﻡﺮﻓﻮﺿﺓ', +'timeline_skip_status_change_-3' => 'ﻢﻨﺘﻬﻳﺓ', 'timeline_skip_status_change_0' => '', 'timeline_skip_status_change_1' => '', 'timeline_skip_status_change_2' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 83741c002..a35fb8e69 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -86,11 +86,14 @@ $text = array( 'and' => 'и', 'apply' => 'Приложи', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Запитване за утвърждаване за изтрит', @@ -378,6 +381,7 @@ $text = array( 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл от drop папка', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Бърз ъплоуд', 'drop_files_here' => 'Пусни файла тук!', 'dump_creation' => 'Създаване дъмп на БД', @@ -812,8 +816,11 @@ $text = array( 'quota_is_disabled' => '', 'quota_warning' => 'Вашето max. използуване на диска е превишена с [bytes]. Please remove documents or previous versions.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -861,8 +868,11 @@ $text = array( 'reviewer_already_assigned' => 'вече назначено за рецензиране', 'reviewer_already_removed' => 'вече премахнат от списъка с рецензиращи или вече е оставил рецензия', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Запитване за рецензия премахнато', @@ -883,9 +893,13 @@ $text = array( 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 01bcbb405..d7b84ca99 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -86,11 +86,14 @@ $text = array( 'and' => 'i', 'apply' => 'Apply', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Demanda d\'aprovació esborrada', @@ -383,6 +386,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '', 'dropfolder_folder' => 'Carpeta', +'dropfolder_metadata' => '', 'dropupload' => 'Pujada ràpida', 'drop_files_here' => 'Dugui arxius aquí', 'dump_creation' => 'Creació de bolcat de BDD', @@ -817,8 +821,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => '', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -866,8 +873,11 @@ URL: [url]', 'reviewer_already_assigned' => 'Ja està asignat com revisor', 'reviewer_already_removed' => 'Ja ha estat eliminat del procés de revisió o ja ha enviat una revisió', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Petició de revisió eliminada', @@ -888,9 +898,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index bc0faaec4..48e05feb7 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'a', 'apply' => 'Použít', 'approvals_accepted' => '[no_approvals] schválení již schváleno', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] schválení a [no_reviews] recenzí již přijato', 'approvals_and_reviews_not_touched' => '[no_approvals] schválení a [no_reviews] recenzí nejsou dotčeny', 'approvals_and_reviews_rejected' => '[no_approvals] schválení a [no_reviews] recenzí již bylo zamítnuto', 'approvals_not_touched' => '[no_approvals] schválení nebylo dotčeno', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] schválení bylo zamítnuto', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Schválení bez skupiny', 'approvals_without_user' => 'Schválení bez uživatele', 'approval_deletion_email' => 'Zrušení schválení požadavku', @@ -456,6 +459,7 @@ Odkaz je platný do [valid]. 'dropfolderdir_missing' => 'Váš osobní adresář pro drop neexistuje na serveru! Požádejte správce, aby jej vytvořil.', 'dropfolder_file' => 'Soubor z "přetažené" složky', 'dropfolder_folder' => 'Složka rychlého uploadu', +'dropfolder_metadata' => '', 'dropupload' => 'Rychlý upload', 'drop_files_here' => 'Soubory dát sem!', 'dump_creation' => 'Vytvoření zálohy databáze', @@ -955,8 +959,11 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm 'quota_is_disabled' => 'Podpora kvót je v současné době zakázána v nastavení. Nastavení uživatelských kvót nebude mít žádný vliv, dokud se znovu neaktivuje.', 'quota_warning' => 'Vaše maximální využití disku je překročeno o [bajtů]. Prosím, odstraňte dokumenty nebo předchozí verze.', 'receipts_accepted' => '[no_receipts] potvrzení přijetí již přijato', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] potvrzení přijetí nebylo dotčeno', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] potvrzení přijetí odmítnuto', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Potvrzení přijetí bez skupiny', 'receipts_without_user' => 'Potvrzení přijetí bez uživatele', 'receipt_deletion_email_body' => 'Uživatel byl ze seznamu příjemců odebrán @@ -1038,8 +1045,11 @@ URL: [url]', 'reviewer_already_assigned' => 'je už pověřen jako recenzent', 'reviewer_already_removed' => 'už byl odstraněn z procesu recenzí nebo poslal recenzi', 'reviews_accepted' => '[no_reviews] recenzí již přijato', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] recenzí nebylo dotčeno', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] recenzí již bylo zamítnuto', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Recenze bez skupiny', 'reviews_without_user' => 'Recenze bez uživatele', 'review_deletion_email' => 'Žádost na recenzi odstraněn', @@ -1076,9 +1086,13 @@ URL: [url]', 'revise_document' => 'Revize dokumentu', 'revise_document_on' => 'Další revize verze dokumentu v [date]', 'revisions_accepted' => '[no_revisions] již přijato', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revizí nebylo dotčeno', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revizí teprve proběhne', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revizí bylo odmítnuto', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revize bez skupiny', 'revisions_without_user' => 'Revize bez uživatele', 'revision_date' => 'Datum revize', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 0add1a8b1..ac3564de0 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2699), dgrutsch (22) +// Translators: Admin (2717), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'und', 'apply' => 'Anwenden', 'approvals_accepted' => '[no_approvals] Freigaben', +'approvals_accepted_latest' => '(davon [no_approvals] in letzter Version)', 'approvals_and_reviews_accepted' => '[no_approvals] Freigaben und [no_reviews] Prüfungen', 'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offene Prüfungen', 'approvals_and_reviews_rejected' => '[no_approvals] abgelehnte Freigaben und [no_reviews] abgelehnte Prüfungen', 'approvals_not_touched' => '[no_approvals] offene Freigaben', +'approvals_not_touched_latest' => '(davon [no_approvals] in letzter Version)', 'approvals_rejected' => '[no_approvals] abgelehnte Freigaben', +'approvals_rejected_latest' => '(davon [no_approvals] in letzter Version)', 'approvals_without_group' => 'Freigaben ohne Gruppe', 'approvals_without_user' => 'Freigaben ohne Benutzer', 'approval_deletion_email' => 'Freigabeaufforderung gelöscht', @@ -455,6 +458,7 @@ Der Link ist bis zum [valid] gültig. 'dropfolderdir_missing' => 'Ihr persönlicher Ablageordner auf dem Server existiert nicht! Kontaktieren Sie den Administrator, um in anlegen zu lassen.', 'dropfolder_file' => 'Datei aus Ablageordner', 'dropfolder_folder' => 'Ordner aus Ablageordner', +'dropfolder_metadata' => '', 'dropupload' => 'Direkt Hochladen', 'drop_files_here' => 'Dateien hier hin ziehen!', 'dump_creation' => 'DB dump erzeugen', @@ -957,8 +961,11 @@ Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren 'quota_is_disabled' => 'Quota-Unterstützung ist zur Zeit ausgeschaltet. Benutzer-Quota werden ignoriert bis Quota-Unterstützung in den Einstellungen eingeschaltet wird.', 'quota_warning' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten. Bitte löschen Sie Dokumente oder ältere Versionen.', 'receipts_accepted' => '[no_receipts] Empfangsbestätigungen', +'receipts_accepted_latest' => '(davon [no_receipts] in letzter Version)', 'receipts_not_touched' => '[no_receipts] offene Empfangsbestätigungen', +'receipts_not_touched_latest' => '(davon [no_receipts] in letzter Version)', 'receipts_rejected' => '[no_receipts] abgelehnte Empfangsbestätigungen', +'receipts_rejected_latest' => '(davon [no_receipts] in letzter Version)', 'receipts_without_group' => 'Empfangsbestätigungen ohne Gruppe', 'receipts_without_user' => 'Empfangsbestätigungen ohne Benutzer', 'receipt_deletion_email_body' => 'Benutzer von Liste der Empfänger gelöscht @@ -1040,8 +1047,11 @@ URL: [url]', 'reviewer_already_assigned' => 'Prüfer bereits zugewiesen', 'reviewer_already_removed' => 'Prüfer wurde bereits aus dem Prüfvorgang entfernt oder hat die Prüfung bereits abgeschlossen', 'reviews_accepted' => '[no_reviews] Prüfungen', +'reviews_accepted_latest' => '(davon [no_reviews] in letzter Version)', 'reviews_not_touched' => '[no_reviews] offene Prüfungen', +'reviews_not_touched_latest' => '(davon [no_reviews] in letzter Version)', 'reviews_rejected' => '[no_reviews] abgelehnte Prüfungen', +'reviews_rejected_latest' => '(davon [no_reviews] in letzter Version)', 'reviews_without_group' => 'Prüfungen ohne Gruppe', 'reviews_without_user' => 'Prüfungen ohne Benutzer', 'review_deletion_email' => 'Prüfungsaufforderung gelöscht', @@ -1079,9 +1089,13 @@ URL: [url]', 'revise_document' => 'Wiederholungsprüfung', 'revise_document_on' => 'Nächste Wiederholungsprüfung des Dokuments am [date]', 'revisions_accepted' => '[no_revisions] Wiederholungsprüfungen', +'revisions_accepted_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_not_touched' => '[no_revisions] offene Wiederholungspüfungen', +'revisions_not_touched_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_pending' => '[no_revisions] zukünftige Wiederholungsprüfungen', +'revisions_pending_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_rejected' => '[no_revisions] abgelehnte Wiederholungsprüfungen', +'revisions_rejected_latest' => '(davon [no_revisions] in letzter Version)', 'revisions_without_group' => 'Wiederholungsprüfungen ohne Gruppe', 'revisions_without_user' => 'Wiederholungsprüfungen ohne Benutzer', 'revision_date' => 'Datum der Wiederholungsprüfung', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 82a7b9a2b..8a12d392a 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -86,11 +86,14 @@ $text = array( 'and' => 'και', 'apply' => 'Apply', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => '', @@ -378,6 +381,7 @@ $text = array( 'dropfolderdir_missing' => '', 'dropfolder_file' => '', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Γρήγορη Προσθήκη', 'drop_files_here' => 'Προσθέστε έγγραφα εδώ!', 'dump_creation' => '', @@ -823,8 +827,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => '', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -872,8 +879,11 @@ URL: [url]', 'reviewer_already_assigned' => '', 'reviewer_already_removed' => '', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '', @@ -894,9 +904,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index b48452290..50e9f528f 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1793), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1813), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'and', 'apply' => 'Apply', 'approvals_accepted' => '[no_approvals] approvals already accepted', +'approvals_accepted_latest' => '(being [no_approvals] in latest version)', 'approvals_and_reviews_accepted' => '[no_approvals] approvals and [no_reviews] reviews already accepted', 'approvals_and_reviews_not_touched' => '[no_approvals] approvals and [no_reviews] reviews not being touched', 'approvals_and_reviews_rejected' => '[no_approvals] approvals and [no_reviews] reviews already rejected', 'approvals_not_touched' => '[no_approvals] approvals not being touched', +'approvals_not_touched_latest' => '(being [no_approvals] in latest version)', 'approvals_rejected' => '[no_approvals] approvals already rejected', +'approvals_rejected_latest' => '(being [no_approvals] in latest version)', 'approvals_without_group' => 'Approvals without group', 'approvals_without_user' => 'Approvals without user', 'approval_deletion_email' => 'Approval request deleted', @@ -456,6 +459,7 @@ The link is valid until [valid]. 'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.', 'dropfolder_file' => 'File from drop folder', 'dropfolder_folder' => 'Folder from drop folder', +'dropfolder_metadata' => 'Metadata of the drop folder', 'dropupload' => 'Fast upload', 'drop_files_here' => 'Drop files here!', 'dump_creation' => 'DB dump creation', @@ -959,8 +963,11 @@ If you have still problems to login, then please contact your administrator.', 'quota_is_disabled' => 'Quota support is currently disabled in the settings. Setting a user quota will have no effect until it is enabled again.', 'quota_warning' => 'Your maximum disc usage is exceeded by [bytes]. Please remove documents or previous versions.', 'receipts_accepted' => '[no_receipts] receipts already accepted', +'receipts_accepted_latest' => '(being [no_receipts] in latest version)', 'receipts_not_touched' => '[no_receipts] receipts not being touched', +'receipts_not_touched_latest' => '(being [no_receipts] in latest version)', 'receipts_rejected' => '[no_receipts] receipts already rejected', +'receipts_rejected_latest' => '(being [no_receipts] in latest version)', 'receipts_without_group' => 'Receipts without group', 'receipts_without_user' => 'Receipts without user', 'receipt_deletion_email_body' => 'User has been removed from the list of recipients @@ -1042,8 +1049,11 @@ URL: [url]', 'reviewer_already_assigned' => 'User is already assigned as a reviewer', 'reviewer_already_removed' => 'Reviewer has already been removed from review process or has already submitted a review', 'reviews_accepted' => '[no_reviews] reviews already accepted', +'reviews_accepted_latest' => '(being [no_reviews] in latest version)', 'reviews_not_touched' => '[no_reviews] reviews not being touched', +'reviews_not_touched_latest' => '(being [no_reviews] in latest version)', 'reviews_rejected' => '[no_reviews] reviews already rejected', +'reviews_rejected_latest' => '(being [no_reviews] in latest version)', 'reviews_without_group' => 'Reviews without group', 'reviews_without_user' => 'Reviews without user', 'review_deletion_email' => 'Review request deleted', @@ -1081,9 +1091,13 @@ URL: [url]', 'revise_document' => 'Revise document', 'revise_document_on' => 'Next revision of document version on [date]', 'revisions_accepted' => '[no_revisions] revisions already accepted', +'revisions_accepted_latest' => '(being [no_revisions] in latest version)', 'revisions_not_touched' => '[no_revisions] revisions not being touched', +'revisions_not_touched_latest' => '(being [no_revisions] in latest version)', 'revisions_pending' => '[no_revisions] revisions due in future', +'revisions_pending_latest' => '(being [no_revisions] in latest version)', 'revisions_rejected' => '[no_revisions] revisions already rejected', +'revisions_rejected_latest' => '(being [no_revisions] in latest version)', 'revisions_without_group' => 'Revisions without group', 'revisions_without_user' => 'Revisions without user', 'revision_date' => 'Date of revision', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 3aa3b6912..4a9d982fd 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (1124), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (1130), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'y', 'apply' => 'Aplicar', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Petición de aprobación eliminada', @@ -431,7 +434,8 @@ URL: [url]', 'drag_icon_here' => 'Arrastre carpeta o documento aquí!', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fichero de la carpeta destino', -'dropfolder_folder' => '', +'dropfolder_folder' => 'Carpeta de la carpeta destino', +'dropfolder_metadata' => '', 'dropupload' => 'Carga Rapida', 'drop_files_here' => 'Arrastre archivos aquí!', 'dump_creation' => 'Creación de volcado de BDD', @@ -621,7 +625,7 @@ URL: [url]', 'importfs' => '', 'import_extension' => '', 'import_fs' => 'Importar desde sistema de archivos', -'import_fs_warning' => '', +'import_fs_warning' => 'Esto funciona únicamente con carpetas dentro de la carpeta destino. La operación importa recursivamente todos los archivos y carpetas. Los archivos serán liberados inmediatamente.', 'include_content' => '', 'include_documents' => 'Incluir documentos', 'include_subdirectories' => 'Incluir subcarpetas', @@ -928,8 +932,11 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado 'quota_is_disabled' => 'La cuota está actualmente deshabilitada en las opciones. Establecer una cuota de usuario no tendrá efecto hasta que sea habilitada de nuevo.', 'quota_warning' => 'El máximo de uso de disco se ha excedido en [bytes]. Por favor eliminar documentos o versiones anteriores.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -969,7 +976,7 @@ Carpeta principal: [folder_path] Usuario: [username] nURL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - Eliminar flujo de trabajo de la versión del documento', -'removeFolderFromDropFolder' => '', +'removeFolderFromDropFolder' => 'Eliminar carpeta después de importar', 'remove_marked_files' => 'Eliminar ficheros marcados', 'repaired' => 'Reparado', 'repairing_objects' => 'Reparando documentos y carpetas.', @@ -993,8 +1000,11 @@ nURL: [url]', 'reviewer_already_assigned' => 'Ya está asignado como revisor', 'reviewer_already_removed' => 'Ya ha sido eliminado del proceso de revisión o ya ha enviado una revisión', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Petición de revisión eliminada', @@ -1022,9 +1032,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1151,8 +1165,8 @@ URL: [url]', 'seq_keep' => 'Mantener posición', 'seq_start' => 'Primera posición', 'sessions' => '', -'setDateFromFile' => '', -'setDateFromFolder' => '', +'setDateFromFile' => 'Obtiene la fecha del archivo importado', +'setDateFromFolder' => 'Obtiene la fecha de la carpeta importada', 'settings' => 'Configuración', 'settings_activate_module' => 'Activar módulo', 'settings_activate_php_extension' => 'Activar extensión PHP', @@ -1390,7 +1404,7 @@ URL: [url]', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', 'settings_no_content_dir' => 'Carpeta de contenidos', -'settings_onePageMode' => '', +'settings_onePageMode' => 'Modo una página', 'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Anular MimeType', 'settings_overrideMimeType_desc' => 'Permitir que SeedDMS fije el tipo MIME sobreescribiendo el que haya definido el navegador durante el proceso de carga de un archivo.', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 0c8661165..dc223ee4a 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1093), jeromerobert (50), lonnnew (9), Oudiceval (755) +// Translators: Admin (1094), jeromerobert (50), lonnnew (9), Oudiceval (755) $text = array( '2_factor_auth' => 'Authentification forte', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'et', 'apply' => 'Appliquer', 'approvals_accepted' => '[no_approvals] approbations déjà confirmées', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] approbations et [no_reviews] vérifications déjà confirmées', 'approvals_and_reviews_not_touched' => '[no_approvals] approbations et [no_reviews] vérifications non amorcées', 'approvals_and_reviews_rejected' => '[no_approvals] approbations et [no_reviews] vérifications déjà rejetées', 'approvals_not_touched' => '[no_approvals] approbations non amorcées', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] approbations déjà rejetées', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Approbations sans groupe', 'approvals_without_user' => 'Approbations sans utilisateur', 'approval_deletion_email' => 'Demande d\'approbation supprimée', @@ -456,6 +459,7 @@ Le lien est valide jusqu’au [valid]. 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.', 'dropfolder_file' => 'Fichier du dossier de dépôt', 'dropfolder_folder' => 'Répertoire du dossier de dépôt', +'dropfolder_metadata' => '', 'dropupload' => 'Téléchargement rapide', 'drop_files_here' => 'Glissez les fichiers ici !', 'dump_creation' => 'Sauvegarder la base de données', @@ -957,8 +961,11 @@ En cas de problème persistant, veuillez contacter votre administrateur.', 'quota_is_disabled' => 'Le support des quotas est actuellement désactivé dans les réglages. Affecter un quota utilisateur n’aura pas d’effet jusqu’à ce qu’il soit de nouveau activé.', 'quota_warning' => 'Votre quota d’espace disque est dépassé de [bytes]. Veuillez supprimer des documents ou d\'anciennes versions.', 'receipts_accepted' => '[no_receipts] réceptions déjà confirmées', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] réceptions non amorcées', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] réceptions déjà rejetées', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Réceptions sans groupe', 'receipts_without_user' => 'Réceptions sans utilisateur', 'receipt_deletion_email_body' => 'L’utilisateur a été retiré de la liste des destinataires @@ -1032,8 +1039,11 @@ URL : [url]', 'reviewer_already_assigned' => 'est déjà déclaré en tant qu’examinateur', 'reviewer_already_removed' => 'L’examinateur a déjà été retiré du processus de vérification ou a déjà soumis la vérification.', 'reviews_accepted' => '[no_reviews] vérifications déjà confirmées', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] vérifications non amorcées', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] vérifications déjà rejetées', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Vérifications sans groupe', 'reviews_without_user' => 'Vérifications sans utilisateur', 'review_deletion_email' => 'Demande de vérification supprimée', @@ -1071,9 +1081,13 @@ URL : [url]', 'revise_document' => 'Réviser le document', 'revise_document_on' => 'Prochaine révision de la version du document le [date]', 'revisions_accepted' => '[no_revisions] révisions déjà confirmées', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] révisions non amorcées', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] révisions à venir en attente', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] révisions déjà rejetées', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Révisions sans groupe', 'revisions_without_user' => 'Révisions sans utilisateur', 'revision_date' => 'Date de révision', @@ -1443,7 +1457,7 @@ Nom : [username] 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', 'settings_no_content_dir' => 'Répertoire de contenu', -'settings_onePageMode' => '', +'settings_onePageMode' => 'Mode une page', 'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Passer outre le type MIME', 'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index b806dde70..0ebfc4e25 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -90,11 +90,14 @@ Internet poveznica: [url]', 'and' => 'i', 'apply' => 'Primjeni', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Izbrisan zahtjev za odobrenje', @@ -437,6 +440,7 @@ Internet poveznica: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Datoteka iz padajuće mape', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Zona za brzo učitavanje', 'drop_files_here' => 'Ovdje ispusti datoteku!', 'dump_creation' => 'Izrada odlagališta baze podataka', @@ -932,8 +936,11 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator 'quota_is_disabled' => 'Podrška kvoti je trenutno onemogućena u postavkama. Postavka korisničke kvote neće imati utjecaja dok se ponovno ne omogući.', 'quota_warning' => 'Vaš maksimalni prostor na disku je premašen za [bytes]. Molimo uklonite dokumente ili prethodne verzije.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1004,8 +1011,11 @@ Internet poveznica: [url]', 'reviewer_already_assigned' => 'je već dodijeljen kao recezent', 'reviewer_already_removed' => 'je već uklonjen iz postupka pregleda ili je već podnijet pregled.', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Izbrisan zahtjev za pregled', @@ -1043,9 +1053,13 @@ Internet poveznica: [url]', 'revise_document' => 'Revidiraj dokument', 'revise_document_on' => 'Slijedeća revizija verzije dokumenta na dan [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => 'Datum revizije', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index fbce10eaf..93408b6c4 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => '-', 'apply' => 'Elfogad', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Jóváhagyási kérelem törölve', @@ -432,6 +435,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Állomány a dropfolder-ből', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Gyors feltöltés', 'drop_files_here' => 'Húzz ide egy fájlt', 'dump_creation' => 'Adatbázis mentés létrehozása', @@ -928,8 +932,11 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a 'quota_is_disabled' => 'Kvóta támogatás jelenleg le van tiltva a beállításoknál. Felhasználói korlát beállítások nem kerülnek érvényesítésre amíg nincs újra engedélyezve.', 'quota_warning' => 'Túllépte lemez korlátot [bytes] bájttal. Kérjük távolítson el dokumentumokat vagy korábbi változatokat.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -993,8 +1000,11 @@ URL: [url]', 'reviewer_already_assigned' => 'már hozzá lett rendelve felülvizsgálóként', 'reviewer_already_removed' => 'már el lett távolítva a felülvizsgálati folyamatból vagy már el lett küldve egy felülvizsgálat', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Felülvizsgálat kérés törölve', @@ -1022,9 +1032,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 4cdcff3f9..dc9d4d604 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'e', 'apply' => 'Applica', 'approvals_accepted' => '[no_approvals] approvazioni già accettate', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] approvazioni e [no_reviews] revisioni già accettate', 'approvals_and_reviews_not_touched' => '[no_approvals] approvazioni e [no_reviews] revisioni non gestite', 'approvals_and_reviews_rejected' => '[no_approvals] approvazioni e [no_reviews] revisioni già rifiutate', 'approvals_not_touched' => '[no_approvals] approvazioni non gestite', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] approvazioni già rifiutate', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Approvazioni senza gruppo', 'approvals_without_user' => 'Approvazioni senza utente', 'approval_deletion_email' => 'Richiesta di approvazione cancellata', @@ -449,6 +452,7 @@ Il collegamento The link è ancora valido fino a [valid]. 'dropfolderdir_missing' => 'La vostra cartella di personale non esiste sul server! Si prega di chiedere all\'amministratore di creare per te.', 'dropfolder_file' => 'Scegli file dal server', 'dropfolder_folder' => 'Cartella per il cartella di ricezione', +'dropfolder_metadata' => '', 'dropupload' => 'Caricamento rapido', 'drop_files_here' => 'Trascina qui il file', 'dump_creation' => 'Creazione del dump del DB', @@ -945,8 +949,11 @@ Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.', 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.', 'receipts_accepted' => '[no_receipts] ricevute già accettate', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] ricevute non gestite', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] ricevute già rifiutate', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Ricevute senza gruppo', 'receipts_without_user' => 'Ricevute senza gruppo', 'receipt_deletion_email_body' => 'Utente rimosso dall\'elenco dei destinatari @@ -1028,8 +1035,11 @@ URL: [url]', 'reviewer_already_assigned' => 'è già assegnato come revisore', 'reviewer_already_removed' => 'è già stato rimosso dal processo di revisione oppure ha già inserito una revisione.', 'reviews_accepted' => '[no_reviews] revisioni già accettate', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] revisioni non gestite', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] revisioni già rifiutate', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Revisioni senza gruppo', 'reviews_without_user' => 'Revisioni senza utente', 'review_deletion_email' => 'Richiesta di revisione cancellata', @@ -1067,9 +1077,13 @@ URL: [url]', 'revise_document' => 'Riesamina documento', 'revise_document_on' => 'Prossimo riesame del documento il [date]', 'revisions_accepted' => '[no_reviews] riesami già accettati', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_reviews] riesami non gestiti', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_reviews] riesami pendenti', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_reviews] riesami già rifiutati', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Riesami senza gruppo', 'revisions_without_user' => 'Riesami senza utente', 'revision_date' => 'data riesame', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 6f6c35321..794f3929f 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => '와', 'apply' => '적용', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] 이미 승인 거부됨', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => '승인 요청 삭제', @@ -438,6 +441,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '드롭 폴더 파일', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => '빠른 업로드', 'drop_files_here' => '이곳에 파일을 올려놓으세요!', 'dump_creation' => 'DB 덤프 생성', @@ -926,8 +930,11 @@ URL : [url]', 'quota_is_disabled' => '할당량 지원이 설정에서 비활성화되어 있습니다. 다시 활성화 될 때까지 사용자의 할당량 설정은 적용되지 않습니다.', 'quota_warning' => '당신의 최대 디스크 사용량 [bytes] 초과됩니다. 문서 또는 이전 버전을 제거하십시오.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -998,8 +1005,11 @@ URL: [url]', 'reviewer_already_assigned' => '해 사용자는 리뷰어로 배정되었습니다.', 'reviewer_already_removed' => '이미 검토 과정에서 제거되었거나 리뷰로 제출', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '검토 요청 삭제됨', @@ -1037,9 +1047,13 @@ URL: [url]', 'revise_document' => '개정 문서', 'revise_document_on' => '문서 버전의 다음 개정 [날짜]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '개정 일자', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index bdd3107b9..514a4673b 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'ແລະ', 'apply' => 'ໃຊ້', 'approvals_accepted' => '[no_approvals] ອະນຸມັດໂດຍບໍ່ຕ້ອງສຳພັດ', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] ອະນຸມັດແລ້ວ ແລະ [no_reviews] ອະນຸມັດແລ້ວ', 'approvals_and_reviews_not_touched' => '[no_approvals] ອະນຸມັດແລ້ວ ແລະ [no_reviews] ການກວດຄືນ ທີບໍ່ມີການສໍາຜັດ', 'approvals_and_reviews_rejected' => '[no_approvals] ອະນຸມັດແລ້ວ ແລະ [no_reviews] ການກວດຄືນໄດ້ຮັບການປະຕິເສດ', 'approvals_not_touched' => '[no_approvals] ອະນຸມັດໂດຍບໍ່ຕ້ອງສຳພັດ', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] ບໍໄດ້ຮັບການອະນຸມັດ', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'ການອະນຸມັດໂດຍບໍ່ຢູ່ໃນກຸ່ມ', 'approvals_without_user' => 'ການອະນຸມັດຍັງບໍ່ໄດ້ຮັບການນຳໄຊ້', 'approval_deletion_email' => 'ຄຳຂໍອະນຸມັດໄດ້ຖືກລົບແລ້ວ', @@ -442,6 +445,7 @@ URL: [url]', 'dropfolderdir_missing' => 'ໂຟລເດີສ່ວນບຸກຄົນຂອງທ່ານບໍໄດ້ຢູ່ໃນເຊີເວີ ກະລຸນາໃຫ້ຜູ້ດູແລລະບົບຂອງເຈົ້າສ້າງຂໍ້ມູນ', 'dropfolder_file' => 'ໄຟລຈາກໂຟລເດີແບບເລືອນລົງ', 'dropfolder_folder' => 'ໂຟລເດີຈາກໂຟລເດີວ່າງ', +'dropfolder_metadata' => '', 'dropupload' => 'ອັບໂຫລດຢ່າງວ່ອງໄວ', 'drop_files_here' => 'ວາງໄຟລທີນີ້!', 'dump_creation' => 'ການສ້າງຂໍ້ມູນ DB', @@ -938,8 +942,11 @@ URL: [url]', 'quota_is_disabled' => 'ຂະນະນີ້ການສະນັບສະໜູນໂຄຕ້າຖືກປິດໄຊ້ງານໃນການຕັ້ງຄ່າແລ້ວການກຳນົດໂຄຕ້າຜູ້ໄຊ້ຈະບໍ່ມີຜົນໄດໆ ຈົນກວ່າຈະເປີດໄຊ້ງານອີກຄັ້ງ', 'quota_warning' => 'ການໄຊ້ດິສສູງສຸດຂອງເຈົ້າເກີນ [ໄບຣ] ໂປດລົບເອກະສານຫຼືເວີຊັນກ່ອນໜ້າ', 'receipts_accepted' => 'ໃບບິນຮັບເງີນໄດ້ຮັບການຍອມຮັບແລ້ວ [ບໍມີໃບບິນຮັບເງິນ]', +'receipts_accepted_latest' => '', 'receipts_not_touched' => 'ບໍ່ມີໃບບິນຮັບເງິນ', +'receipts_not_touched_latest' => '', 'receipts_rejected' => 'ໃບຮັບເງີນ [ບໍ່ມີໃບບິນຮັບເງີນ] ຖືກປະຕິເສດແລ້ວ', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'ບໍ່ມີກຸ່ມໃບບິນຮັບເງີນ', 'receipts_without_user' => 'ໃບບິນຮັບເງີນຍັງບໍ່ມີຜູ້ໄຊ້', 'receipt_deletion_email_body' => 'ຜູ້ໄຊ້ໄດ້ຖືກລົບອອກຈາກລາຍຊື່ຜູ້ຮັບ @@ -1021,8 +1028,11 @@ URL: [url]', 'reviewer_already_assigned' => 'ຜູ້ໄຊ້ໄດ້ຮັບມອບໝາຍໃຫ້ຜູ້ກວດສອບແລ້ວ', 'reviewer_already_removed' => 'ຜູ້ກວດສອບໄດ້ຍ້າຍອອກຈາກການກວດຄືນແລ້ວຫຼືໄດ້ສົ່ງຄຳເຫັນແລ້ວ', 'reviews_accepted' => 'ບໍ່ມີລິວິວ ຄວາມເຫັນທີຍອມຮັບໄດ້', +'reviews_accepted_latest' => '', 'reviews_not_touched' => 'ລີວິວ ບໍ່ມີລີວິວ ບໍ່ໄດ້ຮັບການສຳຜັດ', +'reviews_not_touched_latest' => '', 'reviews_rejected' => 'ບໍ່ມີລີວິວ ຄວາມເຫັນທີຖືກປະຕິເສດແລ້ວ', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'ການທົບທວນໂດຍບໍ່ຢູ່ໃນກຸ່ມ', 'reviews_without_user' => 'ຄວາມເຫັນໂດຍບໍ່ມີຜູ້ໄຊ້', 'review_deletion_email' => 'ລົບຄຳຂໍການກວດກາແລ້ວ', @@ -1060,9 +1070,13 @@ URL: [url]', 'revise_document' => 'ແກ້ໄຂເອກະສານ', 'revise_document_on' => 'ແກ້ໄຂເອກະສານຮູບແບບໄຫມ່ ໃນ ວັນທີ', 'revisions_accepted' => 'ໄດ້ມີການແກ້ໄຂເອກະສານແລ້ວ ບໍ່ມີການແກ້ໄຂ', +'revisions_accepted_latest' => '', 'revisions_not_touched' => 'ບໍ່ມີການແກ້ໄຂ ການແກ້ໄຂບໍ່ຖືກຕ້ອງ', +'revisions_not_touched_latest' => '', 'revisions_pending' => 'ບໍ່ມີການແກ້ໄຂ ການແກ້ໄຂຈະເກີດຂື້ນໃນອານາຄົດ', +'revisions_pending_latest' => '', 'revisions_rejected' => 'ບໍ່ມີການແກ້ໄຂ ການແກ້ໄຂໄດ້ຖືກປະຕິເສດ', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'ການປັບປຸງໂດຍບໍ່ຢູ່ໃນກຸ່ມ', 'revisions_without_user' => 'ການແກ້ໄຂໂດຍບໍ່ມີຜູ້ໄຊ້', 'revision_date' => 'ວັນທີ່ແກ້ໄຂ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 980e33d72..ed3933853 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'en', 'apply' => 'Toepassen', 'approvals_accepted' => '[no_approvals] goedkeuringen', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] goedkeuringen en [no_reviews] geaccepteerde reviews', 'approvals_and_reviews_not_touched' => '[no_approvals] goedkeuringen [no_reviews] reviews nog niet behandeld', 'approvals_and_reviews_rejected' => '[no_approvals] goedkeuringen en [no_reviews] reviews afgekeurd', 'approvals_not_touched' => '[no_approvals] goedkeuringen nog niet behandeld', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] goedkeuringen afgekeurd', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Goedkeuringen zonder groep', 'approvals_without_user' => 'Goedkeuringen zonder gebruiker', 'approval_deletion_email' => 'Goedkeuringsverzoek verwijderd', @@ -437,6 +440,7 @@ De link is geldig tot [valid]. 'dropfolderdir_missing' => 'Uw persoonlijke map om files te droppen (dropfolder) bestaat niet op de server! Vraag de administrator om deze aan te maken.', 'dropfolder_file' => 'Bestand in dropfolder', 'dropfolder_folder' => 'Map in dropfolder', +'dropfolder_metadata' => '', 'dropupload' => 'Snel toevoegen', 'drop_files_here' => 'Sleep bestanden hierheen', 'dump_creation' => 'DB-dump aanmaken', @@ -933,8 +937,11 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con 'quota_is_disabled' => 'Quota support is momenteel niet actief in de eigenschappen. Een user-quotum instellen zal geen effect hebben tot quota actief zijn', 'quota_warning' => 'Uw maximale datagebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.', 'receipts_accepted' => '[no_receipts] ontvangen en geaccepteerd', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] ontvangen, nog niet behandeld', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] ontvangen, geweigerd', +'receipts_rejected_latest' => '', 'receipts_without_group' => '[no_receipts] ontvangen, geen groep', 'receipts_without_user' => '[no_receipts] ontvangen, geen gebruiker', 'receipt_deletion_email_body' => 'Gebruiker is verwijderd uit de lijst van ontvangers @@ -1015,8 +1022,11 @@ URL: [url]', 'reviewer_already_assigned' => 'is reeds aangewezen als beoordelaar', 'reviewer_already_removed' => 'is reeds verwijderd uit het beoordelingsproces of heeft reeds een beoordeling uitgevoerd', 'reviews_accepted' => '[no_reviews] reviews geaccepteerd', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] reviews niet geopend', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] reviews geweigerd', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'reviews zonder groep', 'reviews_without_user' => 'reviews zonder gebruiker', 'review_deletion_email' => 'Beoordelingsverzoek verwijderd', @@ -1053,9 +1063,13 @@ URL: [url]', 'revise_document' => 'Document herzien', 'revise_document_on' => 'Volgende herziening van document op [date]', 'revisions_accepted' => '[no_revisions] revisies geaccepteerd', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revisies geopend', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revisies in afwachting', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revisies geweigerd', +'revisions_rejected_latest' => '', 'revisions_without_group' => '[no_revisions] revisies zonder groep', 'revisions_without_user' => '[no_revisions] revisies zonder gebruiker', 'revision_date' => 'Datum revisie', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 12e0d82b8..c9bff7f10 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (832), netixw (84), romi (93), uGn (112) +// Translators: Admin (840), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'i', 'apply' => 'Zastosuj', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Prośba o akceptację została usunięta', @@ -425,6 +428,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Plik z folderu rozwijanego', 'dropfolder_folder' => 'Katalog ze strefy drop', +'dropfolder_metadata' => '', 'dropupload' => 'Szybki upload', 'drop_files_here' => 'Przeciągnij tu pliki!', 'dump_creation' => 'Utworzenie zrzutu bazy danych', @@ -906,7 +910,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'possible_substitutes' => '', 'preset_expires' => 'Wygasa', 'preview' => 'Podgląd', -'preview_converters' => '', +'preview_converters' => 'Podgląd konwersji dokumentu', 'preview_images' => '', 'preview_markdown' => '', 'preview_pdf' => '', @@ -921,8 +925,11 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem 'quota_is_disabled' => 'Wsparcie limitów dyskowych jest obecnie wyłączone w ustawieniach. Ustawiony limit dyskowy użytkownika nie będzie działał dopóki wparcie nie zostanie ponownie włączone.', 'quota_warning' => 'Przekroczono użycie dysku o [bytes]. Usuń dokumenty lub poprzednie wersje.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -962,7 +969,7 @@ Folder nadrzędny: [folder_path] Użytkownik: [username] URL: [url]', 'removed_workflow_email_subject' => '[sitename]: [name] - Usunięty workflow z wersji dokumentu', -'removeFolderFromDropFolder' => '', +'removeFolderFromDropFolder' => 'Usuń folder po imporcie', 'remove_marked_files' => 'Usuń zaznaczone pliki', 'repaired' => 'naprawiony', 'repairing_objects' => 'Naprawa dokumentów i katalogów.', @@ -979,8 +986,11 @@ URL: [url]', 'reviewer_already_assigned' => 'jest już przypisany jako recenzent', 'reviewer_already_removed' => 'został już usunięty z procesu opiniowania lub już wydał swoją opinię', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Prośba o recenzję usunięta', @@ -1001,9 +1011,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1229,8 +1243,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => 'Zezwalaj na zduplikowane nazwy dokumentów', 'settings_enableDuplicateDocNames_desc' => 'Zezwala na tworzenie w folderze dokumentów o tej samej nazwie.', -'settings_enableDuplicateSubFolderNames' => '', -'settings_enableDuplicateSubFolderNames_desc' => '', +'settings_enableDuplicateSubFolderNames' => 'Zezwól na duplikaty nazw podfolderów', +'settings_enableDuplicateSubFolderNames_desc' => 'Zezwala na zduplikowane nazwy podfolderów w folderze', 'settings_enableEmail' => 'Włącz powiadomienia e-mail', 'settings_enableEmail_desc' => 'Włącz/Wyłącz automatyczne powiadomienia drogą mailową', 'settings_enableFilterReceipt' => '', @@ -1251,7 +1265,7 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.', 'settings_enableMenuTasks' => '', 'settings_enableMenuTasks_desc' => '', -'settings_enableMultiUpload' => '', +'settings_enableMultiUpload' => 'Zezwól na wysyłanie wielu plików', 'settings_enableMultiUpload_desc' => '', 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów', 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu', @@ -1283,7 +1297,7 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu', 'settings_enableSessionList' => '', 'settings_enableSessionList_desc' => '', -'settings_enableThemeSelector' => '', +'settings_enableThemeSelector' => 'Wybór motywu', 'settings_enableThemeSelector_desc' => '', 'settings_enableUpdateReceipt' => '', 'settings_enableUpdateReceipt_desc' => '', @@ -1371,7 +1385,7 @@ URL: [url]', 'settings_no_content_dir' => 'Katalog treści', 'settings_onePageMode' => '', 'settings_onePageMode_desc' => '', -'settings_overrideMimeType' => '', +'settings_overrideMimeType' => 'Nadpisz typ rozszerzenia', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Rozmiar części pliku', 'settings_partitionSize_desc' => 'Rozmiar części pliku, w bajtach, wczytywane przez jumploader. Nie wpisuj wartości większej niż maksymalna wartość wczytywanego pliku ustawiona na serwerze.', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 2f1f1609c..18980a55b 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'e', 'apply' => 'Aplicar', 'approvals_accepted' => '[no_approvals] aprovações já aceitas', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] aprovações e [no_reviews] comentários já aceitos', 'approvals_and_reviews_not_touched' => '[no_approvals] aprovações e [no_reviews] comentários não tocados', 'approvals_and_reviews_rejected' => '[no_approvals] aprovações e [no_reviews] avaliações já rejeitadas', 'approvals_not_touched' => '[no_approvals] aprovações não sendo tocadas', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] aprovações já rejeitadas', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Aprovações sem grupo', 'approvals_without_user' => 'Aprovações sem usuário', 'approval_deletion_email' => 'Solicitação de Aprovação eliminada', @@ -456,6 +459,7 @@ O link é válido até [valid]. 'dropfolderdir_missing' => 'Sua pasta suspensa pessoal não existe no servidor! Por favor, peça ao seu administrador para criá-lo.', 'dropfolder_file' => 'Arquivo de pasta suspensa', 'dropfolder_folder' => 'Pasta da pasta-alvo', +'dropfolder_metadata' => '', 'dropupload' => 'Envio rápido', 'drop_files_here' => 'Solte os arquivos aqui!', 'dump_creation' => 'Criação de despejo de banco de dados', @@ -958,8 +962,11 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ 'quota_is_disabled' => 'Suporte a cota está desativado nas configurações. A definição de cota do usuário não terá efeito até que seja habilitada novamente.', 'quota_warning' => 'Seu uso máximo do disco foi ultrapassado em [bytes]. Por favor, remova documentos ou versões anteriores.', 'receipts_accepted' => '[no_receipts] recibos já aceitos', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] recibos não tocados', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] recibos já rejeitados', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Recibos sem grupo', 'receipts_without_user' => 'Recibos sem usuário', 'receipt_deletion_email_body' => 'O usuário foi removido da lista de destinatários @@ -1041,8 +1048,11 @@ URL: [url]', 'reviewer_already_assigned' => 'já está atribuído como avaliador', 'reviewer_already_removed' => 'já foi removido do processo de revisão ou já enviou um comentário', 'reviews_accepted' => '[no_reviews] avaliações já aceitas', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] avaliações não tocadas', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] avaliações já rejeitadas', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Avaliações sem grupo', 'reviews_without_user' => 'Avaliações sem usuário', 'review_deletion_email' => 'Pedido de revisão eliminado', @@ -1079,9 +1089,13 @@ URL: [url]', 'revise_document' => 'Revisar documento', 'revise_document_on' => 'Próxima revisão da versão do documento em [date]', 'revisions_accepted' => '[no_revisions] revisões já aceitas', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revisões não sendo tocadas', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revisões devidas no futuro', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revisões já rejeitadas', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revisões sem grupo', 'revisions_without_user' => 'Revisões sem usuário', 'revision_date' => 'Data da revisão', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 98d53cc2a..e0726d0ef 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1087), balan (87) +// Translators: Admin (1092), balan (87) $text = array( '2_factor_auth' => '', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'si', 'apply' => 'Aplică', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Cerere de aprobare stearsă', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fișiere din folderele aruncate (File from drop folder)', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Încărcare rapidă', 'drop_files_here' => 'Aruncă fișierele aici!', 'dump_creation' => 'Creare fisier imagine baza de date', @@ -933,8 +937,11 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț 'quota_is_disabled' => 'Spatiu alocat este dezactivată în setări. Stabilirea unui spatiu alocat pentru utilizator nu va avea nici un efect până când setarea este reactivată din nou.', 'quota_warning' => 'Dimensiunea dumneavoastră maximă este depasită cu [bytes]. Vă rugăm să eliminați documente sau versiuni anterioare.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1005,8 +1012,11 @@ URL: [url]', 'reviewer_already_assigned' => 'este deja alocat ca un revizuitor', 'reviewer_already_removed' => 'a fost deja eliminat din procesul de revizuire sau a postat deja o revizuire', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Cerere de revizuire eliminată', @@ -1044,9 +1054,13 @@ URL: [url]', 'revise_document' => 'Revizuiti documentul', 'revise_document_on' => 'Urmatoarea revizuire a versiunii document pe [data]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', @@ -1192,7 +1206,7 @@ URL: [url]', 'settings_autoLoginUser' => 'Login automat', 'settings_autoLoginUser_desc' => '', 'settings_available_languages' => 'Limbi disponibile', -'settings_available_languages_desc' => '', +'settings_available_languages_desc' => 'Numai limbile selectate vor fii incarcate la accesare. Limba default va fii mereu incarcata', 'settings_backupDir' => '', 'settings_backupDir_desc' => '', 'settings_cacheDir' => 'Director Cache', @@ -1545,9 +1559,9 @@ URL: [url]', 'sign_out' => 'Sign out', 'sign_out_user' => 'Sign out utilizator', 'sk_SK' => 'Slovacă', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Sortare dupa data', +'sort_by_name' => 'Sortare dupa nume', +'sort_by_sequence' => 'Sortare dupa numar', 'space_used_on_data_folder' => 'Spatiu folosit în folderul de date', 'splash_added_to_clipboard' => 'Adăugat la clipboard', 'splash_add_access' => '', @@ -1836,7 +1850,7 @@ URL: [url]', 'workflow_summary' => 'Sumar Workflow', 'workflow_transition_without_user_group' => '', 'workflow_user_summary' => 'Sumar Utilizator', -'x_more_objects' => '', +'x_more_objects' => 'Mai multe', 'year_view' => 'Vizualizare an', 'yes' => 'Da', 'zh_CN' => 'Chineză (CN)', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 9b1f3f640..25e863e17 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1671) +// Translators: Admin (1677) $text = array( '2_factor_auth' => 'Двухфакторная аутентификация', @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'и', 'apply' => 'Применить', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Запрос на утверждение удалён', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => 'Проходной каталог не существует', 'dropfolder_file' => 'Файл из проходного каталога', 'dropfolder_folder' => 'Путь к проходному каталогу', +'dropfolder_metadata' => '', 'dropupload' => 'Быстрая загрузка', 'drop_files_here' => 'Переместите файлы сюда', 'dump_creation' => 'Создать дамп БД', @@ -930,8 +934,11 @@ URL: [url]', 'quota_is_disabled' => 'Поддержка квот в настоящее время отключена в настройках.', 'quota_warning' => 'Ваша дисковая квота превышена на [bytes]. Удалите ненужные документы или их предыдущие версии.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1007,8 +1014,11 @@ URL: [url]', 'reviewer_already_assigned' => 'уже назначен на рецензирование', 'reviewer_already_removed' => 'уже удалён из списка рецензирующих или уже оставил рецензию', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Запрос на рецензию удалён', @@ -1046,9 +1056,13 @@ URL: [url]', 'revise_document' => 'Ревизировать документ', 'revise_document_on' => 'Следующий ревизия версии документа назначен на [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => 'Дата ревизии', @@ -1279,7 +1293,7 @@ URL: [url]', 'settings_enableDropUpload_desc' => 'Включить/отключить область в "Просмотр папки" для загрузки при помощи Drag&Drop.', 'settings_enableDuplicateDocNames' => 'Разрешить документы
с одинаковым названием', 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.', -'settings_enableDuplicateSubFolderNames' => '', +'settings_enableDuplicateSubFolderNames' => 'Разрешить дублирующие имена подпапок', 'settings_enableDuplicateSubFolderNames_desc' => '', 'settings_enableEmail' => 'Включить e-mail', 'settings_enableEmail_desc' => 'Включить/отключить автоматическое уведомление по e-mail.', @@ -1413,7 +1427,7 @@ URL: [url]', 'settings_maxSizeForFullText' => 'Макс. размер документа для индексирования на лету', 'settings_maxSizeForFullText_desc' => 'Размер документа, который может быть индексирован срузу после добавления', 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов', -'settings_maxUploadSize_desc' => '', +'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', @@ -1486,7 +1500,7 @@ URL: [url]', 'settings_smtpPort_desc' => 'Порт сервера SMTP, по умолчанию 25.', 'settings_smtpSendFrom' => 'От', 'settings_smtpSendFrom_desc' => 'Отправлять с указанного адреса.', -'settings_smtpSendTestMail' => '', +'settings_smtpSendTestMail' => 'Отправить тестовое письмо"', 'settings_smtpSendTestMail_desc' => '', 'settings_smtpServer' => 'Хост SMTP', 'settings_smtpServer_desc' => 'Хост сервера SMTP.', @@ -1552,9 +1566,9 @@ URL: [url]', 'sign_out' => 'Выйти', 'sign_out_user' => 'Пользовательский выход', 'sk_SK' => 'Slovak', -'sort_by_date' => '', -'sort_by_name' => '', -'sort_by_sequence' => '', +'sort_by_date' => 'Сортировка по дате', +'sort_by_name' => 'Сортировка по имени', +'sort_by_sequence' => 'Сортировка по порядку', 'space_used_on_data_folder' => 'Размер каталога данных', 'splash_added_to_clipboard' => 'Добавлено в буфер обмена', 'splash_add_access' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 92b62ea7a..2a1376986 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'a', 'apply' => 'Použiť', 'approvals_accepted' => '[no_approvals] approvals already accepted', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] approvals and [no_reviews] reviews already accepted', 'approvals_and_reviews_not_touched' => '[no_approvals] approvals and [no_reviews] reviews not being touched', 'approvals_and_reviews_rejected' => '[no_approvals] approvals and [no_reviews] reviews already rejected', 'approvals_not_touched' => '[no_approvals] approvals not being touched', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] approvals already rejected', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Approvals without group', 'approvals_without_user' => 'Approvals without user', 'approval_deletion_email' => 'Požiadavka na schválenie zmazaná', @@ -456,6 +459,7 @@ Odkaz je platný do [valid]. 'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.', 'dropfolder_file' => 'Súbor z drop zložky', 'dropfolder_folder' => 'Zložka z drop zložky', +'dropfolder_metadata' => '', 'dropupload' => 'Rýchlo nahraj', 'drop_files_here' => 'Sem vložte súbory!', 'dump_creation' => 'Vytvorenie výstupu DB', @@ -959,8 +963,11 @@ If you have still problems to login, then please contact your administrator.', 'quota_is_disabled' => 'Podpora kvót je momentálne zakázaná v nastaveniach. Nastavenie kvóty používateľa nebude mať žiadny účinok, kým nebude znovu aktivovaná.', 'quota_warning' => 'Maximálne využitie disku je prekročené o [bytes]. Odstráňte dokumenty alebo predchádzajúce verzie.', 'receipts_accepted' => '[no_receipts] receipts already accepted', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '[no_receipts] receipts not being touched', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '[no_receipts] receipts already rejected', +'receipts_rejected_latest' => '', 'receipts_without_group' => 'Receipts without group', 'receipts_without_user' => 'Receipts without user', 'receipt_deletion_email_body' => 'Používateľ bol odstránený zo zoznamu recipientov @@ -1042,8 +1049,11 @@ URL: [url]', 'reviewer_already_assigned' => 'je už poverený ako recenzent', 'reviewer_already_removed' => 'už bol odstránený z procesu recenzie alebo už odoslal recenziu', 'reviews_accepted' => '[no_reviews] reviews already accepted', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '[no_reviews] reviews not being touched', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '[no_reviews] reviews already rejected', +'reviews_rejected_latest' => '', 'reviews_without_group' => 'Reviews without group', 'reviews_without_user' => 'Reviews without user', 'review_deletion_email' => 'Požiadavka na recenziu zmazaná', @@ -1081,9 +1091,13 @@ URL: [url]', 'revise_document' => 'Revidovať dokument', 'revise_document_on' => 'Next revision of document version on [date]', 'revisions_accepted' => '[no_revisions] revisions already accepted', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '[no_revisions] revisions not being touched', +'revisions_not_touched_latest' => '', 'revisions_pending' => '[no_revisions] revisions due in future', +'revisions_pending_latest' => '', 'revisions_rejected' => '[no_revisions] revisions already rejected', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revízie bez skupiny', 'revisions_without_user' => 'Revízie bez používateľa', 'revision_date' => 'Dátum revízie', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index b8649998f..e829ce792 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -91,11 +91,14 @@ URL: [url]', 'and' => 'och', 'apply' => 'Använd', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => 'Godkännandet saknar grupp', 'approvals_without_user' => 'Godkännandet saknar användare', 'approval_deletion_email' => 'Begäran om godkännande har raderats', @@ -450,6 +453,7 @@ Länken är giltig t o m [valid]. 'dropfolderdir_missing' => 'Du saknar en personlig mapp för uppladdning till servern. Kontakta systemadminiustratören för att få hjälp att skapa den.', 'dropfolder_file' => 'Fil från mellanlagringsmappen', 'dropfolder_folder' => 'Katalog från mellanlagringsmappen', +'dropfolder_metadata' => '', 'dropupload' => 'Snabb uppladdning', 'drop_files_here' => 'Släpp filer här!', 'dump_creation' => 'Skapa DB-dump', @@ -943,8 +947,11 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.', 'quota_is_disabled' => 'Kvotstöd är för närvarande inaktiverad i inställningarna. Ett värde för användarkvot kommer inte att ha någon effekt förrän den är aktiverad igen.', 'quota_warning' => 'Din maximala lagringskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1015,8 +1022,11 @@ URL: [url]', 'reviewer_already_assigned' => 'Användaren har redan tilldelats rollen som granskare', 'reviewer_already_removed' => 'har redan tagits bort från granskningen eller har redan skickat en granskning', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => 'Granskningar som saknar användare', 'review_deletion_email' => 'Förfrågan om granskning borttagen', @@ -1054,9 +1064,13 @@ URL: [url]', 'revise_document' => 'Revidera dokument', 'revise_document_on' => 'Nästa revidering av dokumentversion [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => 'Revisioner som saknar grupp', 'revisions_without_user' => 'Revisioner som saknar användare', 'revision_date' => 'Datum för revision', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 3d546bb16..da7ae9c06 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -89,11 +89,14 @@ URL: [url]', 'and' => 've', 'apply' => 'Uygula', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Onay talebi silindi', @@ -431,6 +434,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Sürüklenen klasörden dosya', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Hızlı yükleme', 'drop_files_here' => 'Dosyaları buraya sürükleyin!', 'dump_creation' => 'Veritabanı dump oluşturma', @@ -929,8 +933,11 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü 'quota_is_disabled' => 'Kota desteği ayarlardan kapatılmış durumda. Açılana kadar kullanıcıya kota tanımlamanın bir etkisi olmaz.', 'quota_warning' => 'Size ayrılan disk kotası [bytes] aşıldı. Lütfen gereksiz olduğunu düşündüğünüz dokümanları veya eski versiyonları silin.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -994,8 +1001,11 @@ URL: [url]', 'reviewer_already_assigned' => 'zaten kontrol eden olarak tanımlı', 'reviewer_already_removed' => 'kontrol sürecinden silindi veya zaten kontrolü gönderdi', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Kontrol talebi silindi', @@ -1023,9 +1033,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 90ee03d4d..a7463efb5 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'і', 'apply' => 'Застосувати', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => 'Запит на підтвердження скасовано', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл з прохідного каталогу', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => 'Швидке завантаження', 'drop_files_here' => 'Перемістіть файли сюди', 'dump_creation' => 'Створити дамп БД', @@ -930,8 +934,11 @@ URL: [url]', 'quota_is_disabled' => 'Квотування відключено', 'quota_warning' => 'Ваша дискова квота перевищена на [bytes]. Видаліть непотрібні документи або їх попередні версії.', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -1000,8 +1007,11 @@ URL: [url]', 'reviewer_already_assigned' => 'вже призначений для рецензування', 'reviewer_already_removed' => 'вже видалено зі списку рецензентів або вже лишив рецензію', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => 'Запит на редагування видалено', @@ -1039,9 +1049,13 @@ URL: [url]', 'revise_document' => 'Ревізувати документ', 'revise_document_on' => 'Наступна ревізія документу [date]', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => 'Дата ревізії', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index b2e4a8ac8..4bb139c98 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => 'and', 'apply' => '应用', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '[no_approvals] 审核和 [no_reviews] 校对已通过', 'approvals_and_reviews_not_touched' => '[no_approvals] 审核和 [no_reviews] 校对暂未执行', 'approvals_and_reviews_rejected' => '[no_approvals] 审核和 [no_reviews] 校对未通过', 'approvals_not_touched' => '[no_approvals] 审核未执行', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '[no_approvals] 审核未通过', +'approvals_rejected_latest' => '', 'approvals_without_group' => '不含组的审核', 'approvals_without_user' => '不含用户的审核', 'approval_deletion_email' => '审核请求已被删除', @@ -437,6 +440,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '所选文件夹的文件', 'dropfolder_folder' => '从下拉菜单中选择文件夹', +'dropfolder_metadata' => '', 'dropupload' => '快速上传', 'drop_files_here' => '拖入这里', 'dump_creation' => '转储数据', @@ -929,8 +933,11 @@ URL: [url]', 'quota_is_disabled' => '配额的支持', 'quota_warning' => '您的磁盘最大使用量已超过 [bytes]。请删除文档或以前的版本。', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -992,8 +999,11 @@ URL: [url]', 'reviewer_already_assigned' => '已经被指派为校对人', 'reviewer_already_removed' => '已经从校对队列中删除或者已经提交校对', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '校对请求被删除', @@ -1021,9 +1031,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '[no_revisions] 修订已被接受', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '修订日期', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 7f878c1d1..576fcd0b2 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -90,11 +90,14 @@ URL: [url]', 'and' => '和', 'apply' => '接受', 'approvals_accepted' => '', +'approvals_accepted_latest' => '', 'approvals_and_reviews_accepted' => '', 'approvals_and_reviews_not_touched' => '', 'approvals_and_reviews_rejected' => '', 'approvals_not_touched' => '', +'approvals_not_touched_latest' => '', 'approvals_rejected' => '', +'approvals_rejected_latest' => '', 'approvals_without_group' => '', 'approvals_without_user' => '', 'approval_deletion_email' => '審核請求已被刪除', @@ -382,6 +385,7 @@ URL: [url]', 'dropfolderdir_missing' => '', 'dropfolder_file' => '檔案來源為 drop 目錄', 'dropfolder_folder' => '', +'dropfolder_metadata' => '', 'dropupload' => '快速上傳', 'drop_files_here' => '拖入這裡', 'dump_creation' => '轉儲數據', @@ -816,8 +820,11 @@ URL: [url]', 'quota_is_disabled' => '', 'quota_warning' => '', 'receipts_accepted' => '', +'receipts_accepted_latest' => '', 'receipts_not_touched' => '', +'receipts_not_touched_latest' => '', 'receipts_rejected' => '', +'receipts_rejected_latest' => '', 'receipts_without_group' => '', 'receipts_without_user' => '', 'receipt_deletion_email_body' => '', @@ -865,8 +872,11 @@ URL: [url]', 'reviewer_already_assigned' => '已經被指派為校對人', 'reviewer_already_removed' => '已經從校對佇列中刪除或者已經提交校對', 'reviews_accepted' => '', +'reviews_accepted_latest' => '', 'reviews_not_touched' => '', +'reviews_not_touched_latest' => '', 'reviews_rejected' => '', +'reviews_rejected_latest' => '', 'reviews_without_group' => '', 'reviews_without_user' => '', 'review_deletion_email' => '校對請求被刪除', @@ -887,9 +897,13 @@ URL: [url]', 'revise_document' => '', 'revise_document_on' => '', 'revisions_accepted' => '', +'revisions_accepted_latest' => '', 'revisions_not_touched' => '', +'revisions_not_touched_latest' => '', 'revisions_pending' => '', +'revisions_pending_latest' => '', 'revisions_rejected' => '', +'revisions_rejected_latest' => '', 'revisions_without_group' => '', 'revisions_without_user' => '', 'revision_date' => '', From b095c48ddd2a5ed43a930579f5fa81e56ecf7e0b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 18:20:53 +0100 Subject: [PATCH 100/198] formField() treats a value == "0" as not empty --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index d8c148740..478fecb97 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -906,7 +906,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; (!empty($value['type']) ? ' type="'.$value['type'].'"' : ''). (!empty($value['id']) ? ' id="'.$value['id'].'"' : ''). (!empty($value['name']) ? ' name="'.$value['name'].'"' : ''). - (!empty($value['value']) ? ' value="'.$value['value'].'"' : ''). + (is_string($value['value']) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). (!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : ''). (!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : ''). (!empty($value['checked']) ? ' checked' : ''). From b2715684a3b113564a121e42b61f12dd06179035 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 19 Nov 2019 18:21:34 +0100 Subject: [PATCH 101/198] use formField() instead of plain html --- .../class.RemoveUserFromProcesses.php | 159 ++++++++++++------ 1 file changed, 111 insertions(+), 48 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index 768f09c49..ec202ce24 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -80,66 +80,129 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { } ?> -
-
- -
-
+formField( + getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[review][]', + 'value'=>'0', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"]))) + ) + ); +?> -
-
- -
-
+formField( + getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"]))) + ) + ); +?> -
-
- -
-
+formField( + getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'-1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"]))) + ) + ); +?> -
-
- -
-
+formField( + getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'0', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"]))) + ) + ); +?> -
-
- -
-
+formField( + getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"]))) + ) + ); +?> -
-
- -
-
+formField( + getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))), + array( + 'element'=>'input', + 'type'=>'checkbox', + 'name'=>'status[approval][]', + 'value'=>'-1', + 'checked'=>true + ), + array( + 'field_wrap' => array('', ' '.getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"]))) + ) + ); +?> - -
-
- -
-
+getAllUsers($sortusersinlist); + foreach ($allUsers as $currUser) { + if (!$currUser->isGuest()) + $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); + } + $this->formField( + getMLText("user"), + array( + 'element'=>'select', + 'id'=>'newuser', + 'name'=>'newuserid', + 'class'=>'chzn-select', + 'options'=>$options + ) + ); + */ + $this->formSubmit(" ".getMLText('rm_user_from_processes')); +?> Date: Wed, 20 Nov 2019 13:14:34 +0100 Subject: [PATCH 102/198] set 'onepage' in view --- out/out.MyDocuments.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index d4f73fd67..26c564ae1 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -56,6 +56,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From 21e1efc1473d6a396fab1baf9261d2f3b0f9d19d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 13:17:04 +0100 Subject: [PATCH 103/198] set 'onepage' in view --- out/out.ApprovalSummary.php | 1 + out/out.ReviewSummary.php | 1 + 2 files changed, 2 insertions(+) diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index 370234205..6132b73e8 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -41,6 +41,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 370234205..6132b73e8 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -41,6 +41,7 @@ if($view) { $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } From 84550836c8b7f67ff080f0865ad0191f5b79e6a1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 17:17:51 +0100 Subject: [PATCH 104/198] started new version 5.1.14 --- CHANGELOG | 4 ++++ inc/inc.Version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 66d9ed9b8..7eaa60ff3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.14 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.1.13 -------------------------------------------------------------------------------- diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 868cb1499..bd2c1d827 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.1.13"; + public $_number = "5.1.14"; private $_string = "SeedDMS"; function __construct() { From 833ff8f7dac1f5f5d953eef08dc86034f7b42752 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 17:50:26 +0100 Subject: [PATCH 105/198] do not allow adding events and showing tasks --- views/bootstrap/class.Bootstrap.php | 2 +- views/bootstrap/class.Calendar.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 478fecb97..021f6f69d 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -334,7 +334,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo " \n"; echo " \n"; - if($this->params['enablemenutasks']) { + if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) { echo "
"; echo "
"; // echo "
    \n"; diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php index 8e49920b6..381a904f7 100644 --- a/views/bootstrap/class.Calendar.php +++ b/views/bootstrap/class.Calendar.php @@ -224,6 +224,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { } /* }}} */ function js() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; $strictformcheck = $this->params['strictformcheck']; header('Content-Type: application/javascript'); ?> @@ -232,6 +234,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { $('#calendar').fullCalendar({ height: $(window).height()-210, locale: 'params['session']->getLanguage(), 0, 2); ?>', +isGuest()) { ?> customButtons: { addEventButton: { text: '', @@ -241,6 +244,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { } } }, + header: { left: 'prev,next today addEventButton', center: 'title', From 154c3c2118b701a327c869802fcac9efa2583d3c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Nov 2019 19:22:23 +0100 Subject: [PATCH 106/198] set 'onepage' in factory --- inc/inc.ClassUI.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index c4ab1dd90..d22e1ec07 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -136,6 +136,7 @@ class UI extends UI_Default { $view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('onepage', $settings->_onePageMode); foreach($decorators as $extname=>$decorator) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file']; require($filename); From 5a877f959cfda3e37dd3fb120ec9c03fb2510dc0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 21 Nov 2019 10:50:59 +0100 Subject: [PATCH 107/198] edit warning because content is replaced --- views/bootstrap/class.EditOnline.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php index 80c316d35..04f3b3f06 100644 --- a/views/bootstrap/class.EditOnline.php +++ b/views/bootstrap/class.EditOnline.php @@ -123,6 +123,9 @@ $this->contentHeading(getMLText("content")); echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath()), ENT_SUBSTITUTE); ?> +warningMsg(getMLText('edit_online_warning')); +?> Date: Thu, 21 Nov 2019 10:51:17 +0100 Subject: [PATCH 108/198] allow mimetype to specify documents which can be edited online --- inc/inc.ClassAccessOperation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 43a30f2e8..af9dff37b 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -67,7 +67,7 @@ class SeedDMS_AccessOperation { $version = $this->obj->getContentByVersion($vno); else $version = $this->obj->getLatestContent(); - if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes)) + if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getMimeType()), $this->settings->_editOnlineFileTypes)) return false; if ($this->obj->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) { return true; From 750d02e1e82bc152224a83a0c352e1ad4aaf37ca Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 21 Nov 2019 10:52:11 +0100 Subject: [PATCH 109/198] add note for 5.1.14 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 7eaa60ff3..cbdd42c47 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 5.1.14 -------------------------------------------------------------------------------- +- allow mimetype to specify documents which can be edited online -------------------------------------------------------------------------------- Changes in version 5.1.13 From bf6490f9040beb8c3621ebd5695d4f6760e93058 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:38:41 +0100 Subject: [PATCH 110/198] fix output of group name --- views/bootstrap/class.ApprovalSummary.php | 2 +- views/bootstrap/class.ReviewSummary.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index bff1f59dc..4bb77f2f7 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -137,7 +137,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : '')); echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); - print "
"; + print ""; echo $this->documentListRowEnd($document); } } diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index 19e23496b..b15fb03df 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -142,7 +142,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { // print ""; echo $this->documentListRowStart($document, $class); echo $this->documentListRow($document, $previewer, true, $st['version']); - print ""; + print ""; print "\n"; } } From 24f030f1c70f52197f40ae7f3c8104573ddf2e29 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 09:50:52 +0100 Subject: [PATCH 111/198] add method printClickDocumentJs() adds js for catching the event when clicking on a document row and onepage mode is on --- views/bootstrap/class.Bootstrap.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 021f6f69d..ac090e338 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2238,6 +2238,19 @@ $(document).ready( function() { "; } /* }}} */ + function printClickDocumentJs() { /* {{{ */ + $onepage = $this->params['onepage']; + if($onepage) { +?> +/* catch click on a document row in the list folders and documents */ +$('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { + attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; + window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; +}); + Date: Mon, 25 Nov 2019 09:51:39 +0100 Subject: [PATCH 112/198] use new method printClickDocumentJs() --- views/bootstrap/class.ApprovalSummary.php | 1 + views/bootstrap/class.ReviewSummary.php | 1 + views/bootstrap/class.ViewFolder.php | 8 +++----- views/bootstrap/class.WorkflowSummary.php | 8 ++++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index 4bb77f2f7..8050aa283 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -41,6 +41,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { 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(); + $this->printClickDocumentJs(); } /* }}} */ function show() { /* {{{ */ diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index b15fb03df..de95a0646 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -41,6 +41,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { 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(); + $this->printClickDocumentJs(); } /* }}} */ function show() { /* {{{ */ diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 3feed0202..307520b73 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -189,11 +189,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) scrollTop: 200 }, 200); }); -/* catch click on a document row in the list folders and documents */ -$('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { - attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; - window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; -}); +printClickDocumentJs(); +?> $('body').on('click', '.order-btn', function(ev) { ev.preventDefault(); var element = $(this); diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php index d0711044a..f013a8c1b 100644 --- a/views/bootstrap/class.WorkflowSummary.php +++ b/views/bootstrap/class.WorkflowSummary.php @@ -36,6 +36,14 @@ require_once("SeedDMS/Preview.php"); */ class SeedDMS_View_WorkflowSummary 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(); + $this->printClickDocumentJs(); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; From 28676c8065990ac7e2f08c4faf48958121f63608 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Nov 2019 11:52:14 +0100 Subject: [PATCH 113/198] show empty pic if no access --- op/op.Preview.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op/op.Preview.php b/op/op.Preview.php index 3b0903b84..5b1fed579 100644 --- a/op/op.Preview.php +++ b/op/op.Preview.php @@ -49,6 +49,8 @@ if (!is_object($document)) { } if ($document->getAccessMode($user) < M_READ) { + header('Content-Type: image/svg+xml'); + readfile('../views/'.$theme.'/images/empty.svg'); exit; } From 4775fdcd6c64259a97d1bb34e8402e44f8e10377 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:32:39 +0100 Subject: [PATCH 114/198] save field 'created' instead of time() in addDocument() --- SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php index 7ca9663a3..7cac5d7e9 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php @@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer { if(!$this->_conn) return false; - $sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".time().")"; + $sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".$doc->getFieldValue('created')/*time()*/.")"; $res = $this->_conn->exec($sql); if($res === false) { return false; From 469d9c5759098278456c54d3d5e90e98a7e42414 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:33:08 +0100 Subject: [PATCH 115/198] new version 1.0.11 --- SeedDMS_SQLiteFTS/package.xml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml index ed2256393..fdac846ba 100644 --- a/SeedDMS_SQLiteFTS/package.xml +++ b/SeedDMS_SQLiteFTS/package.xml @@ -11,11 +11,11 @@ uwe@steinmann.cx yes - 2018-04-11 + 2019-11-28 - 1.0.10 - 1.0.10 + 1.0.11 + 1.0.11 stable @@ -23,7 +23,8 @@ GPL License -IndexedDocument() remembers cmd and mimetype +Set 'created' in index to creation date of indexed content (was set to current +timestamp) @@ -226,5 +227,21 @@ allow conversion commands for mimetypes with wildcards execWithTimeout() reads data from stderr and saves it into error msg + + 2018-04-11 + + + 1.0.10 + 1.0.10 + + + stable + stable + + GPL License + +IndexedDocument() remembers cmd and mimetype + + From 7bb511f8917db3d802737f1deb2262968e9b9c62 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:33:37 +0100 Subject: [PATCH 116/198] fix comparison of creation date, show number of tasks in queue --- views/bootstrap/class.Indexer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php index fc35be2bc..5fb16c326 100644 --- a/views/bootstrap/class.Indexer.php +++ b/views/bootstrap/class.Indexer.php @@ -63,6 +63,7 @@ function check_queue() { beforeSend: function() { queue_count++; // Add request to the counter $('.queue-bar').css('width', (queue_count*100/MAX_REQUESTS)+'%'); + $('.queue-bar').text(queue_count + '/' + MAX_REQUESTS); }, error: function(xhr, textstatus) { noty({ @@ -162,7 +163,7 @@ $(document).ready( function() { $created = 0; } $content = $document->getLatestContent(); - if($created > $content->getDate() && !$forceupdate) { + if($created >= $content->getDate() && !$forceupdate) { echo $indent."getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">document unchanged"; } else { $index->delete($hit->id); From 413bbad19606139cecd24b54ec591eeaba91fef7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 07:34:17 +0100 Subject: [PATCH 117/198] add entries for 5.1.14 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cbdd42c47..6fae41425 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes in version 5.1.14 -------------------------------------------------------------------------------- - allow mimetype to specify documents which can be edited online +- show number of indexing tasks in bar +- fix comparison of last indexing time with creation date of document content -------------------------------------------------------------------------------- Changes in version 5.1.13 From 87d1df5d034495bef6b4212c8bf49deca6ffa8b4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 11:20:46 +0100 Subject: [PATCH 118/198] propperly check for passed parameter 'node', pass orderby to view --- out/out.FolderChooser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/out/out.FolderChooser.php b/out/out.FolderChooser.php index 8e764e5a9..ffea48194 100644 --- a/out/out.FolderChooser.php +++ b/out/out.FolderChooser.php @@ -29,7 +29,7 @@ require_once("inc/inc.ClassUI.php"); require_once("inc/inc.Authentication.php"); if(isset($_GET['action']) && $_GET['action'] == 'subtree') { - if (isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) { + if (!isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) { $nodeid = $settings->_rootFolderID; } else { $nodeid = intval($_GET["node"]); @@ -48,9 +48,9 @@ if(isset($_GET['action']) && $_GET['action'] == 'subtree') { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rootfolderid'=>$settings->_rootFolderID)); if($view) { + $view->setParam('orderby', $settings->_sortFoldersDefault); if(isset($_GET['action']) && $_GET['action'] == 'subtree') { $view->setParam('node', $node); - $view->setParam('orderby', $settings->_sortFoldersDefault); } else { $view->setParam('form', $form); $view->setParam('mode', $mode); From 1763bd1bae147e20457e5ffd7c9e121fc43190a0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 11:21:40 +0100 Subject: [PATCH 119/198] take 'orderby' into account --- views/bootstrap/class.FolderChooser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.FolderChooser.php b/views/bootstrap/class.FolderChooser.php index 73beaf5c4..ded83b32c 100644 --- a/views/bootstrap/class.FolderChooser.php +++ b/views/bootstrap/class.FolderChooser.php @@ -52,6 +52,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $mode = $this->params['mode']; + $orderby = $this->params['orderby']; $exclude = $this->params['exclude']; $form = $this->params['form']; $rootfolderid = $this->params['rootfolderid']; @@ -59,7 +60,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style { // $this->htmlStartPage(getMLText("choose_target_folder")); // $this->contentContainerStart(); if(1) { - $this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form); + $this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form, ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby); echo ''."\n"; } else { $this->printNewTreeNavigation($rootfolderid, $mode, 0, $form); From fd4a821fa8ff4aeec5be98be69d0adb3e523d417 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 26 Nov 2019 17:07:47 +0100 Subject: [PATCH 120/198] better checking for existing value --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ac090e338..ef4d5adc0 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -906,7 +906,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; (!empty($value['type']) ? ' type="'.$value['type'].'"' : ''). (!empty($value['id']) ? ' id="'.$value['id'].'"' : ''). (!empty($value['name']) ? ' name="'.$value['name'].'"' : ''). - (is_string($value['value']) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). + ((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). (!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : ''). (!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : ''). (!empty($value['checked']) ? ' checked' : ''). From 89c0ca9b886ddac508d216b23c13f5fba1405883 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:00:52 +0100 Subject: [PATCH 121/198] new function getBaseUrl() returns the protocol and host part of the url where seeddms is available --- inc/inc.Utils.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 82bc8c0fc..52b3102f2 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -589,6 +589,15 @@ function sendFile($filename) { /* {{{ */ } } /* }}} */ +/** + * Return protocol and host of url + * + * @return string + */ +function getBaseUrl() { /* {{{ */ + return "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST']; +} /* }}} */ + class SeedDMS_CSRF { protected $secret; From c3ab4648905da921e09939d0116101c156ffcffc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:01:59 +0100 Subject: [PATCH 122/198] use new function getBaseUrl() --- op/op.AddDocument.php | 8 ++++---- op/op.AddFile.php | 2 +- op/op.AddFile2.php | 2 +- op/op.AddMultiDocument.php | 2 +- op/op.AddSubFolder.php | 2 +- op/op.Ajax.php | 10 +++++----- op/op.ApproveDocument.php | 8 ++++---- op/op.DocumentAccess.php | 8 ++++---- op/op.DocumentNotify.php | 6 +++--- op/op.EditAttributes.php | 4 ++-- op/op.EditComment.php | 2 +- op/op.EditDocument.php | 10 +++++----- op/op.EditFolder.php | 8 ++++---- op/op.EditOnline.php | 2 +- op/op.FolderAccess.php | 10 +++++----- op/op.FolderNotify.php | 6 +++--- op/op.ManageNotify.php | 2 +- op/op.MoveClipboard.php | 4 ++-- op/op.MoveDocument.php | 2 +- op/op.MoveFolder.php | 2 +- op/op.OverrideContentStatus.php | 2 +- op/op.PasswordForgotten.php | 4 ++-- op/op.RemoveDocument.php | 2 +- op/op.RemoveDocumentFile.php | 2 +- op/op.RemoveFolder.php | 2 +- op/op.RemoveVersion.php | 4 ++-- op/op.RemoveWorkflowFromDocument.php | 2 +- op/op.ReturnFromSubWorkflow.php | 2 +- op/op.ReviewDocument.php | 4 ++-- op/op.RewindWorkflow.php | 2 +- op/op.RunSubWorkflow.php | 2 +- op/op.SetReviewersApprovers.php | 16 ++++++++-------- op/op.SetWorkflow.php | 2 +- op/op.TransferDocument.php | 2 +- op/op.TriggerWorkflow.php | 4 ++-- op/op.UpdateDocument.php | 10 +++++----- op/op.UpdateDocument2.php | 4 ++-- op/op.UsrMgr.php | 2 +- 38 files changed, 84 insertions(+), 84 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 84176ecda..5cc09cc88 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -407,7 +407,7 @@ for ($file_num=0;$file_numgetFullName(); $params['comment'] = $comment; $params['version_comment'] = $version_comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -427,7 +427,7 @@ for ($file_num=0;$file_numgetFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -450,7 +450,7 @@ for ($file_num=0;$file_numgetFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -471,7 +471,7 @@ for ($file_num=0;$file_numgetFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.AddFile.php b/op/op.AddFile.php index 944028eea..8b3a8022a 100644 --- a/op/op.AddFile.php +++ b/op/op.AddFile.php @@ -116,7 +116,7 @@ for ($file_num=0;$file_numgetName(); $params['username'] = $user->getFullName(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php index 4774189ff..ae05026db 100644 --- a/op/op.AddFile2.php +++ b/op/op.AddFile2.php @@ -109,7 +109,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['document'] = $document->getName(); $params['username'] = $user->getFullName(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php index a4e843138..9bcbd0dcf 100644 --- a/op/op.AddMultiDocument.php +++ b/op/op.AddMultiDocument.php @@ -243,7 +243,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['username'] = $user->getFullName(); $params['comment'] = $comment; $params['version_comment'] = $version_comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index 3d3d42019..f0284d1cb 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -133,7 +133,7 @@ if(!$subFolder = $controller->run()) { $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 727d0516e..52362f4be 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -459,7 +459,7 @@ switch($command) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); @@ -801,7 +801,7 @@ switch($command) { $params['username'] = $user->getFullName(); $params['comment'] = ''; $params['version_comment'] = ''; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -821,7 +821,7 @@ switch($command) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -844,7 +844,7 @@ switch($command) { $params['version'] = 1; $params['comment'] = ''; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -865,7 +865,7 @@ switch($command) { $params['version'] = 1; $params['comment'] = ''; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php index eaceec753..597573814 100644 --- a/op/op.ApproveDocument.php +++ b/op/op.ApproveDocument.php @@ -113,7 +113,7 @@ if ($_POST["approvalType"] == "ind") { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); @@ -151,7 +151,7 @@ else if ($_POST["approvalType"] == "grp") { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params); @@ -186,7 +186,7 @@ if ($_POST["approvalStatus"]==-1){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { @@ -238,7 +238,7 @@ if ($_POST["approvalStatus"]==-1){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index eddf47ef1..76b48018f 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -157,7 +157,7 @@ if ($action == "setowner") { $params['username'] = $user->getFullName(); $params['old_owner'] = $oldowner->getFullName(); $params['new_owner'] = $newowner->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -182,7 +182,7 @@ else if ($action == "notinherit") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -205,7 +205,7 @@ else if ($action == "inherit") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -227,7 +227,7 @@ else if ($action == "setdefault") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php index 0226ea7a3..eb546a241 100644 --- a/op/op.DocumentNotify.php +++ b/op/op.DocumentNotify.php @@ -107,7 +107,7 @@ if ($action == "delnotify"){ $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -150,7 +150,7 @@ else if ($action == "addnotify") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -184,7 +184,7 @@ else if ($action == "addnotify") { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php index dce009239..4397351a6 100644 --- a/op/op.EditAttributes.php +++ b/op/op.EditAttributes.php @@ -105,7 +105,7 @@ if($oldattributes) { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -133,7 +133,7 @@ if($newattributes) { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditComment.php b/op/op.EditComment.php index 1444cf63e..7dec214f7 100644 --- a/op/op.EditComment.php +++ b/op/op.EditComment.php @@ -100,7 +100,7 @@ if (($oldcomment = $version->getComment()) != $comment) { $params['username'] = $user->getFullName(); $params['new_comment'] = $comment; $params['old_comment'] = $oldcomment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index 3de8cb97a..5c3a66d4f 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -144,7 +144,7 @@ if ($oldname != $name) { $params['old_name'] = $oldname; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -173,7 +173,7 @@ if ($oldcomment != $comment) { $params['old_comment'] = $oldcomment; $params['new_comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -200,7 +200,7 @@ if ($expires != $oldexpires) { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -234,7 +234,7 @@ if($oldattributes) { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -261,7 +261,7 @@ if($newattributes) { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index c2f2afc57..050d6b3f5 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -97,7 +97,7 @@ if($oldname != $name) { $params['old_name'] = $oldname; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -123,7 +123,7 @@ if($oldcomment != $comment) { $params['old_comment'] = $oldcomment; $params['new_comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -152,7 +152,7 @@ if($oldattributes) { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -179,7 +179,7 @@ if($newattributes) { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.EditOnline.php b/op/op.EditOnline.php index b19eb420b..c0dc2d401 100644 --- a/op/op.EditOnline.php +++ b/op/op.EditOnline.php @@ -75,7 +75,7 @@ if($lc->getChecksum() == SeedDMS_Core_File::checksum($tmpfname)) { $params['comment'] = $document->getComment(); $params['version'] = $lc->getVersion(); $params['version_comment'] = $lc->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index f5ad80519..6ee5d3e8c 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -137,7 +137,7 @@ if ($action == "setowner") { $params['username'] = $user->getFullName(); $params['old_owner'] = $oldOwner->getFullName(); $params['new_owner'] = $newOwner->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -168,7 +168,7 @@ else if ($action == "notinherit") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -191,7 +191,7 @@ else if ($action == "notinherit") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -230,7 +230,7 @@ else if ($action == "inherit") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -257,7 +257,7 @@ else if ($action == "setdefault") { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php index 67c7a75bd..aa9f235b5 100644 --- a/op/op.FolderNotify.php +++ b/op/op.FolderNotify.php @@ -102,7 +102,7 @@ if ($action == "delnotify") { $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -145,7 +145,7 @@ else if ($action == "addnotify") { $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -180,7 +180,7 @@ else if ($action == "addnotify") { $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index c58d7d665..738b67530 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -119,7 +119,7 @@ if ($_GET["type"]=="document"){ $params['name'] = $folder->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.MoveClipboard.php b/op/op.MoveClipboard.php index cb93bf4b9..d675e5c6a 100644 --- a/op/op.MoveClipboard.php +++ b/op/op.MoveClipboard.php @@ -70,7 +70,7 @@ foreach($clipboard['docs'] as $documentid) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -117,7 +117,7 @@ foreach($clipboard['folders'] as $folderid) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index 21682eb3d..54a93683f 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -87,7 +87,7 @@ if ($targetid != $oldFolder->getID()) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 8a3c44d57..84090c704 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -85,7 +85,7 @@ if ($folder->setParent($targetFolder)) { $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $targetFolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index afee7561a..6f8dba701 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -86,7 +86,7 @@ if ($overrideStatus != $overallStatus["status"]) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.PasswordForgotten.php b/op/op.PasswordForgotten.php index 13da84f85..c51794fc1 100644 --- a/op/op.PasswordForgotten.php +++ b/op/op.PasswordForgotten.php @@ -62,8 +62,8 @@ if($user) { $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $params['hash'] = $hash; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash; - $params['url_prefix'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot; + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash; + $params['url_prefix'] = getBaseUrl().$settings->_httpRoot; $emailobj->toIndividual($settings->_smtpSendFrom, $user, $subject, $message, $params); } } diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index 05cda0d28..bfd19b701 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -106,7 +106,7 @@ if ($notifier){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php index 9887c5dd2..70dd02765 100644 --- a/op/op.RemoveDocumentFile.php +++ b/op/op.RemoveDocumentFile.php @@ -75,7 +75,7 @@ if (!$document->removeDocumentFile($fileid)) { $params = array(); $params['document'] = $document->getName(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php index 0f11fa0c1..86276b8f0 100644 --- a/op/op.RemoveFolder.php +++ b/op/op.RemoveFolder.php @@ -99,7 +99,7 @@ if ($notifier) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index e8fb5f596..41ce8d429 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -91,7 +91,7 @@ if (count($document->getContent())==1) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); @@ -168,7 +168,7 @@ else { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $userrecipients, $subject, $message, $params); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach($grouprecipients as $grp) { diff --git a/op/op.RemoveWorkflowFromDocument.php b/op/op.RemoveWorkflowFromDocument.php index c42153f67..64a64eda5 100644 --- a/op/op.RemoveWorkflowFromDocument.php +++ b/op/op.RemoveWorkflowFromDocument.php @@ -84,7 +84,7 @@ if($version->removeWorkflow($user)) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.ReturnFromSubWorkflow.php b/op/op.ReturnFromSubWorkflow.php index 4d5837ba2..0fb7d377d 100644 --- a/op/op.ReturnFromSubWorkflow.php +++ b/op/op.ReturnFromSubWorkflow.php @@ -98,7 +98,7 @@ if($version->returnFromSubWorkflow($user, $transition, $_POST["comment"])) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 5b874370b..d41f07a39 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -111,7 +111,7 @@ if ($_POST["reviewType"] == "ind") { $params['status'] = getReviewStatusText($_POST["reviewStatus"]); $params['comment'] = $comment; $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -265,7 +265,7 @@ if ($_POST["reviewStatus"]==-1){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach ($docApprovalStatus as $dastat) { if ($dastat["status"] == 0) { diff --git a/op/op.RewindWorkflow.php b/op/op.RewindWorkflow.php index 08b2a58c2..6b1648a89 100644 --- a/op/op.RewindWorkflow.php +++ b/op/op.RewindWorkflow.php @@ -83,7 +83,7 @@ if($version->rewindWorkflow()) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.RunSubWorkflow.php b/op/op.RunSubWorkflow.php index 9a968efcf..9775a5677 100644 --- a/op/op.RunSubWorkflow.php +++ b/op/op.RunSubWorkflow.php @@ -92,7 +92,7 @@ if($version->runSubWorkflow($subworkflow)) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index d009b026d..353452b52 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -140,7 +140,7 @@ foreach ($pIndRev as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -206,7 +206,7 @@ if (count($reviewIndex["i"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -252,7 +252,7 @@ foreach ($pGrpRev as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -310,7 +310,7 @@ if (count($reviewIndex["g"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -372,7 +372,7 @@ foreach ($pIndApp as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -430,7 +430,7 @@ if (count($approvalIndex["i"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -476,7 +476,7 @@ foreach ($pGrpApp as $p) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -534,7 +534,7 @@ if (count($approvalIndex["g"]) > 0) { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; diff --git a/op/op.SetWorkflow.php b/op/op.SetWorkflow.php index f7219e577..006767a90 100644 --- a/op/op.SetWorkflow.php +++ b/op/op.SetWorkflow.php @@ -87,7 +87,7 @@ if ($notifier) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { diff --git a/op/op.TransferDocument.php b/op/op.TransferDocument.php index 0bc50493e..9072c1f9f 100644 --- a/op/op.TransferDocument.php +++ b/op/op.TransferDocument.php @@ -80,7 +80,7 @@ if ($notifier){ $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $notifier->toList($user, $nl["users"], $subject, $message, $params); foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index 5c572f08d..330b525cc 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -94,7 +94,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $notifier->toList($user, $nl["users"], $subject, $message, $params); @@ -114,7 +114,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $usersinformed = array(); $groupsinformed = array(); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 654c192c2..c8fa1759b 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -314,7 +314,7 @@ default: $params['username'] = $user->getFullName(); $params['comment'] = $document->getComment(); $params['version_comment'] = $content->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -337,7 +337,7 @@ default: $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { foreach($ntransition->getUsers() as $tuser) { @@ -360,7 +360,7 @@ default: $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -381,7 +381,7 @@ default: $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; @@ -402,7 +402,7 @@ default: $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index 88aa4d3c5..342160127 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -184,7 +184,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['username'] = $user->getFullName(); $params['comment'] = $document->getComment(); $params['version_comment'] = $contentResult->getContent()->getComment(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); @@ -209,7 +209,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $notifyList["users"], $subject, $message, $params); diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index e955f3a85..403c64cff 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -293,7 +293,7 @@ else if ($action == "sendlogindata" && $settings->_enableEmail) { $params['username'] = $newuser->getFullName(); $params['login'] = $newuser->getLogin(); $params['comment'] = $comment; - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php"; + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewFolder.php"; $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toIndividual($user, $newuser, $subject, $message, $params); From 5fdae931b13aecfb742e4b83c7d10e661c8e730d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 10:22:47 +0100 Subject: [PATCH 123/198] use getBaseUrl() --- inc/inc.ClassEmailUtils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassEmailUtils.php b/inc/inc.ClassEmailUtils.php index a36672304..e1882290b 100644 --- a/inc/inc.ClassEmailUtils.php +++ b/inc/inc.ClassEmailUtils.php @@ -42,7 +42,7 @@ class SeedDMS_EmailUtils { return(str_replace( array('###SITENAME###', '###HTTP_ROOT###', '###URL_PREFIX###'), - array($settings->_siteName, $settings->_httpRoot, "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot), + array($settings->_siteName, $settings->_httpRoot, getBaseUrl().$settings->_httpRoot), $text)); } /* }}} */ From ca7bb77386a2ce3317e0358a7bf99cd40c8846a5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Nov 2019 14:27:30 +0100 Subject: [PATCH 124/198] better formating of checkboxes --- views/bootstrap/class.RemoveUserFromProcesses.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index ec202ce24..c28dcdcfd 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -91,7 +91,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"]))) + 'field_wrap' => array('") ) ); ?> @@ -108,7 +108,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"]))) + 'field_wrap' => array('") ) ); ?> @@ -125,7 +125,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"]))) + 'field_wrap' => array('") ) ); ?> @@ -143,7 +143,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"]))) + 'field_wrap' => array('") ) ); ?> @@ -160,7 +160,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"]))) + 'field_wrap' => array('") ) ); ?> @@ -177,7 +177,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style { 'checked'=>true ), array( - 'field_wrap' => array('', ' '.getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"]))) + 'field_wrap' => array('") ) ); ?> From 63c90a026ba3d5807725d4148308db2c4b7f5f83 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Dec 2019 19:31:02 +0100 Subject: [PATCH 125/198] menu item does not need a href if it has children --- views/bootstrap/class.Bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ef4d5adc0..18fae8448 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -473,14 +473,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);; foreach($menuitems as $menuitem) { if(!empty($menuitem['children'])) { echo "
  • \n"; - echo " ".getMLText($menuitem['label'])." \n"; + echo " ".getMLText($menuitem['label'])." \n"; echo " \n"; } else { - echo "
  • ".getMLText($menuitem['label'])."
    • "; + echo "
  • ".getMLText($menuitem['label'])."
    • "; } } } /* }}} */ From 6d604d2d60c468b95471492d293f70d78f3091dd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 6 Dec 2019 15:23:38 +0100 Subject: [PATCH 126/198] set icon for video/webm --- views/bootstrap/class.Bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 18fae8448..7af9f1bb4 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -983,6 +983,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $icons["rar"] = "package.svg"; $icons["mpg"] = "video.svg"; $icons["avi"] = "video.svg"; + $icons["webm"] = "video.svg"; $icons["ods"] = "office-spreadsheet.svg"; $icons["ots"] = "office-spreadsheet.svg"; $icons["sxc"] = "office-spreadsheet.svg"; From 583ce13bfc778976c978d0e938a5a79177048af7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Dec 2019 06:20:11 +0100 Subject: [PATCH 127/198] set video icon for .mkv files --- views/bootstrap/class.Bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 7af9f1bb4..75f75ffa1 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -984,6 +984,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; $icons["mpg"] = "video.svg"; $icons["avi"] = "video.svg"; $icons["webm"] = "video.svg"; + $icons["mkv"] = "video.svg"; $icons["ods"] = "office-spreadsheet.svg"; $icons["ots"] = "office-spreadsheet.svg"; $icons["sxc"] = "office-spreadsheet.svg"; From 658d00fe42d01f24d581e69e965c12a5aca4a008 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Dec 2019 06:20:31 +0100 Subject: [PATCH 128/198] allow preview of video/x-matroska videos --- views/bootstrap/class.ViewDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 27461d1a1..c77a156ea 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -370,6 +370,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { case 'video/avi': case 'video/msvideo': case 'video/x-msvideo': + case 'video/x-matroska': $this->contentHeading(getMLText("preview")); ?>     "; $content .= "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; print "\n"; $list = $extmgr->getExtensionList(); foreach($list as $re) { @@ -279,7 +316,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { echo ""; echo ""; echo ""; - } + } echo "
    ".($parent ? '' : '')."".($parent ? '' : '')."".getMLText("name"); print " ".($orderby=="n"||$orderby=="na"?' ':($orderby=="nd"?' ':' ')).""; print " ".($orderby=="s"||$orderby=="sa"?' ':($orderby=="sd"?' ':' ')).""; From 120fd46bfd48d5c89f400533bb01bb096236aa15 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 10:10:08 +0100 Subject: [PATCH 086/198] adding conf for editorconfig --- .editorconfig | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..9f5028851 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +trim_trailing_whitespaces = true +indent_style = tab +indent_size = 4 From 7932349bf66daab5c3f8c825183384404e975202 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 10:11:06 +0100 Subject: [PATCH 087/198] set indent_size to 2 --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 9f5028851..072c0c22b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,4 +5,4 @@ charset = utf-8 end_of_line = lf trim_trailing_whitespaces = true indent_style = tab -indent_size = 4 +indent_size = 2 From 3c26142744de4f4c3bfb7747eec39730d3051776 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 12:06:41 +0100 Subject: [PATCH 088/198] onePageMode can be turned on/off --- inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + out/out.ViewFolder.php | 2 +- views/bootstrap/class.Settings.php | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 5561d2fd4..564f4adda 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -125,6 +125,8 @@ class Settings { /* {{{ */ var $_enableConverting = false; // default style var $_theme = "bootstrap"; + // experimental one page mode for ViewFolder page + var $_onePageMode = false; // Workaround for page titles that go over more than 2 lines. var $_titleDisplayHack = true; // enable/disable automatic email notification @@ -433,6 +435,7 @@ class Settings { /* {{{ */ if(trim(strval($tab["availablelanguages"]))) $this->_availablelanguages = explode(',',strval($tab["availablelanguages"])); $this->_theme = strval($tab["theme"]); + $this->_onePageMode = Settings::boolVal($tab["onePageMode"]); if(isset($tab["previewWidthList"])) $this->_previewWidthList = intval($tab["previewWidthList"]); if(isset($tab["previewWidthMenuList"])) @@ -786,6 +789,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "language", $this->_language); $this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages)); $this->setXMLAttributValue($node, "theme", $this->_theme); + $this->setXMLAttributValue($node, "onePageMode", $this->_onePageMode); $this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList); $this->setXMLAttributValue($node, "previewWidthMenuList", $this->_previewWidthMenuList); $this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail); diff --git a/op/op.Settings.php b/op/op.Settings.php index b02ee237c..ae396169a 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -64,6 +64,7 @@ if ($action == "saveSettings") else $settings->_availablelanguages = $_POST["availablelanguages"]; $settings->_theme = $_POST["theme"]; + $settings->_onePageMode = $_POST["onePageMode"]; $settings->_previewWidthList = $_POST["previewWidthList"]; $settings->_previewWidthMenuList = $_POST["previewWidthMenuList"]; $settings->_previewWidthDropFolderList = $_POST["previewWidthDropFolderList"]; diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index c7d2a4853..3ddf922ef 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -96,7 +96,7 @@ if($view) { $view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage); $view->setParam('offset', $offset); $view->setParam('limit', $limit); - $view->setParam('onepage', true); // do most navigation by reloading areas of pages with ajax + $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view($_GET); exit; } diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index a83cdf384..5bf83d692 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -271,6 +271,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigOption('settings_available_languages', 'availablelanguages', getAvailableLanguages(), true, true); ?> showConfigOption('settings_language', 'language', getAvailableLanguages(), false, true); ?> showConfigOption('settings_theme', 'theme', UI::getStyles(), false, false); ?> +showConfigCheckbox('settings_onePageMode', 'onePageMode'); ?> showConfigText('settings_previewWidthList', 'previewWidthList'); ?> showConfigText('settings_previewWidthMenuList', 'previewWidthMenuList'); ?> showConfigText('settings_previewWidthDropFolderList', 'previewWidthDropFolderList'); ?> From 28b2c0249909a5ce870a94bb4991c158ab45a374 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 28 Oct 2019 12:07:37 +0100 Subject: [PATCH 089/198] add keys settings_onePageMode and settings_onePageMode_desc --- languages/ar_EG/lang.inc | 2 ++ languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 4 +++- languages/el_GR/lang.inc | 2 ++ languages/en_GB/lang.inc | 4 +++- languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hr_HR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/ko_KR/lang.inc | 2 ++ languages/lo_LA/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 2 ++ languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 2 ++ languages/sv_SE/lang.inc | 2 ++ languages/tr_TR/lang.inc | 2 ++ languages/uk_UA/lang.inc | 2 ++ languages/zh_CN/lang.inc | 2 ++ languages/zh_TW/lang.inc | 2 ++ 25 files changed, 52 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f0919a9e9..6a99a05a9 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1375,6 +1375,8 @@ URL: [url]', 'settings_Notification' => '', 'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 7cfe1f6ca..83741c002 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1238,6 +1238,8 @@ $text = array( 'settings_Notification' => 'Настройка за известяване', 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.', 'settings_no_content_dir' => 'Каталог със съдържанието', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Частичен размер на файла', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 0c8622a4b..01bcbb405 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1243,6 +1243,8 @@ URL: [url]', 'settings_Notification' => '', 'settings_notwritable' => '', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 87cb4ae30..bc0faaec4 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1454,6 +1454,8 @@ Jméno: [username] 'settings_Notification' => 'Nastavení upozornění', 'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Přepsat typ MimeType', 'settings_overrideMimeType_desc' => 'Přepsat MimeType dodaný prohlížečem, pokud je nahrán soubor. Nový MimeType je určen samotným SeedDMS.', 'settings_partitionSize' => 'Částečná velikost souboru', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 21dcce1ca..0add1a8b1 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2697), dgrutsch (22) +// Translators: Admin (2699), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1464,6 +1464,8 @@ Name: [username] 'settings_Notification' => 'Benachrichtigungen-Einstellungen', 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => 'Einseiten-Modus', +'settings_onePageMode_desc' => 'Der Einseiten-Modus schaltet javascript auf der ViewFolder-Seite ein, der die Ordner- und Dokumentenliste, die Navigation, etc. aktualisiert, wenn auf einen Ordner geklickt wird.', 'settings_overrideMimeType' => 'Überschreibe MimeType', 'settings_overrideMimeType_desc' => 'Überschreibe den MimeType, der vom Browser beim Hochladen einer Datei übertragen wird. Der neue MimeType wird von SeedDMS selbst ermittelt.', 'settings_partitionSize' => 'Partitionsgröße', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index c72b6c47e..82a7b9a2b 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -1249,6 +1249,8 @@ URL: [url]', 'settings_Notification' => '', 'settings_notwritable' => '', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index c2c459f38..b48452290 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1791), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1793), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1459,6 +1459,8 @@ Name: [username] 'settings_Notification' => 'Notification settings', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => 'One page mode', +'settings_onePageMode_desc' => 'One page mode will turn on javascript code on the ViewFolder page, which updates the folder/document list, navigation, etc. when clicking on a folder or changing the sort parameter.', 'settings_overrideMimeType' => 'Override MimeType', 'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.', 'settings_partitionSize' => 'Partial filesize', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index bc2d627d9..3aa3b6912 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1390,6 +1390,8 @@ URL: [url]', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', 'settings_no_content_dir' => 'Carpeta de contenidos', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Anular MimeType', 'settings_overrideMimeType_desc' => 'Permitir que SeedDMS fije el tipo MIME sobreescribiendo el que haya definido el navegador durante el proceso de carga de un archivo.', 'settings_partitionSize' => 'Tamaño de fichero parcial', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 9cb33d667..0c8661165 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1443,6 +1443,8 @@ Nom : [username] 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', 'settings_no_content_dir' => 'Répertoire de contenu', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Passer outre le type MIME', 'settings_overrideMimeType_desc' => 'Ne pas tenir compte du type MIME envoyé par le navigateur quand un fichier est téléversé. Le type MIME sera déterminé par SeedDMS.', 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 14b61726a..b806dde70 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1411,6 +1411,8 @@ Internet poveznica: [url]', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', 'settings_no_content_dir' => 'Mapa sadržaja', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Premosti tip datoteke', 'settings_overrideMimeType_desc' => 'Premošćivanje tipa datoteke određenog od strane pretraživača ako je datoteka učitana. Novi tip datoteke se određuje od strane DMS sustava.', 'settings_partitionSize' => 'Veličina djelomične datoteke', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 6e68cf456..fbce10eaf 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1389,6 +1389,8 @@ URL: [url]', 'settings_Notification' => 'Értesítés beállításai', 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.', 'settings_no_content_dir' => 'Tartalom könyvtár', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Részleges fájlméret', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index f4674863b..4cdcff3f9 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1445,6 +1445,8 @@ Name: [username] 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', 'settings_no_content_dir' => 'Cartella contenitore', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Ignora MimeType', 'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.', 'settings_partitionSize' => 'Dimensione file parziale', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index ed9171373..6f6c35321 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1405,6 +1405,8 @@ URL : [url]', 'settings_Notification' => '알림 설정', 'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.', 'settings_no_content_dir' => '내용 디렉토리', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'MIME 타입 재정의', 'settings_overrideMimeType_desc' => '파일이 업로드 되는 경우, 브라우저에 의해 제공되는 MIME 타입을 재정의 합니다. 새로운 MIME 타입은 SeedDMS에 의해 결정 됩니다.', 'settings_partitionSize' => '조각 파일 크기', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index e53d12553..bdd3107b9 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -1438,6 +1438,8 @@ URL: [url]', 'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ', 'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້', 'settings_no_content_dir' => 'ຜູ້ກຳກັບເນື້ອຫາ', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'ชนิดละครใบ้แทนที่', 'settings_overrideMimeType_desc' => 'แทนที่ ชนิดละครใบ้ ที่จัดส่งโดยเบราว์เซอร์ถ้าไฟล์ถูกอัปโหลด ชนิดละครใบ้ใหม่จะถูกกำหนดโดย SeedDMS เอง.', 'settings_partitionSize' => 'ໄຟລບາງສ່ວນ', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 20bc78f30..980e33d72 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1435,6 +1435,8 @@ Name: [username] 'settings_Notification' => 'Notificatie instellingen', 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.', 'settings_no_content_dir' => 'Inhoud map', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Override MimeType', 'settings_overrideMimeType_desc' => 'Override MimeType', 'settings_partitionSize' => 'Partitie-grootte', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 75913e9ef..12e0d82b8 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1369,6 +1369,8 @@ URL: [url]', 'settings_Notification' => 'Ustawienia powiadomień', 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.', 'settings_no_content_dir' => 'Katalog treści', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Rozmiar części pliku', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 46e715528..2f1f1609c 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1457,6 +1457,8 @@ Nome: [username] 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', 'settings_no_content_dir' => 'Diretório de conteúdo', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Substituir MimeType', 'settings_overrideMimeType_desc' => 'Substitua o MimeType entregue pelo navegador, se um arquivo for carregado. O novo MimeType é determinado pelo próprio SeedDMS.', 'settings_partitionSize' => 'Tamanho de arquivo parcial', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index eae81c265..98d53cc2a 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1412,6 +1412,8 @@ URL: [url]', 'settings_Notification' => 'Setările de notificare', 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.', 'settings_no_content_dir' => 'Director conținut', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Suprascrie MMimeType', 'settings_overrideMimeType_desc' => 'Suprascrie MimeType expus de browser, dacă un fișier este încărcat. MimeType este determinat de SeedDMS.', 'settings_partitionSize' => 'Dimensiune fișier parțială', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 94cc06907..9b1f3f640 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1419,6 +1419,8 @@ URL: [url]', 'settings_Notification' => 'Настройки извещения', 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.', 'settings_no_content_dir' => 'Каталог содержимого', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Переопределить mime тип', 'settings_overrideMimeType_desc' => 'Переопределение mime типа предоставленного браузером, если файл загружен. Новый mime тип определяется самой SeedDMS.', 'settings_partitionSize' => 'Частичный размер файла', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 752d1e628..92b62ea7a 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1459,6 +1459,8 @@ Meno: [username] 'settings_Notification' => 'Nastavenia notifikácií', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', 'settings_no_content_dir' => 'Content directory', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Override MimeType', 'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.', 'settings_partitionSize' => 'Čiastočná veľkosť súboru', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 327b150f0..b8649998f 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1432,6 +1432,8 @@ Kommentar: [comment]', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', 'settings_no_content_dir' => 'Mapp för innehåll', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Åsido Mediatyp (Mime)', 'settings_overrideMimeType_desc' => 'Åsidosätta MimeType levererad av webbläsaren, om en fil överförs. Den nya Mediatyp bestäms av SeedDMS själv.', 'settings_partitionSize' => 'Uppdelad filstorlek', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 63b1ba7a3..3d546bb16 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1391,6 +1391,8 @@ URL: [url]', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', 'settings_no_content_dir' => 'İçerik dizini', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => 'Kısmi dosya boyutu', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 2d6dc128c..90ee03d4d 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1412,6 +1412,8 @@ URL: [url]', 'settings_Notification' => 'Налаштування сповіщення', 'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.', 'settings_no_content_dir' => 'Каталог вмісту', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => 'Перевизначити mime тип', 'settings_overrideMimeType_desc' => 'Перевизначення mime типу наданого браузером, якщо файл завантажений. Новий mime тип визначається самою SeedDMS.', 'settings_partitionSize' => 'Частковий розмір файлу', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 6b1896a55..b2e4a8ac8 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -1393,6 +1393,8 @@ URL: [url]', 'settings_Notification' => '通知设置', 'settings_notwritable' => '设置_不可写', 'settings_no_content_dir' => '内容目录', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '覆盖Mime Type', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 14e0e47e3..7f878c1d1 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1242,6 +1242,8 @@ URL: [url]', 'settings_Notification' => '通知設置', 'settings_notwritable' => '', 'settings_no_content_dir' => '', +'settings_onePageMode' => '', +'settings_onePageMode_desc' => '', 'settings_overrideMimeType' => '', 'settings_overrideMimeType_desc' => '', 'settings_partitionSize' => '', From 9820d9b7f3cdd87d05ae26a69d0dad05f1964279 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 7 Nov 2019 19:54:42 +0100 Subject: [PATCH 090/198] set data-name for folder/document table rows --- views/bootstrap/class.Bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index c933ea73d..95b11d2ea 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2245,7 +2245,7 @@ $(document).ready( function() { */ function documentListRowStart($document, $class='') { /* {{{ */ $docID = $document->getID(); - return "
    ".getApprovalStatusText($st["status"])."
    ".$st["date"]."
    ". htmlspecialchars($moduser->getFullName()) ."    		".getApprovalStatusText($st["status"])."
    ".$st["date"]."
    ". htmlspecialchars($modgroup->getName()) ."
    ".getReviewStatusText($st['status'])."
    ".$st["date"]."
    ". htmlspecialchars($moduser->getFullName()) ."    		".getReviewStatusText($st['status'])."
    ".$st["date"]."
    ". htmlspecialchars($modgroup->getName()) ."
    "; $content .= "
    "; - if($subFolder->getAccessMode($user) >= M_ALL) { + $subFolderAccessMode = $subFolder->getAccessMode($user); + if($subFolderAccessMode >= M_ALL) { $content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true); } else { $content .= ''; } - if($subFolder->getAccessMode($user) >= M_READWRITE) { + if($subFolderAccessMode >= M_READWRITE) { $content .= ''; } else { $content .= ''; From 167c8a41e3bf96da42a45a4dde776976beb40068 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 14:27:58 +0100 Subject: [PATCH 134/198] allow 4 arguments passed to hook --- inc/inc.ClassControllerCommon.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php index 618fc1ca3..4c3749f54 100644 --- a/inc/inc.ClassControllerCommon.php +++ b/inc/inc.ClassControllerCommon.php @@ -203,6 +203,9 @@ class SeedDMS_Controller_Common { foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp)] as $hookObj) { if (method_exists($hookObj, $hook)) { switch(func_num_args()) { + case 4: + $result = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3)); + break; case 3: $result = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2)); break; From d27d4f118d0cf6cb9021663801184d2c6bb643c1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 14:59:23 +0100 Subject: [PATCH 135/198] add entries for 5.1.14 --- CHANGELOG | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6fae41425..91805b81b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,8 +2,11 @@ Changes in version 5.1.14 -------------------------------------------------------------------------------- - allow mimetype to specify documents which can be edited online -- show number of indexing tasks in bar +- show number of indexing tasks in progress bar - fix comparison of last indexing time with creation date of document content +- new hooks leftContentPre and leftContentPost +- minimize sql queries when fetching sub folders and documents of a folder +- custom attributes can be validated in a hook -------------------------------------------------------------------------------- Changes in version 5.1.13 From a0661536b331ff6f057722d5b3bf7a01c8407482 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 15:00:04 +0100 Subject: [PATCH 136/198] move attribute validation into controller and call hook --- controllers/class.AddDocument.php | 29 +++++++++++++++++++++++++++ controllers/class.AddSubFolder.php | 16 +++++++++++++++ controllers/class.EditDocument.php | 32 ++++++++++++++++++------------ controllers/class.EditFolder.php | 5 +++++ op/op.AddDocument.php | 14 ++++++++++++- op/op.AddSubFolder.php | 2 ++ op/op.EditDocument.php | 10 ++++++++-- op/op.EditFolder.php | 10 ++++++++-- 8 files changed, 100 insertions(+), 18 deletions(-) diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php index ff61cafaf..1d9b6393a 100644 --- a/controllers/class.AddDocument.php +++ b/controllers/class.AddDocument.php @@ -56,7 +56,36 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $reqversion = $this->getParam('reqversion'); $version_comment = $this->getParam('versioncomment'); $attributes = $this->getParam('attributes'); + foreach($attributes as $attrdefid=>$attribute) { + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { + return false; + } + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } + } elseif($attrdef->getMinValues() > 0) { + $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); + return false; + } + } + } $attributes_version = $this->getParam('attributesversion'); + foreach($attributes_version as $attrdefid=>$attribute) { + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { + return false; + } + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } + } + } + } $workflow = $this->getParam('workflow'); $notificationgroups = $this->getParam('notificationgroups'); $notificationusers = $this->getParam('notificationusers'); diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php index 0d6582855..71f86f5b6 100644 --- a/controllers/class.AddSubFolder.php +++ b/controllers/class.AddSubFolder.php @@ -40,6 +40,22 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common { $comment = $this->getParam('comment'); $sequence = $this->getParam('sequence'); $attributes = $this->getParam('attributes'); + foreach($attributes as $attrdefid=>$attribute) { + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { + return false; + } + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } + } elseif($attrdef->getMinValues() > 0) { + $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); + return false; + } + } + } $notificationgroups = $this->getParam('notificationgroups'); $notificationusers = $this->getParam('notificationusers'); diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php index 6d8714df4..d84ceae8d 100644 --- a/controllers/class.EditDocument.php +++ b/controllers/class.EditDocument.php @@ -116,22 +116,28 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common { $oldattributes = $document->getAttributes(); if($attributes) { foreach($attributes as $attrdefid=>$attribute) { - $attrdef = $dms->getAttributeDefinition($attrdefid); - if($attribute) { - if(!$attrdef->validate($attribute)) { - $this->errormsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute); - return false; - } + if($attrdef = $dms->getAttributeDefinition($attrdefid)) { + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { + if($attribute) { + if(!$attrdef->validate($attribute)) { + $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); + return false; + } - if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) { - if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) + if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) { + if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) + return false; + } + } elseif($attrdef->getMinValues() > 0) { + $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); + } elseif(isset($oldattributes[$attrdefid])) { + if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid))) + return false; + } + } else { + if($ret === false) return false; } - } elseif($attrdef->getMinValues() > 0) { - $this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName())); - } elseif(isset($oldattributes[$attrdefid])) { - if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid))) - return false; } } } diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php index f41399fe5..02c6d1163 100644 --- a/controllers/class.EditFolder.php +++ b/controllers/class.EditFolder.php @@ -51,6 +51,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common { if($attributes) { foreach($attributes as $attrdefid=>$attribute) { $attrdef = $dms->getAttributeDefinition($attrdefid); + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute); @@ -67,6 +68,10 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common { if(!$folder->removeAttribute($dms->getAttributeDefinition($attrdefid))) return false; } + } else { + if($ret === false) + return false; + } } } foreach($oldattributes as $attrdefid=>$oldattribute) { diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 5cc09cc88..a82105aa5 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -93,6 +93,7 @@ if(isset($_POST["attributes"])) $attributes = $_POST["attributes"]; else $attributes = array(); +/* Has been moved to controller foreach($attributes as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { if($attribute) { @@ -105,11 +106,13 @@ foreach($attributes as $attrdefid=>$attribute) { } } } + */ if(isset($_POST["attributes_version"])) $attributes_version = $_POST["attributes_version"]; else $attributes_version = array(); +/* Has been moved to controller foreach($attributes_version as $attrdefid=>$attribute) { $attrdef = $dms->getAttributeDefinition($attrdefid); if($attribute) { @@ -119,6 +122,7 @@ foreach($attributes_version as $attrdefid=>$attribute) { } } } + */ $reqversion = (int)$_POST["reqversion"]; if ($reqversion<1) $reqversion=1; @@ -387,7 +391,15 @@ for ($file_num=0;$file_numsetParam('defaultaccessdocs', $settings->_defaultAccessDocs); if(!$document = $controller->run()) { - UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg())); + $err = $controller->getErrorMsg(); + if(is_string($err)) + $errmsg = getMLText($err); + elseif(is_array($err)) { + $errmsg = getMLText($err[0], $err[1]); + } else { + $errmsg = $err; + } + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),$errmsg); } else { // Send notification to subscribers of folder. if($notifier) { diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index f0284d1cb..19012dd46 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -67,6 +67,7 @@ if(isset($_POST["attributes"])) $attributes = $_POST["attributes"]; else $attributes = array(); +/* foreach($attributes as $attrdefid=>$attribute) { $attrdef = $dms->getAttributeDefinition($attrdefid); if($attribute) { @@ -78,6 +79,7 @@ foreach($attributes as $attrdefid=>$attribute) { UI::exitError(getMLText("folder_title", array("foldername" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName()))); } } + */ /* Check if additional notification shall be added */ $notusers = array(); diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index 5c3a66d4f..a8ef4fbc4 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -127,9 +127,15 @@ $controller->setParam('expires', $expires); $controller->setParam('sequence', $sequence); $controller->setParam('attributes', $attributes); if(!$controller->run()) { - if($controller->getErrorMsg()) { - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $controller->getErrorMsg()); + $err = $controller->getErrorMsg(); + if(is_string($err)) + $errmsg = getMLText($err); + elseif(is_array($err)) { + $errmsg = getMLText($err[0], $err[1]); + } else { + $errmsg = $err; } + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg); } if ($oldname != $name) { diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 050d6b3f5..6ea93f654 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -80,9 +80,15 @@ $controller->setParam('comment', $comment); $controller->setParam('sequence', $sequence); $controller->setParam('attributes', $attributes); if(!$controller->run()) { - if($controller->getErrorMsg()) { - UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())), $controller->getErrorMsg()); + $err = $controller->getErrorMsg(); + if(is_string($err)) + $errmsg = getMLText($err); + elseif(is_array($err)) { + $errmsg = getMLText($err[0], $err[1]); + } else { + $errmsg = $err; } + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())), $errmsg); } if($oldname != $name) { From 058fc1217e21263ed0d03295fd6548b6e46756f1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 13 Dec 2019 17:39:05 +0100 Subject: [PATCH 137/198] fix validation of attributes --- controllers/class.AddDocument.php | 16 ++++++++++------ controllers/class.AddSubFolder.php | 8 +++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php index 1d9b6393a..2b9942c86 100644 --- a/controllers/class.AddDocument.php +++ b/controllers/class.AddDocument.php @@ -58,9 +58,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $attributes = $this->getParam('attributes'); foreach($attributes as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { - if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { - return false; - } + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); @@ -70,20 +68,26 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); return false; } + } else { + if($ret === false) + return false; + } } } $attributes_version = $this->getParam('attributesversion'); foreach($attributes_version as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { - if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { - return false; - } + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); return false; } } + } else { + if($ret === false) + return false; + } } } $workflow = $this->getParam('workflow'); diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php index 71f86f5b6..539dcec12 100644 --- a/controllers/class.AddSubFolder.php +++ b/controllers/class.AddSubFolder.php @@ -42,9 +42,7 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common { $attributes = $this->getParam('attributes'); foreach($attributes as $attrdefid=>$attribute) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) { - if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { - return false; - } + if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) { if($attribute) { if(!$attrdef->validate($attribute)) { $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); @@ -54,6 +52,10 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common { $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); return false; } + } else { + if($ret === false) + return false; + } } } $notificationgroups = $this->getParam('notificationgroups'); From c332e0393b0591df1357b57c35d67c670aac5811 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 09:03:59 +0100 Subject: [PATCH 138/198] add new config variable noDocumentFormFields used for hiding some fields like comment, keywords, categories, ... --- inc/inc.ClassSettings.php | 6 ++ op/op.Settings.php | 4 ++ out/out.AddDocument.php | 1 + out/out.EditDocument.php | 1 + views/bootstrap/class.AddDocument.php | 11 +++- views/bootstrap/class.EditDocument.php | 84 +++++++++++++++++++++----- views/bootstrap/class.Settings.php | 1 + 7 files changed, 92 insertions(+), 16 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 564f4adda..35ed72a4b 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -70,6 +70,9 @@ class Settings { /* {{{ */ var $_defaultAccessDocs = ''; // Strict form checking var $_strictFormCheck = false; + // list of form fields which are visible by default but can be explixitly + // turn off (comment, keywords, categories, sequence, expiration, owner + var $_noDocumentFormFields = array(); // Path to where SeedDMS is located var $_rootDir = null; // Path to SeedDMS_Core @@ -455,6 +458,8 @@ class Settings { /* {{{ */ $node = $xml->xpath('/configuration/site/edition'); $tab = $node[0]->attributes(); $this->_strictFormCheck = Settings::boolVal($tab["strictFormCheck"]); + if(trim(strval($tab["noDocumentFormFields"]))) + $this->_noDocumentFormFields = explode(',',strval($tab["noDocumentFormFields"])); $this->setViewOnlineFileTypesFromString(strval($tab["viewOnlineFileTypes"])); $this->setEditOnlineFileTypesFromString(strval($tab["editOnlineFileTypes"])); $this->_enableConverting = Settings::boolVal($tab["enableConverting"]); @@ -802,6 +807,7 @@ class Settings { /* {{{ */ // XML Path: /configuration/site/edition $node = $this->getXMLNode($xml, '/configuration/site', 'edition'); $this->setXMLAttributValue($node, "strictFormCheck", $this->_strictFormCheck); + $this->setXMLAttributValue($node, "noDocumentFormFields", implode(',', $this->_noDocumentFormFields)); $this->setXMLAttributValue($node, "viewOnlineFileTypes", $this->getViewOnlineFileTypesToString()); $this->setXMLAttributValue($node, "editOnlineFileTypes", $this->getEditOnlineFileTypesToString()); $this->setXMLAttributValue($node, "enableConverting", $this->_enableConverting); diff --git a/op/op.Settings.php b/op/op.Settings.php index ae396169a..be279b10f 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -76,6 +76,10 @@ if ($action == "saveSettings") // SETTINGS - SITE - EDITION $settings->_strictFormCheck = getBoolValue("strictFormCheck"); + if(empty($_POST["noDocumentFormFields"])) + $settings->_noDocumentFormFields = array(); + else + $settings->_noDocumentFormFields = $_POST["noDocumentFormFields"]; $settings->setViewOnlineFileTypesFromString($_POST["viewOnlineFileTypes"]); $settings->setEditOnlineFileTypesFromString($_POST["editOnlineFileTypes"]); $settings->_enableConverting = getBoolValue("enableConverting"); diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index 82a68ec8e..0cc16f138 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -56,6 +56,7 @@ if($settings->_quota > 0) { if($view) { $view->setParam('folder', $folder); $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('nodocumentformfields', $settings->_noDocumentFormFields); $view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload); $view->setParam('enablemultiupload', $settings->_enableMultiUpload); $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); diff --git a/out/out.EditDocument.php b/out/out.EditDocument.php index a4cfd8e72..f7ffa2318 100644 --- a/out/out.EditDocument.php +++ b/out/out.EditDocument.php @@ -59,6 +59,7 @@ $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault)); if($view) { + $view->setParam('nodocumentformfields', $settings->_noDocumentFormFields); $view->setParam('defaultposition', $settings->_defaultDocPosition); $view->setParam('accessobject', $accessop); $view($_GET); diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 156ba0904..b97e45d08 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -154,6 +154,7 @@ $(document).ready(function() { $enableownerrevapp = $this->params['enableownerrevapp']; $enableselfrevapp = $this->params['enableselfrevapp']; $strictformcheck = $this->params['strictformcheck']; + $nodocumentformfields = $this->params['nodocumentformfields']; $dropfolderdir = $this->params['dropfolderdir']; $dropfolderfile = $this->params['dropfolderfile']; $workflowmode = $this->params['workflowmode']; @@ -202,6 +203,7 @@ $(document).ready(function() { 'required'=>false ) ); + if(!$nodocumentformfields || !in_array('comment', $nodocumentformfields)) $this->formField( getMLText("comment"), array( @@ -212,10 +214,12 @@ $(document).ready(function() { 'required'=>$strictformcheck ) ); + if(!$nodocumentformfields || !in_array('keywords', $nodocumentformfields)) $this->formField( getMLText("keywords"), $this->getKeywordChooserHtml('form1') ); + if(!$nodocumentformfields || !in_array('categories', $nodocumentformfields)) { $options = array(); $categories = $dms->getDocumentCategories(); foreach($categories as $category) { @@ -232,7 +236,11 @@ $(document).ready(function() { 'options'=>$options ) ); - $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "
    ".getMLText('order_by_sequence_off') : '')); + } + if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) { + $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "
    ".getMLText('order_by_sequence_off') : '')); + } + if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { if($presetexpiration) { if(!($expts = strtotime($presetexpiration))) $expts = false; @@ -259,6 +267,7 @@ $(document).ready(function() { getMLText("expires"), $this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage()) ); + } if($user->isAdmin()) { $options = array(); $allUsers = $dms->getAllUsers($sortusersinlist); diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index 937245c4b..c0a6977ca 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -71,6 +71,7 @@ $(document).ready( function() { $document = $this->params['document']; $attrdefs = $this->params['attrdefs']; $strictformcheck = $this->params['strictformcheck']; + $nodocumentformfields = $this->params['nodocumentformfields']; $orderby = $this->params['orderby']; $this->htmlAddHeader(''."\n", 'js'); @@ -101,21 +102,46 @@ $(document).ready( function() { 'required'=>true ) ); - $this->formField( - getMLText("comment"), - array( - 'element'=>'textarea', - 'name'=>'comment', - 'rows'=>4, - 'cols'=>80, - 'value'=>htmlspecialchars($document->getComment()), - 'required'=>$strictformcheck - ) - ); - $this->formField( - getMLText("keywords"), - $this->getKeywordChooserHtml('form1', $document->getKeywords()) - ); + if(!$nodocumentformfields || !in_array('comment', $nodocumentformfields)) { + $this->formField( + getMLText("comment"), + array( + 'element'=>'textarea', + 'name'=>'comment', + 'rows'=>4, + 'cols'=>80, + 'value'=>htmlspecialchars($document->getComment()), + 'required'=>$strictformcheck + ) + ); + } else { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'comment', + 'value'=>htmlspecialchars($document->getComment()), + ) + ); + } + if(!$nodocumentformfields || !in_array('keywords', $nodocumentformfields)) { + $this->formField( + getMLText("keywords"), + $this->getKeywordChooserHtml('form1', $document->getKeywords()) + ); + } else { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'keywords', + 'value'=>htmlspecialchars($document->getKeywords()), + ) + ); + } + if(!$nodocumentformfields || !in_array('categories', $nodocumentformfields)) { $options = array(); $categories = $dms->getDocumentCategories(); foreach($categories as $category) { @@ -132,6 +158,21 @@ $(document).ready( function() { 'options'=>$options ) ); + } else { + $categories = $document->getCategories(); + foreach($categories as $category) { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'categories[]', + 'value'=>htmlspecialchars($category->getId()), + ) + ); + } + } + if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { $options = array(); $options[] = array('never', getMLText('does_not_expire')); $options[] = array('date', getMLText('expire_by_date'), $expdate != ''); @@ -152,9 +193,22 @@ $(document).ready( function() { getMLText("expires"), $this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage()) ); + } else { + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'expdate', + 'value'=>$expdate, + ) + ); + } + if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) { if ($folder->getAccessMode($user) > M_READ) { $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s'), $document->getID()).($orderby != 's' ? "
    ".getMLText('order_by_sequence_off') : '')); } + } if($attrdefs) { foreach($attrdefs as $attrdef) { $arr = $this->callHook('editDocumentAttribute', $document, $attrdef); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 5bf83d692..9ca469a16 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -286,6 +286,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> showConfigHeadline('settings_Edition'); ?> showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?> +showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment'), true, true); ?> showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?> showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?> showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?> From 223c44c96557720dea06b3a1585ef36f48b52e65 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 09:07:02 +0100 Subject: [PATCH 139/198] various minor updates and new keys --- languages/ar_EG/lang.inc | 8 ++++++++ languages/bg_BG/lang.inc | 8 ++++++++ languages/ca_ES/lang.inc | 8 ++++++++ languages/cs_CZ/lang.inc | 12 ++++++++++-- languages/de_DE/lang.inc | 12 ++++++++++-- languages/el_GR/lang.inc | 12 ++++++++++-- languages/en_GB/lang.inc | 12 ++++++++++-- languages/es_ES/lang.inc | 8 ++++++++ languages/fr_FR/lang.inc | 8 ++++++++ languages/hr_HR/lang.inc | 14 +++++++++++--- languages/hu_HU/lang.inc | 12 ++++++++++-- languages/it_IT/lang.inc | 8 ++++++++ languages/ko_KR/lang.inc | 8 ++++++++ languages/lo_LA/lang.inc | 8 ++++++++ languages/nl_NL/lang.inc | 8 ++++++++ languages/pl_PL/lang.inc | 38 +++++++++++++++++++++++--------------- languages/pt_BR/lang.inc | 8 ++++++++ languages/ro_RO/lang.inc | 14 +++++++++++--- languages/ru_RU/lang.inc | 8 ++++++++ languages/sk_SK/lang.inc | 24 ++++++++++++++++-------- languages/sv_SE/lang.inc | 8 ++++++++ languages/tr_TR/lang.inc | 8 ++++++++ languages/uk_UA/lang.inc | 8 ++++++++ languages/zh_CN/lang.inc | 8 ++++++++ languages/zh_TW/lang.inc | 16 ++++++++++++---- 25 files changed, 243 insertions(+), 43 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index fe76d37c6..f5d76fb4b 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -454,6 +454,7 @@ URL: [url]', 'edit_folder_props' => 'تعديل مجلد', 'edit_group' => 'تعديل مجموعة', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'تعديل المستخدم', @@ -601,6 +602,7 @@ URL: [url]', 'group_members' => 'أعضاء المجموعة', 'group_receipt_summary' => '', 'group_review_summary' => 'ملخص مراجعة المجموعة', +'group_revision_summary' => '', 'guest_login' => 'الدخول كضيف', 'guest_login_disabled' => 'دخول ضيف غير متاح.', 'hash' => '', @@ -804,6 +806,7 @@ Parent folder: [folder_path] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - مجلد جديد', 'new_user_image' => 'صورة جديدة', +'next_revision_abbr' => '', 'next_state' => 'حالة جديدة', 'nl_NL' => 'الهولندي', 'no' => 'لا', @@ -1033,6 +1036,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1385,6 +1389,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', @@ -1550,6 +1556,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1771,6 +1778,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف يحتوى معلومات الاصدار لمجمل مجلد النظام. بعد الانشاء كل ملف سيتم حفظه داخل المجلد الخاص به', 'versioning_info' => 'معلومات الاصدار', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'تم مسح الاصدار', 'version_deleted_email_body' => 'تم مسح الاصدار Document: [name] diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index a35fb8e69..5e6d58808 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -407,6 +407,7 @@ $text = array( 'edit_folder_props' => 'Редактирай папка', 'edit_group' => 'Редактирай група', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Редактирай потребител', @@ -530,6 +531,7 @@ $text = array( 'group_members' => 'Членове на групата', 'group_receipt_summary' => '', 'group_review_summary' => 'Сводка по рецензирането на групи', +'group_revision_summary' => '', 'guest_login' => 'Влез като гост', 'guest_login_disabled' => 'Входът като гост изключен', 'hash' => '', @@ -717,6 +719,7 @@ $text = array( 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', 'new_user_image' => 'Ново изображение', +'next_revision_abbr' => '', 'next_state' => 'Ново състояние', 'nl_NL' => 'Холандски', 'no' => 'Не', @@ -909,6 +912,7 @@ $text = array( 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1248,6 +1252,8 @@ $text = array( 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.', @@ -1413,6 +1419,7 @@ $text = array( 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1625,6 +1632,7 @@ $text = array( 'versioning_file_creation_warning' => 'Тази операция ще създаде файл с версия за всяка папка. След създаване файлът ще бъде съхранен в каталога на документите.', 'versioning_info' => 'Информация за версиите', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'Версията е премахната', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index d7b84ca99..6ade3b629 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -412,6 +412,7 @@ URL: [url]', 'edit_folder_props' => 'Editar directori', 'edit_group' => 'Editar grup...', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuari...', @@ -535,6 +536,7 @@ URL: [url]', 'group_members' => 'Membres del grup', 'group_receipt_summary' => '', 'group_review_summary' => 'Resum del grup revisor', +'group_revision_summary' => '', 'guest_login' => 'Accés com a invitat', 'guest_login_disabled' => 'El compte d\'invitat està deshabilitat.', 'hash' => '', @@ -722,6 +724,7 @@ URL: [url]', 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', 'new_user_image' => 'Nova imatge', +'next_revision_abbr' => '', 'next_state' => '', 'nl_NL' => 'Holandès', 'no' => 'No', @@ -914,6 +917,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1253,6 +1257,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', @@ -1418,6 +1424,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1630,6 +1637,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Amb aquesta operació podeu crear un fitxer que contingui la informació de versions d\'una carpeta del DMS completa. Després de la creació, tots els fitxers es guardaran a la carpeta de documents.', 'versioning_info' => 'Informació de versions', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'Versió eliminada', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 48e05feb7..93cbd0d66 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1527), kreml (579) +// Translators: Admin (1528), kreml (579) $text = array( '2_factor_auth' => 'dvoufaktorové ověření', @@ -485,6 +485,7 @@ Odkaz je platný do [valid]. 'edit_folder_props' => 'Upravit složku', 'edit_group' => 'Upravit skupinu', 'edit_online' => 'Upravit online', +'edit_online_warning' => '', 'edit_task' => 'Upravit úkol', 'edit_transmittal_props' => 'Upravit vlastnosti přenosu', 'edit_user' => 'Upravit uživatele', @@ -553,7 +554,7 @@ URL: [url]', 'extension_loading' => 'Načítání rozšíření', 'extension_manager' => 'Správa rozšíření', 'extension_mgr_installed' => 'Instalováno', -'extension_mgr_no_upload' => '', +'extension_mgr_no_upload' => 'Nahrání nového rozšíření není možné, jelikož do složky rozšíření nelze zapisovat.', 'extension_mgr_repository' => 'Dostupný', 'extension_version_list' => 'Verze', 'february' => 'Únor', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Členové skupiny', 'group_receipt_summary' => 'Přehled potvrzení přijímání do skupiny', 'group_review_summary' => 'Souhrn recenzí skupiny', +'group_revision_summary' => '', 'guest_login' => 'Přihlásit se jako host', 'guest_login_disabled' => 'Přihlášení jako host je vypnuté.', 'hash' => 'Hash', @@ -842,6 +844,7 @@ Uživatel: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nová složka', 'new_user_image' => 'Nový obrázek', +'next_revision_abbr' => '', 'next_state' => 'Nový stav', 'nl_NL' => 'Holandština', 'no' => 'Ne', @@ -1107,6 +1110,7 @@ URL: [url]', 'revision_status' => 'Status revize', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revizoři', 'revisor_already_assigned' => 'Uživatel je již přiřazen jako revizor.', 'revisor_already_removed' => 'Revizor byl již z revizního procesu odstraněn nebo již dokument revidoval.', @@ -1464,6 +1468,8 @@ Jméno: [username] 'settings_maxUploadSize' => 'Maximální velikost nahraných souborů', 'settings_maxUploadSize_desc' => 'Toto je maximální velikost nahraných souborů. Bude mít vliv na verze dokumentů a přílohy.', 'settings_more_settings' => 'Konfigurovat další nastavení. Výchozí přihlášení: admin / admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nenalezeno', 'settings_Notification' => 'Nastavení upozornění', 'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.', @@ -1629,6 +1635,7 @@ Jméno: [username] 'splash_edit_group' => 'Skupina uložena', 'splash_edit_role' => 'Role uložena', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Uživatel uložen', 'splash_error_add_to_transmittal' => 'Chyba při přidávání dokumentu k přenosu', 'splash_error_rm_download_link' => 'Chyba při odstranění odkazu ke stažení', @@ -1850,6 +1857,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Pomocí této operace můžete vytvořit soubor obsahující informace o verzování celé složky DMS. Po vytvoření bude každý soubor uložen uvnitř složky dokumentů.', 'versioning_info' => 'Info verzování', 'versiontolow' => 'Příliš nízká verze', +'version_comment' => '', 'version_deleted_email' => 'Verze smazána', 'version_deleted_email_body' => 'Verze smazána Dokument: [name] diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ac3564de0..ab04466e2 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2717), dgrutsch (22) +// Translators: Admin (2726), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -484,6 +484,7 @@ Der Link ist bis zum [valid] gültig. 'edit_folder_props' => 'Bearbeiten', 'edit_group' => 'Gruppe bearbeiten', 'edit_online' => 'Online editieren', +'edit_online_warning' => 'Mit dem Speichern wird die aktuellen Version des Dokuments überschrieben. Es wird keine neue Version angelegt.', 'edit_task' => 'Task editieren', 'edit_transmittal_props' => 'Attribute der Dokumentenliste bearbeiten', 'edit_user' => 'Benutzer bearbeiten', @@ -638,6 +639,7 @@ URL: [url]', 'group_members' => 'Gruppenmitglieder', 'group_receipt_summary' => 'Übersicht Gruppenbestätigungen', 'group_review_summary' => 'Übersicht Gruppenprüfungen', +'group_revision_summary' => 'Übersicht Gruppenwiederholungsprüfungen', 'guest_login' => 'Als Gast anmelden', 'guest_login_disabled' => 'Anmeldung als Gast ist gesperrt.', 'hash' => 'Hash-Wert', @@ -840,6 +842,7 @@ Benutzer: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [folder_name] - Neuer Ordner', 'new_user_image' => 'Neues Bild', +'next_revision_abbr' => 'Nächste Wieder.-Prüf.', 'next_state' => 'Neuer Status', 'nl_NL' => 'Niederländisch', 'no' => 'Nein', @@ -1117,6 +1120,7 @@ Kommentar: [comment] Benutzer: [username] URL: [url]', 'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilen', +'revision_summary' => 'Übersicht Wiederholungsprüfungen', 'revisors' => 'Wiederholungsprüfer', 'revisor_already_assigned' => 'Benutzer bereits als Wiederholungsprüfer eingetragen.', 'revisor_already_removed' => 'Wiederholungsprüfer wurde bereits vom Prozess ausgeschlossen oder hat das Dokument bereits geprüft.', @@ -1317,7 +1321,7 @@ Name: [username] 'settings_dropFolderDir_desc' => 'Dieses Verzeichnis kann dazu benutzt werden Dokumente auf dem Server abzulegen und von dort zu importieren anstatt sie über den Browser hochzuladen. Das Verzeichnis muss ein Unterverzeichnis mit dem Login-Namen des angemeldeten Benutzers beinhalten.', 'settings_Edition' => 'Funktions-Einstellungen', 'settings_editOnlineFileTypes' => 'Dateitypen für Online-Editieren', -'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).', +'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen oder Mimetypes können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).', 'settings_enable2FactorAuthentication' => '2-Faktor Authentifizierung einschalten', 'settings_enable2FactorAuthentication_desc' => 'Schaltet die 2-Faktor Authentifizierung ein, welche den Google Authenticator auf dem Mobiltelefon erfordert.', 'settings_enableAcknowledgeWorkflow' => '', @@ -1474,6 +1478,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale Größe hochzuladener Dateien', 'settings_maxUploadSize_desc' => 'Dies ist die maximale Größe einer hochzuladenen Datei. Es begrenzt sowohl Dokumentenversionen als auch Anhänge.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', +'settings_noFormFields' => 'Diese Felder nicht zeigen', +'settings_noFormFields_desc' => 'Diese Felder werden bei der Neuanlage und beim Bearbeiten eines Dokuments nicht angezeigt. Bestehende Werte werden beibehalten.', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.', @@ -1639,6 +1645,7 @@ Name: [username] 'splash_edit_group' => 'Gruppe gespeichert', 'splash_edit_role' => 'Rolle gespeichert', 'splash_edit_task' => 'Task gespeichert', +'splash_edit_transmittal' => 'Dokumentenliste gespeichert', 'splash_edit_user' => 'Benutzer gespeichert', 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste', 'splash_error_rm_download_link' => 'Fehler beim Löschen des Download-Links', @@ -1860,6 +1867,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Mit dieser Operation erzeugen Sie pro Dokument eine Datei, die sämtliche Versions-Informationen des Dokuments enthält. Nach Erstellung wird jede Datei im Dokumentenverzeichnis gespeichert. Die erzeugten Dateien sind für den regulären Betrieb nicht erforderlich. Sie können aber von Nutzen sein, wenn der Dokumentenbestand auf ein anderes System übertragen werden soll.', 'versioning_info' => 'Versionsinformationen', 'versiontolow' => 'Version zu niedrig', +'version_comment' => 'Kommentar der Version', 'version_deleted_email' => 'Version gelöscht', 'version_deleted_email_body' => 'Version gelöscht Dokument: [name] diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 8a12d392a..04bdd53e8 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/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 (281) +// Translators: Admin (282) $text = array( '2_factor_auth' => '', @@ -407,6 +407,7 @@ $text = array( 'edit_folder_props' => 'Επεξεργασία φακέλου', 'edit_group' => '', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => '', @@ -530,6 +531,7 @@ $text = array( 'group_members' => 'Μέλη ομάδας', 'group_receipt_summary' => '', 'group_review_summary' => '', +'group_revision_summary' => '', 'guest_login' => '', 'guest_login_disabled' => '', 'hash' => '', @@ -728,6 +730,7 @@ User: [username] URL: [url]', 'new_subfolder_email_subject' => '', 'new_user_image' => '', +'next_revision_abbr' => '', 'next_state' => '', 'nl_NL' => 'Δανέζικα', 'no' => 'Όχι', @@ -842,7 +845,7 @@ URL: [url]', 'receipt_status' => '', 'receipt_summary' => '', 'receipt_update_failed' => '', -'recent_uploads' => '', +'recent_uploads' => 'Πρόσφατες μεταφορτώσεις', 'reception' => '', 'reception_acknowleged' => '', 'reception_noaction' => '', @@ -920,6 +923,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1259,6 +1263,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', @@ -1424,6 +1430,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1636,6 +1643,7 @@ URL: [url]', 'versioning_file_creation_warning' => '', 'versioning_info' => '', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => '', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 50e9f528f..c720e74f2 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1813), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (1822), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -485,6 +485,7 @@ The link is valid until [valid]. 'edit_folder_props' => 'Edit folder', 'edit_group' => 'Edit group', 'edit_online' => 'Edit online', +'edit_online_warning' => 'Saving your changes will overwrite the content of the current version, instead of creating a new version.', 'edit_task' => 'Edit task', 'edit_transmittal_props' => 'Edit transmittal properties', 'edit_user' => 'Edit user', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Group members', 'group_receipt_summary' => 'Group receipt summary', 'group_review_summary' => 'Group review summary', +'group_revision_summary' => 'Group revision summary', 'guest_login' => 'Login as guest', 'guest_login_disabled' => 'Guest login is disabled.', 'hash' => 'Hash', @@ -842,6 +844,7 @@ User: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - New folder', 'new_user_image' => 'New image', +'next_revision_abbr' => 'Next Rev.', 'next_state' => 'New state', 'nl_NL' => 'Dutch', 'no' => 'No', @@ -1112,6 +1115,7 @@ URL: [url]', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => 'Revision summary', 'revisors' => 'Revisors', 'revisor_already_assigned' => 'User is already assigned as an revisor.', 'revisor_already_removed' => 'Revisor has already been removed from revision process or has already revised the document.', @@ -1312,7 +1316,7 @@ Name: [username] 'settings_dropFolderDir_desc' => 'This directory can be used for dropping files on the server\'s file system and importing them from there instead of uploading via the browser. The directory must contain a sub directory for each user who is allowed to import files this way.', 'settings_Edition' => 'Edition settings', 'settings_editOnlineFileTypes' => 'Edit Online File Types', -'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings can be edited online (USE ONLY LOWER CASE CHARACTERS)', +'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings or mime types can be edited online (USE ONLY LOWER CASE CHARACTERS)', 'settings_enable2FactorAuthentication' => 'Enable 2-factor authentication', 'settings_enable2FactorAuthentication_desc' => 'Enable/disable 2 factor authentication. The users will need the Google Authenticator on its mobile phone.', 'settings_enableAcknowledgeWorkflow' => '', @@ -1469,6 +1473,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maxium size for uploaded files', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', +'settings_noFormFields' => 'Do not show this fields', +'settings_noFormFields_desc' => 'This fields will not been show when adding or edition a document. Existing values will be kept.', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', @@ -1634,6 +1640,7 @@ Name: [username] 'splash_edit_group' => 'Group saved', 'splash_edit_role' => 'Role saved', 'splash_edit_task' => 'Task saved', +'splash_edit_transmittal' => 'Transmittal saved', 'splash_edit_user' => 'User saved', 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal', 'splash_error_rm_download_link' => 'Error when removing download link', @@ -1855,6 +1862,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'With this operation you can create a file for each document containing the versioning information of that document. After the creation every file will be saved inside the document folder. Those files are not needed for the regular operation of the dms, but could be of value if the complete repository shall be transferred to an other system.', 'versioning_info' => 'Versioning info', 'versiontolow' => 'Version to low', +'version_comment' => 'Comment of version', 'version_deleted_email' => 'Version deleted', 'version_deleted_email_body' => 'Version deleted Document: [name] diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 4a9d982fd..362cdd090 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -461,6 +461,7 @@ URL: [url]', 'edit_folder_props' => 'Editar carpeta', 'edit_group' => 'Editar grupo...', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuario...', @@ -608,6 +609,7 @@ URL: [url]', 'group_members' => 'Miembros de grupo', 'group_receipt_summary' => '', 'group_review_summary' => 'Resumen del grupo revisor', +'group_revision_summary' => '', 'guest_login' => 'Acceso como invitado', 'guest_login_disabled' => 'La cuenta de invitado está deshabilitada.', 'hash' => '', @@ -811,6 +813,7 @@ Usuario: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nueva carpeta', 'new_user_image' => 'Nueva imagen', +'next_revision_abbr' => '', 'next_state' => 'Nuevo estado', 'nl_NL' => 'Holandes', 'no' => 'No', @@ -1048,6 +1051,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1400,6 +1404,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Tamaño máximo de subida archivos', 'settings_maxUploadSize_desc' => 'Tamaño máximo de archivos a cargar. Se tomará en cuenta para versiones de documentos y anexos de correo electrónico', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', @@ -1565,6 +1571,7 @@ URL: [url]', 'splash_edit_group' => 'Grupo guardado', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Usuario guardado', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1786,6 +1793,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Con esta operación usted puede crear un fichero que contenga la información de versiones de una carpeta del DMS completa. Después de la creación todos los ficheros se guardarán en la carpeta de documentos.', 'versioning_info' => 'Información de versiones', 'versiontolow' => 'Versión', +'version_comment' => '', 'version_deleted_email' => 'Versión eliminada', 'version_deleted_email_body' => 'Versión eliminada Documento: [name] diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index dc223ee4a..7689bf37d 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -485,6 +485,7 @@ Le lien est valide jusqu’au [valid]. 'edit_folder_props' => 'Modifier le dossier', 'edit_group' => 'Modifier un groupe', 'edit_online' => 'Modification en ligne', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Modifier les propriétés de la transmission', 'edit_user' => 'Modifier un utilisateur', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Membres du groupe', 'group_receipt_summary' => 'Vue d’ensemble groupe réception', 'group_review_summary' => 'Vue d’ensemble groupe vérification', +'group_revision_summary' => '', 'guest_login' => 'Se connecter comme invité', 'guest_login_disabled' => 'Connexion d\'invité désactivée.', 'hash' => 'Hash', @@ -842,6 +844,7 @@ Utilisateur : [username] URL : [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nouveau dossier', 'new_user_image' => 'Nouvelle image', +'next_revision_abbr' => '', 'next_state' => 'Nouvel état', 'nl_NL' => 'Danois', 'no' => 'Non', @@ -1102,6 +1105,7 @@ URL : [url]', 'revision_status' => 'État', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Réviseurs', 'revisor_already_assigned' => 'L’utilisateur est déjà attribué en tant que réviseur.', 'revisor_already_removed' => 'Le réviseur a déjà été retiré du processus de révision ou a déjà révisé le document.', @@ -1453,6 +1457,8 @@ Nom : [username] 'settings_maxUploadSize' => 'Taille max. des fichiers', 'settings_maxUploadSize_desc' => 'Taille maximale (en octets) pour les fichiers téléversés. Concerne les versions d’un document et les fichiers attachés.', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', @@ -1618,6 +1624,7 @@ Nom : [username] 'splash_edit_group' => 'Groupe modifié', 'splash_edit_role' => 'Rôle modifié', 'splash_edit_task' => 'Tâche modifiée', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Utilisateur modifié', 'splash_error_add_to_transmittal' => 'Erreur lors de l’ajout du document à la transmission', 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement', @@ -1839,6 +1846,7 @@ URL : [url]', 'versioning_file_creation_warning' => 'Cette opération permet de créer, pour chaque document, un fichier texte contenant les informations générales et l’historique des versions du document. Chaque fichier sera enregistré dans le répertoire du document. Ces fichiers ne sont pas nécessaires au bon fonctionnement de SeedDMS, mais ils peuvent être utiles en cas de transfert des fichiers vers un autre système.', 'versioning_info' => 'Versions', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => 'Version supprimée', 'version_deleted_email_body' => 'Version supprimée Document: [name] diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 0ebfc4e25..87535ebb7 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1223), marbanas (16) +// Translators: Admin (1225), marbanas (16) $text = array( '2_factor_auth' => '', @@ -466,6 +466,7 @@ Internet poveznica: [url]', 'edit_folder_props' => 'Uredi mapu', 'edit_group' => 'Uredi mapu', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Izmjena postavki proslijeđivanja', 'edit_user' => 'Uredi korisnika', @@ -613,6 +614,7 @@ Internet poveznica: [url]', 'group_members' => 'Članovi grupe', 'group_receipt_summary' => 'Sažetak prijema za grupu', 'group_review_summary' => 'Sažetak pregleda grupe', +'group_revision_summary' => '', 'guest_login' => 'Prijavite se kao gost', 'guest_login_disabled' => 'Prijava "kao gost" je onemogućena.', 'hash' => '', @@ -815,6 +817,7 @@ Korisnik: [username] Internet poveznica: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nova mapa', 'new_user_image' => 'Nova slika', +'next_revision_abbr' => '', 'next_state' => 'Slijedeći status', 'nl_NL' => 'Nizozemski', 'no' => 'Ne', @@ -1069,6 +1072,7 @@ Internet poveznica: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revizori', 'revisor_already_assigned' => 'Korisnik je već dodijeljen kao revizor', 'revisor_already_removed' => 'Revizor je uklonjen iz procesa revizije ili je već revidirao dokument.', @@ -1421,6 +1425,8 @@ Internet poveznica: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', @@ -1586,6 +1592,7 @@ Internet poveznica: [url]', 'splash_edit_group' => 'Groupa pohranjena', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Korisnik pohranjen', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1722,8 +1729,8 @@ Internet poveznica: [url]', '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' => '', +'transfer_no_read_access' => 'Korisnik nema pravo čitanja u ovom folderu', +'transfer_no_write_access' => 'Korisnik nema pravo pisanja u ovom folderu', 'transfer_objects' => '', 'transfer_objects_to_user' => '', 'transfer_to_user' => 'Prijenos korisniku', @@ -1807,6 +1814,7 @@ Internet poveznica: [url]', 'versioning_file_creation_warning' => 'Ovo radnjom možete izraditi datoteku koja sadrži informacije o verzijama cijele DMS mape. Nakon izrade, svaka datoteka će biti pohranjena unutar podatkovne mape.', 'versioning_info' => 'Info o verzijama', 'versiontolow' => 'Na nižu verziju', +'version_comment' => '', 'version_deleted_email' => 'Izbrisana verzija', 'version_deleted_email_body' => 'Izbrisana verzija Dokument: [name] diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 93408b6c4..de3034b48 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (634), ribaz (1036) +// Translators: Admin (635), ribaz (1036) $text = array( '2_factor_auth' => 'Kétfaktoros azonosítás', @@ -461,6 +461,7 @@ URL: [url]', 'edit_folder_props' => 'Mappa szerkesztése', 'edit_group' => 'Csoport szerkesztése', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Felhasználó szerkesztése', @@ -608,6 +609,7 @@ URL: [url]', 'group_members' => 'Csoporttagok', 'group_receipt_summary' => '', 'group_review_summary' => 'Csoport felülvizsgálat összefoglaló', +'group_revision_summary' => '', 'guest_login' => 'Bejelentkezés vendégként', 'guest_login_disabled' => 'Vendég bejelentkezés letiltva.', 'hash' => 'hash', @@ -811,6 +813,7 @@ Felhasználó: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Új mappa', 'new_user_image' => 'Új kép', +'next_revision_abbr' => '', 'next_state' => 'Új állapot', 'nl_NL' => 'Holland', 'no' => 'Nem', @@ -1048,6 +1051,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1150,7 +1154,7 @@ URL: [url]', 'select_one' => 'Vßlasszon egyet', 'select_user' => 'Felhasználó kiválasztása', 'select_users' => 'Kattintson a felhasználó kiválasztásához', -'select_value' => '', +'select_value' => 'Érték kiválasztása', 'select_workflow' => 'Munkafolyamat választás', 'send_email' => 'email küldés', 'send_login_data' => '', @@ -1399,6 +1403,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.', @@ -1564,6 +1570,7 @@ URL: [url]', 'splash_edit_group' => 'Csoport mentve', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Felhasználó mentve', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1785,6 +1792,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Ezzel a művelettel létrehozhat egy állományt ami tartalmazni fogja a változat információkat a teljes DMS mappáról. A létrehozás után minden állomány a dokumentum mappába lesz mentve.', 'versioning_info' => 'Változás információ', 'versiontolow' => 'Túl alacsony verzió', +'version_comment' => '', 'version_deleted_email' => 'Változat törölve', 'version_deleted_email_body' => 'Változat törölve Dokumentum: [name] diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index dc9d4d604..89127ad1d 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -478,6 +478,7 @@ Il collegamento The link è ancora valido fino a [valid]. 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', 'edit_online' => 'Modifica online', +'edit_online_warning' => '', 'edit_task' => 'Modifica attività', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', @@ -625,6 +626,7 @@ URL: [url]', 'group_members' => 'Membri del gruppo', 'group_receipt_summary' => 'Panoramica delle conferme ricevute gruppo.', 'group_review_summary' => 'Dettaglio revisioni di gruppo', +'group_revision_summary' => '', 'guest_login' => 'Login come Ospite', 'guest_login_disabled' => 'Il login come Ospite è disabilitato.', 'hash' => 'Hash', @@ -828,6 +830,7 @@ Utente: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nuova sottocartella', 'new_user_image' => 'Nuova immagine', +'next_revision_abbr' => '', 'next_state' => 'Nuovo stato', 'nl_NL' => 'Olandese', 'no' => 'No', @@ -1098,6 +1101,7 @@ URL: [url]', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revisori', 'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore', 'revisor_already_removed' => 'Revisore già rimosso dal processo di riesame o ha già riesaminato il documento.', @@ -1455,6 +1459,8 @@ Name: [username] 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', @@ -1620,6 +1626,7 @@ Name: [username] 'splash_edit_group' => 'Gruppo modificato', 'splash_edit_role' => 'Ruolo memorizzato', 'splash_edit_task' => 'Attività modificata', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Utente modificato', 'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione', 'splash_error_rm_download_link' => 'Errore durante la rimozione del collegamento di scaricamento', @@ -1841,6 +1848,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Con questa operazione è possibile creare un file di backup delle informazioni di versione dei documenti di un\'intera cartella. Dopo la creazione ogni file viene salvato nella cartella del relativo documento.', 'versioning_info' => 'Informazioni di versione', 'versiontolow' => 'Versione obsoleta', +'version_comment' => '', 'version_deleted_email' => 'Cancellazione versione', 'version_deleted_email_body' => 'Versione cancellata Documento: [name] diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 794f3929f..bc7c0dc49 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -467,6 +467,7 @@ URL: [url]', 'edit_folder_props' => '폴더 편집', 'edit_group' => '편집 그룹', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '전송 속성 편집', 'edit_user' => '사용자 편집', @@ -614,6 +615,7 @@ URL: [url]', 'group_members' => '카페 회원', 'group_receipt_summary' => '그룹 접수 요약', 'group_review_summary' => '그룹 검토 요약', +'group_revision_summary' => '', 'guest_login' => '게스트로 로그인', 'guest_login_disabled' => '고객 로그인을 사용할 수 없습니다.', 'hash' => '해시', @@ -817,6 +819,7 @@ URL: [url]', URL [url]', 'new_subfolder_email_subject' => '[sitename] : [name] - 새 폴더', 'new_user_image' => '새로운 이미지', +'next_revision_abbr' => '', 'next_state' => '새 상태', 'nl_NL' => '네덜란드', 'no' => '아니오', @@ -1063,6 +1066,7 @@ URL: [url]', 'revision_status' => '상태', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '감사', 'revisor_already_assigned' => '이미 감사가 선임이 된 사용자.', 'revisor_already_removed' => '감사는 문서의 개정을 과정에서 삭제했거나 이미 개정을 완료 했습니다.', @@ -1415,6 +1419,8 @@ URL : [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', 'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.', @@ -1580,6 +1586,7 @@ URL : [url]', 'splash_edit_group' => '그룹 저장', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '사용자 저장', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1801,6 +1808,7 @@ URL : [url]', 'versioning_file_creation_warning' => '버전 정보가 포함 된 파일을 만들 수 있습니다. 이 작업은 전체 DMS 폴더를 작성 후 모든 파일이 문서 폴더 안에 저장됩니다.', 'versioning_info' => '버전 관리 정보', 'versiontolow' => '낮은 버전', +'version_comment' => '', 'version_deleted_email' => '버전 삭제', 'version_deleted_email_body' => '버전 삭제 문서: [name] diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 514a4673b..f244c1de9 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -471,6 +471,7 @@ URL: [url]', 'edit_folder_props' => 'ແກ້ໄຂໂຟລເດີ', 'edit_group' => 'ແກ້ໄຂກຸ່ມ', 'edit_online' => 'ແກ້ໄຂອອນລາຍ', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'ແກ້ໄຂຄຸນສົມບັດໃນການຖ່າຍທອດ', 'edit_user' => 'ແກ້ໄຂຜູ້ໃຊ້', @@ -618,6 +619,7 @@ URL: [url]', 'group_members' => 'ສະມາຊິກກຸ່ມ', 'group_receipt_summary' => 'ພາບລວມການຢືນຢັນເນື້ອຫາຂອງກຸ່ມ', 'group_review_summary' => 'ສະຫຼຸບບົດວິຈານຂອງກຸ່ມ', +'group_revision_summary' => '', 'guest_login' => 'ເຂົ້າສູ້ລະບົບໃນຖານະແຂກ', 'guest_login_disabled' => 'ການເຂົ້າສູ້ລະບົບສຳລັບບຸກຄົນທົ່ວໄປຖຶກປິດການໄຊ້ງານ', 'hash' => 'ກັນຊາ', @@ -821,6 +823,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]:[name] - ໂຟລເດີໄຫມ່', 'new_user_image' => 'ຮູບໄຫມ່', +'next_revision_abbr' => '', 'next_state' => 'ລັດໄຫມ່', 'nl_NL' => 'ດັສ', 'no' => 'ບໍ່', @@ -1091,6 +1094,7 @@ URL: [url]', 'revision_status' => 'ສະຖານະ', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'ຜູ້ປະສານງານ', 'revisor_already_assigned' => 'ກຳນົດຜູ້ໄຊ້ເປັນຜູ້ກວດສອບແລ້ວ', 'revisor_already_removed' => 'ຜູ້ກວດສອບຖືກນຳອອກຈາກຂະບວນການແກ້ໄຂ ຫຼືໄດ້ແກ້ໄຂເອກະສານແລ້ວ', @@ -1448,6 +1452,8 @@ URL: [url]', 'settings_maxUploadSize' => 'ขนาดสูงสุดสำหรับไฟล์ที่อัปโหลด.', 'settings_maxUploadSize_desc' => 'ນີ້ຄືຂະໜາດສູງສຸດສຳລັບໄຟລທີອັບໂຫລດ ຈະມີຜົນຕໍ່ເວີຊັນເອກະສານແລະ ເອກະສານແນບ', 'settings_more_settings' => 'กำหนดค่าการตั้งค่าเพิ่มเติม ค่าเริ่มต้นการเข้าสู่ระบบ: ผู้ดูแลระบบ / ผู้ดูแลระบบ.', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'ເຂົ້າລະບົບ', 'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ', 'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້', @@ -1613,6 +1619,7 @@ URL: [url]', 'splash_edit_group' => 'ບັນທຶກກຸ່ມແລ້ວ', 'splash_edit_role' => 'ບັນທຶກບົດບາດແລ້ວ', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'ບັນທຶກຜູ້ໄຊ້ແລ້ວ', 'splash_error_add_to_transmittal' => 'ເກີດຂໍ້ຜິດພາດໃນຂະນະທີ່ເພີ່ມເອກະສານເພື່ອຕິດຕໍ່', 'splash_error_rm_download_link' => 'ຂໍ້ຜິດພາດໃນການລົບລິງການດາວໂຫລດ', @@ -1834,6 +1841,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'ສຳລັບການດຳເນີນງານນີ້ເຈົ້າສາມາດສ້າງໄຟລສຳລັບແຕ່ລະເອກະສານທີມີຂໍ້ມູນການກຳນົດເວີຊັ້ນຂອງເອກະສານນັ້ນ', 'versioning_info' => 'ຂໍ້ມູນການກຳນົດລຸ້ນ', 'versiontolow' => 'ເວີຊັ້ນຕຳ', +'version_comment' => '', 'version_deleted_email' => 'ລົບເວີຊັ້ນແລ້ວ', 'version_deleted_email_body' => 'ລົບເວີຊັ້ນແລ້ວ ເອກະສານ: [name] diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index ed3933853..884849f29 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -466,6 +466,7 @@ De link is geldig tot [valid]. 'edit_folder_props' => 'Wijzig Map eigenschappen', 'edit_group' => 'Wijzig Groep', 'edit_online' => 'Online bewerken', +'edit_online_warning' => '', 'edit_task' => 'Taak bewerken', 'edit_transmittal_props' => 'Opmerkingen bij verzending', 'edit_user' => 'Wijzig gebruiker', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Groepsleden', 'group_receipt_summary' => 'Overzicht van ontvangst per groep', 'group_review_summary' => 'Groep Beoordeling samenvatting', +'group_revision_summary' => '', 'guest_login' => 'Login als Gast', 'guest_login_disabled' => 'Gast login is uitgeschakeld.', 'hash' => 'Hashcode', @@ -815,6 +817,7 @@ Gebruikers: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nieuwe map', 'new_user_image' => 'Nieuwe afbeelding', +'next_revision_abbr' => '', 'next_state' => 'Nieuwe status', 'nl_NL' => 'Nederlands', 'no' => 'Nee', @@ -1084,6 +1087,7 @@ URL: [url]', 'revision_status' => 'Status revisie', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Herzieners', 'revisor_already_assigned' => 'Gebruiker is reeds herziener', 'revisor_already_removed' => 'Herziener reeds verwijderd', @@ -1445,6 +1449,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale omvang voor uploaden', 'settings_maxUploadSize_desc' => 'Dit is de maximale omvang voor te uploaden bestanden. Dat geldt voor bestanden en bijlagen.', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.', @@ -1610,6 +1616,7 @@ Name: [username] 'splash_edit_group' => 'Groep opgeslagen', 'splash_edit_role' => 'Rol opgeslagen', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Gebruiker opgeslagen', 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending', 'splash_error_rm_download_link' => 'Fout bij verwijderen download-link', @@ -1831,6 +1838,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Met deze handeling maakt U een bestand aan die de versie voortgang informatie van een compleet DMS bevat. Na het aanmaken wordt ieder bestand opgeslagen in de document map.', 'versioning_info' => 'Versie eigenschappen', 'versiontolow' => 'Versie voor laag', +'version_comment' => '', 'version_deleted_email' => 'Versie verwijderd', 'version_deleted_email_body' => 'Version deleted Document: [name] diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index c9bff7f10..89ab5e925 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (840), netixw (84), romi (93), uGn (112) +// Translators: Admin (854), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -454,6 +454,7 @@ URL: [url]', 'edit_folder_props' => 'Edytuj folder', 'edit_group' => 'Edytuj grupę', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Edytuj użytkownika', @@ -601,6 +602,7 @@ URL: [url]', 'group_members' => 'Członkowie grupy', 'group_receipt_summary' => '', 'group_review_summary' => 'Podsumowanie opiniowania dla grupy', +'group_revision_summary' => '', 'guest_login' => 'Zalogowany jako gość', 'guest_login_disabled' => 'Logowanie dla gościa jest wyłączone.', 'hash' => '', @@ -614,7 +616,7 @@ URL: [url]', 'hu_HU' => 'Węgierski', 'id' => 'ID', 'identical_version' => 'Nowa wersja jest identyczna z obecną', -'import' => '', +'import' => 'Import', 'importfs' => '', 'import_extension' => '', 'import_fs' => 'Import z systemu plików', @@ -804,6 +806,7 @@ Użytkownik: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nowy folder', 'new_user_image' => 'Nowy obraz', +'next_revision_abbr' => '', 'next_state' => 'Nowy status', 'nl_NL' => 'holenderski', 'no' => 'Nie', @@ -1027,6 +1030,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1164,7 +1168,7 @@ URL: [url]', 'settings_autoLoginUser_desc' => '', 'settings_available_languages' => 'Dostępne języki', 'settings_available_languages_desc' => 'Tylko wybrane języki zostaną załadowane i będą widoczne w kontrolce wyboru języka. Domyślny język zawsze jest ładowany.', -'settings_backupDir' => '', +'settings_backupDir' => 'Lokalizacja kopii zapasowej', 'settings_backupDir_desc' => '', 'settings_cacheDir' => 'Folder bufora', 'settings_cacheDir_desc' => 'Miejsce przechowywania obrazków podglądu (najlepiej wybrać katalog nie dostępny bezpośrednio dla web-serwera).', @@ -1203,8 +1207,8 @@ URL: [url]', 'settings_dbUser' => 'Nazwa użytkownika', 'settings_dbUser_desc' => 'Nazwa użytkownika uprawnionego do dostępu do bazy danych podana w procesie instalacji. Nie zmieniaj tego pola dopóki nie jest to absolutnie konieczne, na przykład podczas przenoszenia bazy danych na nowego hosta.', 'settings_dbVersion' => 'Schemat bazy danych jest za stary', -'settings_defaultAccessDocs' => '', -'settings_defaultAccessDocs_desc' => '', +'settings_defaultAccessDocs' => 'Domyślny dostęp do nowych dokumentów', +'settings_defaultAccessDocs_desc' => 'Kiedy zostanie utworzony nowy dokument, będzie to domyślne prawo dostępu.', 'settings_defaultDocPosition' => '', 'settings_defaultDocPosition_desc' => '', 'settings_defaultDocPosition_val_end' => 'koniec', @@ -1263,8 +1267,8 @@ URL: [url]', 'settings_enableLanguageSelector_desc' => 'Pokaż selektor języka dla interfejsu użytkownika po zalogowaniu To nie ma wpływu na wybór języka na stronie logowania.', 'settings_enableLargeFileUpload' => 'Zezwól na wczytywanie dużych plików', 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.', -'settings_enableMenuTasks' => '', -'settings_enableMenuTasks_desc' => '', +'settings_enableMenuTasks' => 'Włącz listę zadań w menu', +'settings_enableMenuTasks_desc' => 'Włącza /Wyłącza pozycję w menu w której znajdują się wszystkie zadania dla użytkownika. Zawiera dokumenty, które potrzebują być ocenione, zatwierdzone, i.t.d.', 'settings_enableMultiUpload' => 'Zezwól na wysyłanie wielu plików', 'settings_enableMultiUpload_desc' => '', 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów', @@ -1295,8 +1299,8 @@ URL: [url]', 'settings_enableSelfReceipt_desc' => '', 'settings_enableSelfRevApp' => 'Pozwalaj przeglądać/zatwierdzać dla zalogowanych użytkowników', 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu', -'settings_enableSessionList' => '', -'settings_enableSessionList_desc' => '', +'settings_enableSessionList' => 'Włącz listę użytkowników online w menu', +'settings_enableSessionList_desc' => 'Włącza listę obecnie zalogowanych użytkowników w menu.', 'settings_enableThemeSelector' => 'Wybór motywu', 'settings_enableThemeSelector_desc' => '', 'settings_enableUpdateReceipt' => '', @@ -1338,7 +1342,7 @@ URL: [url]', 'settings_guestID_desc' => 'ID gościa używane kiedy gość jest zalogowany (zazwyczaj nie wymaga zmiany)', 'settings_httpRoot' => 'Http Root', 'settings_httpRoot_desc' => 'Relatywna ścieżka w URL, część za domeną. Nie dołączaj przedrostka http:// ani nazwy hosta. Np. Jeśli cały URL to http://www.example.com/letodms/, wpisz \'/letodms/\'. Jeśli URL to http://www.example.com/, set \'/\'', -'settings_incItemsPerPage' => '', +'settings_incItemsPerPage' => 'Liczba wpisów załadowana na dole strony', 'settings_incItemsPerPage_desc' => '', 'settings_initialDocumentStatus' => '', 'settings_initialDocumentStatus_desc' => '', @@ -1370,15 +1374,17 @@ URL: [url]', 'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 0.', 'settings_maxExecutionTime' => 'Maksymalny czas wykonywania (s)', 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.', -'settings_maxItemsPerPage' => '', +'settings_maxItemsPerPage' => 'Maksymalna liczba wpisów na stronę', 'settings_maxItemsPerPage_desc' => '', 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów', 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', -'settings_maxUploadSize' => '', -'settings_maxUploadSize_desc' => '', +'settings_maxUploadSize' => 'Maksymalny rozmiar wysyłanych plików', +'settings_maxUploadSize_desc' => 'To jest maksymalny rozmiar dla nadesłanych plików. To ustawienie wpływa również na wersje dokumentu i załączniki.', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.', @@ -1450,8 +1456,8 @@ URL: [url]', 'settings_smtpPort_desc' => 'Port serwera SMTP, domyślnie 25', 'settings_smtpSendFrom' => 'Wyślij od', 'settings_smtpSendFrom_desc' => 'Wyślij od', -'settings_smtpSendTestMail' => '', -'settings_smtpSendTestMail_desc' => '', +'settings_smtpSendTestMail' => 'Wyślij mail testowy', +'settings_smtpSendTestMail_desc' => 'Wysyła mail testowy w celu sprawdzenia obecnej konfiguracji e-mail', 'settings_smtpServer' => 'Nazwa serwera SMTP', 'settings_smtpServer_desc' => 'Nazwa hosta serwera SMTP', 'settings_smtpUser' => 'Użytkownik SMTP', @@ -1544,6 +1550,7 @@ URL: [url]', 'splash_edit_group' => 'Grupa zapisana', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Zapisano użytkownika', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1765,6 +1772,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Ta operacja utworzy plik zawierający informacje o wersjach plików z całego wskazanego folderu. Po utworzeniu, każdy plik będzie zapisany w folderze odpowiednim dla danego dokumentu.', 'versioning_info' => 'Informacje o wersjach', 'versiontolow' => 'Za niska wersja', +'version_comment' => '', 'version_deleted_email' => 'Wersja usunięta', 'version_deleted_email_body' => 'Wersja została usunięta Dokument: [name] diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 18980a55b..1ddfc6a75 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -485,6 +485,7 @@ O link é válido até [valid]. 'edit_folder_props' => 'Editar pasta', 'edit_group' => 'Editar grupo', 'edit_online' => 'Editar on-line', +'edit_online_warning' => '', 'edit_task' => 'Editar tarefa', 'edit_transmittal_props' => 'Editar propriedades de transmissão', 'edit_user' => 'Editar usuário', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Membros do Grupo', 'group_receipt_summary' => 'Resumo de recebimento de grupo', 'group_review_summary' => 'Resumo da avaliação do grupo', +'group_revision_summary' => '', 'guest_login' => 'Entre como convidado', 'guest_login_disabled' => 'O login de convidado está desativado.', 'hash' => 'Hash', @@ -841,6 +843,7 @@ Usuário: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nova pasta', 'new_user_image' => 'Nova imagem', +'next_revision_abbr' => '', 'next_state' => 'Novo estado', 'nl_NL' => 'Holandês', 'no' => 'Não', @@ -1110,6 +1113,7 @@ URL: [url]', 'revision_status' => 'Estado', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revisores', 'revisor_already_assigned' => 'O usuário já está designado como revisor.', 'revisor_already_removed' => 'Revisor já foi removido do processo de revisão ou já revisou o documento.', @@ -1467,6 +1471,8 @@ Nome: [username] 'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', 'settings_maxUploadSize_desc' => 'Esse é o tamanho máximo dos arquivos enviados. Ele terá efeito para versões de documentos e anexos.', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', @@ -1632,6 +1638,7 @@ Nome: [username] 'splash_edit_group' => 'Grupo salvo', 'splash_edit_role' => 'Papel salvo', 'splash_edit_task' => 'Tarefa salva', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Usuário salvo', 'splash_error_add_to_transmittal' => 'Erro ao adicionar documento à transmissão', 'splash_error_rm_download_link' => 'Erro ao remover o link de download', @@ -1853,6 +1860,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Com esta operação, você pode criar um arquivo contendo as informações de versão de uma pasta DMS inteira. Após a criação, todos os arquivos serão salvos dentro da pasta do documento.', 'versioning_info' => 'Informação de versionamento', 'versiontolow' => 'Versão para baixo', +'version_comment' => '', 'version_deleted_email' => 'Versão eliminado', 'version_deleted_email_body' => 'Versão apagada Documento: [name] diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index e0726d0ef..2651de592 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1092), balan (87) +// Translators: Admin (1094), balan (87) $text = array( '2_factor_auth' => '', @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => 'Editează folder', 'edit_group' => 'Editează grup', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Editeaza proprietatile de transmitere', 'edit_user' => 'Editează utilizator', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Membrii grupului', 'group_receipt_summary' => '', 'group_review_summary' => 'Sumar revizuiri grup', +'group_revision_summary' => '', 'guest_login' => 'Login ca oaspete', 'guest_login_disabled' => 'Logarea ca oaspete este dezactivată.', 'hash' => '', @@ -641,7 +643,7 @@ URL: [url]', 'index_folder' => 'Index folder', 'index_no_content' => '', 'index_pending' => '', -'index_waiting' => '', +'index_waiting' => 'Așteptare', 'individuals' => 'Individuals', 'individuals_in_groups' => '', 'info_recipients_tab_not_released' => '', @@ -816,6 +818,7 @@ Utilizator: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Folder nou', 'new_user_image' => 'Imagine nouă', +'next_revision_abbr' => '', 'next_state' => 'Stare nouă', 'nl_NL' => 'Olandeză', 'no' => 'Nu', @@ -1070,6 +1073,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revizuitori', 'revisor_already_assigned' => 'Utilizatorul este deja asignat ca retrimitor.', 'revisor_already_removed' => 'Retrimitorul a fost deja eliminat din procesul de revizuire sau a revizuit deja documentul.', @@ -1422,6 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.', @@ -1587,6 +1593,7 @@ URL: [url]', 'splash_edit_group' => 'Grup salvat', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Utilizator salvat', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1723,7 +1730,7 @@ URL: [url]', '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_read_access' => 'Utilizatorul nu are acces de citire pentru acest folder', 'transfer_no_write_access' => 'Utilizatorul nu are drepturi de scriere pe acest dosar', 'transfer_objects' => '', 'transfer_objects_to_user' => '', @@ -1808,6 +1815,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Cu această operațiune puteți crea un fișier care conține informațiile versiunilor pentru un întreg folder DMS. După creare, fiecare fisier va fi salvat in folder-ul de documente.', 'versioning_info' => 'Informații versionare', 'versiontolow' => 'Versiunea e prea mică(veche)', +'version_comment' => '', 'version_deleted_email' => 'Versiune ștearsă', 'version_deleted_email_body' => 'Versiune ștearsă Document: [name] diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 25e863e17..ec0a04b9f 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => 'Изменить свойства', 'edit_group' => 'Изменить группу', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Редактировать группы получателей', 'edit_user' => 'Редактировать пользователя', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Члены группы', 'group_receipt_summary' => 'Обзор подтверждений получения группой', 'group_review_summary' => 'Сводка по рецензированию группы', +'group_revision_summary' => '', 'guest_login' => 'Войти как гость', 'guest_login_disabled' => 'Гостевой вход отключён', 'hash' => '', @@ -815,6 +817,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]: новый каталог «[name]»', 'new_user_image' => 'Новое изображение', +'next_revision_abbr' => '', 'next_state' => 'Новое состояние', 'nl_NL' => 'Dutch', 'no' => 'Нет', @@ -1077,6 +1080,7 @@ URL: [url]', 'revision_status' => 'Состояние ревизии', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Ревизор', 'revisor_already_assigned' => 'Пользователь уже назначен как ревизор', 'revisor_already_removed' => 'Ревизор уже удален из процесса ревизии, либо уже рассмотрел документ', @@ -1429,6 +1433,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов', 'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.', @@ -1594,6 +1600,7 @@ URL: [url]', 'splash_edit_group' => 'Группа сохранена', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Пользователь сохранён', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1815,6 +1822,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Эта операция создаст файлы версий для всего каталога. После создания файлы версий будут сохранены в каталоге документов.', 'versioning_info' => 'Информация о версиях', 'versiontolow' => 'Версия слишком старая', +'version_comment' => '', 'version_deleted_email' => 'Версия удалена', 'version_deleted_email_body' => 'Версия удалена Документ: [name] diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 2a1376986..6b5a76835 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1226), destinqo (19), pS2017 (508), ssebech (4) +// Translators: Admin (1226), destinqo (26), pS2017 (508), ssebech (4) $text = array( '2_factor_auth' => '2-faktorové overovanie', @@ -201,7 +201,7 @@ URL: [url]', 'at_least_n_users_of_group' => 'At least [number_of_users] users of [group]', 'august' => 'August', 'authentication' => 'Autentizácia', -'authentication_failed' => '', +'authentication_failed' => 'Overenie zlyhalo', 'author' => 'Autor', 'automatic_status_update' => 'Automaticka zmena stavu', 'back' => 'Prejsť späť', @@ -485,6 +485,7 @@ Odkaz je platný do [valid]. 'edit_folder_props' => 'Upraviť zložku', 'edit_group' => 'Upraviť skupinu', 'edit_online' => 'Upraviť online', +'edit_online_warning' => '', 'edit_task' => 'Upraviť úlohu', 'edit_transmittal_props' => 'Edit transmittal properties', 'edit_user' => 'Upraviť používateľa', @@ -506,7 +507,7 @@ Odkaz je platný do [valid]. 'error_add_aro' => 'Error while adding access request object', 'error_add_permission' => 'Error while add permission', 'error_cleared_cache' => 'Chyba pri vymazaní vyrovnávacej pamäte', -'error_edit_task' => '', +'error_edit_task' => 'Chyba pri ukladaní úlohy', 'error_extension_getlist' => 'Error getting extension list from repository', 'error_importfs' => 'Chyba pri importe zo súborového systému', 'error_no_document_selected' => 'Nie je vybratý žiadny dokument', @@ -515,7 +516,7 @@ Odkaz je platný do [valid]. 'error_remove_document' => 'Pri odstraňovaní dokumentu sa vyskytla chyba', 'error_remove_folder' => 'Pri odstraňovaní zložky sa vyskytla chyba', 'error_remove_permission' => 'Chyba pri odstránení povolenia', -'error_rm_workflow' => '', +'error_rm_workflow' => 'Nastala chyba pri odstránovaní workflow', 'error_rm_workflow_action' => '', 'error_rm_workflow_state' => '', 'error_toogle_permission' => 'Chyba pri zmene povolenia', @@ -639,6 +640,7 @@ URL: [url]', 'group_members' => 'Členovia skupiny', 'group_receipt_summary' => 'Group receipt summary', 'group_review_summary' => 'Zhrnutie skupinovej recenzie', +'group_revision_summary' => '', 'guest_login' => 'Prihlásiť sa ako hosť', 'guest_login_disabled' => 'Prihlásenie ako hosť je vypnuté.', 'hash' => 'Hash', @@ -763,7 +765,7 @@ URL: [url]', 'login_error_title' => 'Chyba pri prihlasovaní', 'login_not_given' => 'Nebolo zadané používateľské meno', 'login_ok' => 'Prihlásenie prebehlo úspešne', -'login_restrictions_apply' => '', +'login_restrictions_apply' => 'Nepodarilo sa prihlásiť, kvôli obmedzeniam', 'logout' => 'Odhlásenie', 'log_management' => 'Správa protokolov', 'lo_LA' => 'Laoský', @@ -782,7 +784,7 @@ URL: [url]', 'max_upload_size' => 'Maximálna veľkosť každého súboru', 'may' => 'Máj', 'menu_dropfolder' => 'Drop zložka', -'menu_upload_from_dropfolder' => '', +'menu_upload_from_dropfolder' => 'Naimportovať zo súboru', 'mimetype' => 'Mime typ', 'minutes' => 'minúty', 'misc' => 'Rôzne', @@ -842,6 +844,7 @@ Používateľ: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Nová zložka', 'new_user_image' => 'Nový obrázok', +'next_revision_abbr' => '', 'next_state' => 'Nový stav', 'nl_NL' => 'Holandština', 'no' => 'Nie', @@ -989,7 +992,7 @@ URL: [url]', 'receipt_status' => 'Stav', 'receipt_summary' => 'Receipt summary', 'receipt_update_failed' => 'Acknowledging reception failed', -'recent_uploads' => '', +'recent_uploads' => 'Naposledy nahrané súbory', 'reception' => 'Reception', 'reception_acknowleged' => 'Reception acknowledged', 'reception_noaction' => 'Žiadna akcia', @@ -1112,6 +1115,7 @@ URL: [url]', 'revision_status' => 'Stav', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Revisors', 'revisor_already_assigned' => 'User is already assigned as an revisor.', 'revisor_already_removed' => 'Revisor has already been removed from revision process or has already revised the document.', @@ -1244,7 +1248,7 @@ Meno: [username] 'settings_Advanced' => 'Rozšírené', 'settings_advancedAcl' => 'Advanced Access control', 'settings_advancedAcl_desc' => 'Advanced access controll will allow to turn on/off certain modules of the software. It can not be used for access rights on documents and folders.', -'settings_allowChangeRevAppInProcess' => '', +'settings_allowChangeRevAppInProcess' => 'Povoliť zmenu schvaľovateľa, ak už bol proces začatý', 'settings_allowChangeRevAppInProcess_desc' => '', 'settings_allowReviewerOnly' => 'Allow to set reviewer only', 'settings_allowReviewerOnly_desc' => 'Enable this, if it shall be allow to set just a reviewer but no approver in traditional workflow mode.', @@ -1469,6 +1473,8 @@ Meno: [username] 'settings_maxUploadSize' => 'Maximálna veľkosť pre nahrávané súbory', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Nenájdené', 'settings_Notification' => 'Nastavenia notifikácií', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', @@ -1634,6 +1640,7 @@ Meno: [username] 'splash_edit_group' => 'Skupina bola uložená', 'splash_edit_role' => 'Rola bola uložená', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Používateľ bol uložený', 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal', 'splash_error_rm_download_link' => 'Error when removing download link', @@ -1855,6 +1862,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Touto operáciou môžete vytvoriť súbor pre každý dokument, obsahujúci verziovaciu informáciu toho dokumentu. Po vytvorení bude každý súbor uložený do zložky dokumentu. Those files are not needed for the regular operation of the dms, but could be of value if the complete repository shall be transferred to an other system.', 'versioning_info' => 'Informácie o verziách', 'versiontolow' => 'Verzia je nízka', +'version_comment' => '', 'version_deleted_email' => 'Verzia zmazana', 'version_deleted_email_body' => 'Verzia bola zmazaná Dokument: [name] diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index e829ce792..7c962fdc9 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -479,6 +479,7 @@ Länken är giltig t o m [valid]. 'edit_folder_props' => 'Ändra katalog', 'edit_group' => 'Ändra grupp', 'edit_online' => 'Uppdatera online', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Ändra egenskaper för meddelande', 'edit_user' => 'Ändra användare', @@ -626,6 +627,7 @@ URL: [url]', 'group_members' => 'Gruppmedlemmar', 'group_receipt_summary' => 'Sammanfattning av mottagningsbevis för grupp', 'group_review_summary' => 'Sammanfattning av gruppgranskning', +'group_revision_summary' => '', 'guest_login' => 'Gästinloggning', 'guest_login_disabled' => 'Gästinloggningen är inaktiverad.', 'hash' => 'Hash', @@ -829,6 +831,7 @@ Användare: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Ny katalog', 'new_user_image' => 'Ny användarbild', +'next_revision_abbr' => '', 'next_state' => 'Ny status', 'nl_NL' => 'Holländska', 'no' => 'Nej', @@ -1085,6 +1088,7 @@ URL: [url]', 'revision_status' => 'Status', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Reviderare', 'revisor_already_assigned' => 'Användaren innehar redan rollen som reviderare', 'revisor_already_removed' => 'Dokumentet är redan reviderat alternativt användaren tillhör inte längre gruppen reviderare.', @@ -1442,6 +1446,8 @@ Kommentar: [comment]', 'settings_maxUploadSize' => 'Max storlek (bytes) för uppladdadning av fil', 'settings_maxUploadSize_desc' => 'Detta är den maximala storleken för uppladdning av filer. Begränsningen anges i bytes (1 GB = ca 1 000 000 000 bytes)', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', @@ -1607,6 +1613,7 @@ Kommentar: [comment]', 'splash_edit_group' => 'Grupp sparad', 'splash_edit_role' => 'Roll sparad', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Användare sparad', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => 'Fel vid borttagande av nedladdningslänk', @@ -1828,6 +1835,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Med denna funktion kan du skapa en fil som innehåller versionsinformationen för hela DMS-mappen. Efter skapandet kommer alla filer att sparas inom dokumentets mapp.', 'versioning_info' => 'Versionsinformation', 'versiontolow' => 'Version för låg', +'version_comment' => '', 'version_deleted_email' => 'Version borttagen', 'version_deleted_email_body' => 'Version borttagen Dokument: [name] diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index da7ae9c06..ec23b635a 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -460,6 +460,7 @@ URL: [url]', 'edit_folder_props' => 'Klasörü düzenle', 'edit_group' => 'Grubu düzenle', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Kullanıcıyı düzenle', @@ -607,6 +608,7 @@ URL: [url]', 'group_members' => 'Grup üyeleri', 'group_receipt_summary' => '', 'group_review_summary' => 'Grup gözden geçirme özeti', +'group_revision_summary' => '', 'guest_login' => 'Misafir olarak giriş yap', 'guest_login_disabled' => 'Misafir girişi devre dışı.', 'hash' => '', @@ -810,6 +812,7 @@ Kullanıcı: [username] URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - Yeni klasör', 'new_user_image' => 'Yeni resim', +'next_revision_abbr' => '', 'next_state' => 'Yeni durum', 'nl_NL' => 'Hollandaca', 'no' => 'Hayır', @@ -1049,6 +1052,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1401,6 +1405,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', @@ -1566,6 +1572,7 @@ URL: [url]', 'splash_edit_group' => 'Grup kaydedildi', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Kullanıcı kaydedildi', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1787,6 +1794,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Bu işlem ile tüm klasörlerdeki versiyon bilgisinin bulunduğu bir dosya oluşturursunuz. Her dosya oluşturulduğunda doküman klasörüne kaydedilir.', 'versioning_info' => 'Version bilgisi', 'versiontolow' => 'Versiyon düşük', +'version_comment' => '', 'version_deleted_email' => 'Versiyon silindi', 'version_deleted_email_body' => 'Versiyon silindi Doküman: [name] diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index a7463efb5..1e53e7a9b 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => 'Змінити каталог', 'edit_group' => 'Змінити групу', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => 'Редагувати налаштування перенесення', 'edit_user' => 'Редагувати користувача', @@ -613,6 +614,7 @@ URL: [url]', 'group_members' => 'Члени групи', 'group_receipt_summary' => 'Підсумки отримання групи', 'group_review_summary' => 'Підсумки рецензування групи', +'group_revision_summary' => '', 'guest_login' => 'Увійти як гість', 'guest_login_disabled' => 'Гостьовий вхід відключено', 'hash' => '', @@ -815,6 +817,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]: новий каталог «[name]»', 'new_user_image' => 'Нове зображення', +'next_revision_abbr' => '', 'next_state' => 'Новий стан', 'nl_NL' => 'Dutch', 'no' => 'Ні', @@ -1070,6 +1073,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => 'Ревізори', 'revisor_already_assigned' => 'Ревізор вже призначений', 'revisor_already_removed' => 'Ревізора вже видалено', @@ -1422,6 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', 'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.', @@ -1587,6 +1593,7 @@ URL: [url]', 'splash_edit_group' => 'Групу збережено', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => 'Користувача збережено', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1808,6 +1815,7 @@ URL: [url]', 'versioning_file_creation_warning' => 'Ця операція створить файли версій для всього каталогу. Після створення файли версій будуть збережені в каталозі документів.', 'versioning_info' => 'Інформація про версії', 'versiontolow' => 'Версія надто стара', +'version_comment' => '', 'version_deleted_email' => 'Версію видалено', 'version_deleted_email_body' => 'Версію видалено Документ: [name] diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 4bb139c98..38b65440d 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -466,6 +466,7 @@ URL: [url]', 'edit_folder_props' => '编辑文件夹', 'edit_group' => '编辑组别', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => '编辑用户', @@ -609,6 +610,7 @@ URL: [url]', 'group_members' => '组成员', 'group_receipt_summary' => '', 'group_review_summary' => '校对组汇总', +'group_revision_summary' => '', 'guest_login' => '来宾登录', 'guest_login_disabled' => '来宾登录被禁止', 'hash' => '哈希', @@ -812,6 +814,7 @@ URL: [url]', URL: [url]', 'new_subfolder_email_subject' => '[sitename]: [name] - 新建文件夹', 'new_user_image' => '新建图片', +'next_revision_abbr' => '', 'next_state' => '新建状态', 'nl_NL' => '荷兰语', 'no' => '否', @@ -1052,6 +1055,7 @@ URL: [url]', 'revision_status' => '修订状态', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '修订人', 'revisor_already_assigned' => '用户已被分配为修订人', 'revisor_already_removed' => '修订人已经从修订过程中删除，或者已经修改了文档。', @@ -1403,6 +1407,8 @@ URL: [url]', 'settings_maxUploadSize' => '上传文件尺寸上限', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '更多设置。默认登陆账户： admin / admin', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '未找到', 'settings_Notification' => '通知设置', 'settings_notwritable' => '设置_不可写', @@ -1568,6 +1574,7 @@ URL: [url]', 'splash_edit_group' => '组已保存', 'splash_edit_role' => '角色已保存', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '用户信息已保存', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '移除下载链接时报错', @@ -1780,6 +1787,7 @@ URL: [url]', 'versioning_file_creation_warning' => '通过此操作，您可以一个包含整个DMS文件夹的版本信息文件. 版本文件一经创建，每个文件都将保存到文件夹中.', 'versioning_info' => '版本信息', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => '版本已被删除', 'version_deleted_email_body' => '版本已删除 文档: [name] diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 576fcd0b2..22f75800c 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2418) +// Translators: Admin (2421) $text = array( '2_factor_auth' => '', @@ -252,7 +252,7 @@ URL: [url]', 'comment' => '說明', 'comment_changed_email' => '', 'comment_for_current_version' => '版本說明', -'configure_extension' => '', +'configure_extension' => '配置擴充套件', 'confirm_clear_cache' => '', 'confirm_create_fulltext_index' => '確認已新增之全文索引', 'confirm_move_document' => '', @@ -411,6 +411,7 @@ URL: [url]', 'edit_folder_props' => '編輯資料夾', 'edit_group' => '編輯組別', 'edit_online' => '', +'edit_online_warning' => '', 'edit_task' => '', 'edit_transmittal_props' => '', 'edit_user' => '編輯用戶', @@ -472,7 +473,7 @@ URL: [url]', 'export' => '', 'extension_archive' => '', 'extension_changelog' => '修改紀錄', -'extension_loading' => '', +'extension_loading' => '擴充套件讀取中', 'extension_manager' => '整體索引進度', 'extension_mgr_installed' => '已安裝', 'extension_mgr_no_upload' => '無法上傳新的套件因為套件目錄無法寫入', @@ -534,6 +535,7 @@ URL: [url]', 'group_members' => '組成員', 'group_receipt_summary' => '', 'group_review_summary' => '校對組匯總', +'group_revision_summary' => '', 'guest_login' => '來賓登錄', 'guest_login_disabled' => '來賓登錄被禁止', 'hash' => '', @@ -661,7 +663,7 @@ URL: [url]', 'login_restrictions_apply' => '', 'logout' => '登出', 'log_management' => '日誌管理', -'lo_LA' => '', +'lo_LA' => '位置', 'malformed_expiration_date' => '', 'manager' => '管理員', 'manager_of_group' => '', @@ -721,6 +723,7 @@ URL: [url]', 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', 'new_user_image' => '新建圖片', +'next_revision_abbr' => '', 'next_state' => '', 'nl_NL' => '荷蘭語', 'no' => '否', @@ -913,6 +916,7 @@ URL: [url]', 'revision_status' => '', 'revision_submit_email_body' => '', 'revision_submit_email_subject' => '', +'revision_summary' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -1252,6 +1256,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', +'settings_noFormFields' => '', +'settings_noFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', 'settings_notwritable' => '', @@ -1417,6 +1423,7 @@ URL: [url]', 'splash_edit_group' => '', 'splash_edit_role' => '', 'splash_edit_task' => '', +'splash_edit_transmittal' => '', 'splash_edit_user' => '', 'splash_error_add_to_transmittal' => '', 'splash_error_rm_download_link' => '', @@ -1629,6 +1636,7 @@ URL: [url]', 'versioning_file_creation_warning' => '通過此操作，您可以一個包含整個DMS資料夾的版本資訊檔. 版本檔一經創建，每個檔都將保存到資料夾中.', 'versioning_info' => '版本資訊', 'versiontolow' => '', +'version_comment' => '', 'version_deleted_email' => '版本已被刪除', 'version_deleted_email_body' => '', 'version_deleted_email_subject' => '', From ed83d95e6da45d8cbcf0b5f44225c0e9703c5edb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 09:44:18 +0100 Subject: [PATCH 140/198] minor change of two keys --- languages/ar_EG/lang.inc | 4 ++-- languages/bg_BG/lang.inc | 4 ++-- languages/ca_ES/lang.inc | 4 ++-- languages/cs_CZ/lang.inc | 4 ++-- languages/de_DE/lang.inc | 4 ++-- languages/el_GR/lang.inc | 4 ++-- languages/en_GB/lang.inc | 4 ++-- languages/es_ES/lang.inc | 4 ++-- languages/fr_FR/lang.inc | 4 ++-- languages/hr_HR/lang.inc | 4 ++-- languages/hu_HU/lang.inc | 4 ++-- languages/it_IT/lang.inc | 4 ++-- languages/ko_KR/lang.inc | 4 ++-- languages/lo_LA/lang.inc | 4 ++-- languages/nl_NL/lang.inc | 4 ++-- languages/pl_PL/lang.inc | 4 ++-- languages/pt_BR/lang.inc | 4 ++-- languages/ro_RO/lang.inc | 4 ++-- languages/ru_RU/lang.inc | 4 ++-- languages/sk_SK/lang.inc | 4 ++-- languages/sv_SE/lang.inc | 4 ++-- languages/tr_TR/lang.inc | 4 ++-- languages/uk_UA/lang.inc | 4 ++-- languages/zh_CN/lang.inc | 4 ++-- languages/zh_TW/lang.inc | 4 ++-- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f5d76fb4b..f9f241f31 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1389,8 +1389,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => 'ﻻ ﻲﻤﻜﻧ ﺢﻔﻇ ﺎﻠﺘﻛﻮﻴﻧ ﻸﻧ ﻢﻠﻓ ﺎﻠﺘﻛﻮﻴﻧ ﻎﻳﺭ ﻕﺎﺒﻟ ﻞﻠﻜﺗﺎﺑﺓ', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 5e6d58808..108636bd8 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1252,8 +1252,8 @@ $text = array( 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 6ade3b629..261339bad 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1257,8 +1257,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 93cbd0d66..c22ed3ba1 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1468,8 +1468,8 @@ Jméno: [username] 'settings_maxUploadSize' => 'Maximální velikost nahraných souborů', 'settings_maxUploadSize_desc' => 'Toto je maximální velikost nahraných souborů. Bude mít vliv na verze dokumentů a přílohy.', 'settings_more_settings' => 'Konfigurovat další nastavení. Výchozí přihlášení: admin / admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nenalezeno', 'settings_Notification' => 'Nastavení upozornění', 'settings_notwritable' => 'Konfigurace nemůže být uložena, protože se do konfiguračního souboru nedá zapsat.', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ab04466e2..ebf627712 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -1478,8 +1478,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale Größe hochzuladener Dateien', 'settings_maxUploadSize_desc' => 'Dies ist die maximale Größe einer hochzuladenen Datei. Es begrenzt sowohl Dokumentenversionen als auch Anhänge.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', -'settings_noFormFields' => 'Diese Felder nicht zeigen', -'settings_noFormFields_desc' => 'Diese Felder werden bei der Neuanlage und beim Bearbeiten eines Dokuments nicht angezeigt. Bestehende Werte werden beibehalten.', +'settings_noDocumentFormFields' => 'Diese Felder nicht zeigen', +'settings_noDocumentFormFields_desc' => 'Diese Felder werden bei der Neuanlage und beim Bearbeiten eines Dokuments nicht angezeigt. Bestehende Werte werden beibehalten.', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 04bdd53e8..f29395c96 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -1263,8 +1263,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '', 'settings_notwritable' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index c720e74f2..d288ca3b4 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -1473,8 +1473,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maxium size for uploaded files', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', -'settings_noFormFields' => 'Do not show this fields', -'settings_noFormFields_desc' => 'This fields will not been show when adding or edition a document. Existing values will be kept.', +'settings_noDocumentFormFields' => 'Do not show this fields', +'settings_noDocumentFormFields_desc' => 'This fields will not been show when adding or edition a document. Existing values will be kept.', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 362cdd090..95a8113ed 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1404,8 +1404,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Tamaño máximo de subida archivos', 'settings_maxUploadSize_desc' => 'Tamaño máximo de archivos a cargar. Se tomará en cuenta para versiones de documentos y anexos de correo electrónico', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 7689bf37d..151063a97 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1457,8 +1457,8 @@ Nom : [username] 'settings_maxUploadSize' => 'Taille max. des fichiers', 'settings_maxUploadSize_desc' => 'Taille maximale (en octets) pour les fichiers téléversés. Concerne les versions d’un document et les fichiers attachés.', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', 'settings_notwritable' => 'La configuration ne peut pas être enregistrée car le fichier de configuration n’est pas accessible en écriture.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 87535ebb7..e9d99399d 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1425,8 +1425,8 @@ Internet poveznica: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', 'settings_notwritable' => 'Konfiguracija se ne može pohraniti jer datoteka konfiguracije nema mogućnost upisivanja.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index de3034b48..3548c9f9c 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1403,8 +1403,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 89127ad1d..9e8715e6f 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1459,8 +1459,8 @@ Name: [username] 'settings_maxUploadSize' => 'Dimensiona massima dei file da caricare', 'settings_maxUploadSize_desc' => 'Questa è la dimensiona massima del file da caricare. Avrà impatto sulla versione del documento e sull\'allegato.', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index bc7c0dc49..ede9add6d 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1419,8 +1419,8 @@ URL : [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', 'settings_notwritable' => '구성값을 저장할 수 없습니다 구성 파일에 쓰기 권한이 없습니다.', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index f244c1de9..0d0a86ca5 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -1452,8 +1452,8 @@ URL: [url]', 'settings_maxUploadSize' => 'ขนาดสูงสุดสำหรับไฟล์ที่อัปโหลด.', 'settings_maxUploadSize_desc' => 'ນີ້ຄືຂະໜາດສູງສຸດສຳລັບໄຟລທີອັບໂຫລດ ຈະມີຜົນຕໍ່ເວີຊັນເອກະສານແລະ ເອກະສານແນບ', 'settings_more_settings' => 'กำหนดค่าการตั้งค่าเพิ่มเติม ค่าเริ่มต้นการเข้าสู่ระบบ: ผู้ดูแลระบบ / ผู้ดูแลระบบ.', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'ເຂົ້າລະບົບ', 'settings_Notification' => 'ການຕັ້ງຄ່າການແຈ້ງເຕືອນ', 'settings_notwritable' => 'ການກຳນົດຄ່າທີ່ບໍ່ສາມາດບັນທືກໄດ້ຍ້ອນວ່າໄຟລກຳນົດຄ່າບໍ່ສາມາດຂຽນໄດ້', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 884849f29..8b42c8adf 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1449,8 +1449,8 @@ Name: [username] 'settings_maxUploadSize' => 'Maximale omvang voor uploaden', 'settings_maxUploadSize_desc' => 'Dit is de maximale omvang voor te uploaden bestanden. Dat geldt voor bestanden en bijlagen.', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 89ab5e925..e9f01958a 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1383,8 +1383,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Maksymalny rozmiar wysyłanych plików', 'settings_maxUploadSize_desc' => 'To jest maksymalny rozmiar dla nadesłanych plików. To ustawienie wpływa również na wersje dokumentu i załączniki.', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 1ddfc6a75..9e264c39f 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1471,8 +1471,8 @@ Nome: [username] 'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', 'settings_maxUploadSize_desc' => 'Esse é o tamanho máximo dos arquivos enviados. Ele terá efeito para versões de documentos e anexos.', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 2651de592..f074695a5 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1426,8 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index ec0a04b9f..f8ea3b82c 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1433,8 +1433,8 @@ URL: [url]', 'settings_maxUploadSize' => 'Максимальный размер загружаемых файлов', 'settings_maxUploadSize_desc' => 'Это максимальный размер загружаемых файлов. Он повлияет на версии документов и вложения.', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 6b5a76835..d85348683 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1473,8 +1473,8 @@ Meno: [username] 'settings_maxUploadSize' => 'Maximálna veľkosť pre nahrávané súbory', 'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Nenájdené', 'settings_Notification' => 'Nastavenia notifikácií', 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 7c962fdc9..9bb89509a 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1446,8 +1446,8 @@ Kommentar: [comment]', 'settings_maxUploadSize' => 'Max storlek (bytes) för uppladdadning av fil', 'settings_maxUploadSize_desc' => 'Detta är den maximala storleken för uppladdning av filer. Begränsningen anges i bytes (1 GB = ca 1 000 000 000 bytes)', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index ec23b635a..290652111 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1405,8 +1405,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 1e53e7a9b..6358e0149 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1426,8 +1426,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', 'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 38b65440d..dfb71351d 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -1407,8 +1407,8 @@ URL: [url]', 'settings_maxUploadSize' => '上传文件尺寸上限', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '更多设置。默认登陆账户： admin / admin', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '未找到', 'settings_Notification' => '通知设置', 'settings_notwritable' => '设置_不可写', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 22f75800c..02d6819c4 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1256,8 +1256,8 @@ URL: [url]', 'settings_maxUploadSize' => '', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', -'settings_noFormFields' => '', -'settings_noFormFields_desc' => '', +'settings_noDocumentFormFields' => '', +'settings_noDocumentFormFields_desc' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', 'settings_notwritable' => '', From c9aaa689252565b5fe26acdac47c33523311a156 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 10:03:24 +0100 Subject: [PATCH 141/198] preset value for sequence if sequenc cannot be edited --- views/bootstrap/class.AddDocument.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index b97e45d08..62f7b1b21 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -239,6 +239,22 @@ $(document).ready(function() { } if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) { $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "
    ".getMLText('order_by_sequence_off') : '')); + } else { + $minmax = $folder->getDocumentsMinMax(); + if($this->params['defaultposition'] == 'start') { + $seq = $minmax['min'] - 1; + } else { + $seq = $minmax['max'] + 1; + } + $this->formField( + null, + array( + 'element'=>'input', + 'type'=>'hidden', + 'name'=>'sequence', + 'value'=>$seq, + ) + ); } if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { if($presetexpiration) { From 1f8c5fe7c3532154033375f5f892f4cfa09cfaa3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 19 Dec 2019 16:08:10 +0100 Subject: [PATCH 142/198] workflows can be turned off completely --- CHANGELOG | 3 +++ out/out.UpdateDocument.php | 1 + views/bootstrap/class.AddDocument.php | 4 +++- views/bootstrap/class.Search.php | 2 +- views/bootstrap/class.Settings.php | 2 +- views/bootstrap/class.UpdateDocument.php | 5 +++++ views/bootstrap/class.UsrMgr.php | 2 +- views/bootstrap/class.ViewDocument.php | 8 ++++---- views/bootstrap/class.ViewFolder.php | 1 - 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 91805b81b..a0fda89eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,9 @@ - new hooks leftContentPre and leftContentPost - minimize sql queries when fetching sub folders and documents of a folder - custom attributes can be validated in a hook +- document attributes comment, keywords, categories, expiration date, and sequence + can be turned of in the configuration +- workflows can be turned off completely -------------------------------------------------------------------------------- Changes in version 5.1.13 diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php index 796c8852f..083103d65 100644 --- a/out/out.UpdateDocument.php +++ b/out/out.UpdateDocument.php @@ -69,6 +69,7 @@ if($view) { $view->setParam('folder', $folder); $view->setParam('document', $document); $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('nodocumentformfields', $settings->_noDocumentFormFields); $view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload); $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 62f7b1b21..36ccdf1e6 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -345,6 +345,7 @@ $(document).ready(function() { $this->getDropFolderChooserHtml("form1", $dropfolderfile) ); } + if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) { $this->formField( getMLText("comment_for_current_version"), array( @@ -363,6 +364,7 @@ $(document).ready(function() { 'value'=>1 ) ); + } $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { foreach($attrdefs as $attrdef) { @@ -429,7 +431,7 @@ $(document).ready(function() { ); } $this->warningMsg(getMLText("add_doc_workflow_warning")); - } else { + } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { if($workflowmode == 'traditional') { $this->contentSubHeading(getMLText("assign_reviewers")); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index f7d5ade23..f4d49f049 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -277,7 +277,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { - + diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9ca469a16..6d43adc72 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -421,7 +421,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); -- SETTINGS - ADVANCED - EDITION --> showConfigHeadline('settings_Edition'); ?> -showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced'), false, true); ?> +showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced', 'none'=>'settings_workflowMode_valnone'), false, true); ?> showConfigText('settings_versioningFileName', 'versioningFileName'); ?> showConfigText('settings_presetExpirationDate', 'presetExpirationDate'); ?> showConfigCheckbox('settings_allowReviewerOnly', 'allowReviewerOnly'); ?> diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index a75e27de6..12ce32cb6 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -142,6 +142,7 @@ console.log(element); $folder = $this->params['folder']; $document = $this->params['document']; $strictformcheck = $this->params['strictformcheck']; + $nodocumentformfields = $this->params['nodocumentformfields']; $enablelargefileupload = $this->params['enablelargefileupload']; $maxuploadsize = $this->params['maxuploadsize']; $enableadminrevapp = $this->params['enableadminrevapp']; @@ -230,6 +231,7 @@ console.log(element); $this->getDropFolderChooserHtml("form1") ); } + if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) { $this->formField( getMLText("comment"), array( @@ -239,6 +241,8 @@ console.log(element); 'cols'=>80 ) ); + } + if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) { if($presetexpiration) { if(!($expts = strtotime($presetexpiration))) $expts = false; @@ -265,6 +269,7 @@ console.log(element); getMLText("expires"), $this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage()) ); + } $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { foreach($attrdefs as $attrdef) { diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 64a3a5d62..60bb7c63c 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -483,7 +483,7 @@ $(document).ready( function() { 'options'=>$options ) ); - } else { + } elseif($workflowmode == 'advanced') { $workflows = $dms->getAllWorkflows(); if($workflows) { $this->contentSubHeading(getMLText("workflow")); diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index c77a156ea..e5fa08219 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -486,7 +486,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $needwkflaction = false; if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { - } else { + } elseif($workflowmode == 'advanced') { $workflow = $latestContent->getWorkflow(); if($workflow) { $workflowstate = $latestContent->getWorkflowState(); @@ -528,7 +528,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
    • @@ -670,7 +670,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($accessop->maySetReviewersApprovers()) { print "
  • ".getMLText("change_assignments")."
    • "; } - } else { + } elseif($workflowmode == 'advanced') { if($accessop->maySetWorkflow()) { if(!$workflow) { print "
  • ".getMLText("set_workflow")."
    • "; @@ -961,7 +961,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
    params['expandFolderTree']; $showtree = $this->params['showtree']; $cachedir = $this->params['cachedir']; - $workflowmode = $this->params['workflowmode']; $enableRecursiveCount = $this->params['enableRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount']; $maxItemsPerPage = $this->params['maxItemsPerPage']; From 849351e58bef68f1782f388ae8d705f761b9d76d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 10:53:09 +0100 Subject: [PATCH 143/198] add js for updateDropFolder only if drop folder list is enabled --- views/bootstrap/class.Bootstrap.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 7ac878713..cc3b53689 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -166,6 +166,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);; echo ''."\n"; if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) { $this->addFooterJS('checkTasks();'); + } + if($this->params['enabledropfolderlist'] && isset($this->params['user']) && $this->params['user']) { $this->addFooterJS('updateDropFolder();'); } if($this->footerjs) { From 16ca3dc96ae3d7f238db83b99946e28ad3d66148 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 10:54:42 +0100 Subject: [PATCH 144/198] init $tasks to empty array --- views/bootstrap/class.Tasks.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php index 8146e9beb..7b1bcfe48 100644 --- a/views/bootstrap/class.Tasks.php +++ b/views/bootstrap/class.Tasks.php @@ -40,6 +40,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $workflowmode = $this->params['workflowmode']; + $tasks = array(); if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { $tasks['approval'] = array(); if($workflowmode == 'traditional') From 3f14dcf4dbb4131785ebb4e356d7487e694bbe6e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 14:17:00 +0100 Subject: [PATCH 145/198] get settings from view --- views/bootstrap/class.ExtensionMgr.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 18f607109..2357b6d25 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -135,6 +135,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $settings = $this->params['settings']; $httproot = $this->params['httproot']; $extdir = $this->params['extdir']; $version = $this->params['version']; From d5a937fbc865e9695cddff2102823bcf3f8746d7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 14:17:48 +0100 Subject: [PATCH 146/198] minor modification of folder tree --- views/bootstrap/class.Bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index cc3b53689..1bed85442 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1621,7 +1621,7 @@ $(document).ready(function() { $subfolders = array($pathfolder); } foreach($subfolders as $subfolder) { - $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true); + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(0 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true); if(/*$expandtree>=$level ||*/ $pathfolder->getID() == $subfolder->getID()) { $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { @@ -1662,7 +1662,7 @@ $(document).ready(function() { $node['load_on_demand'] = true; $node['children'] = array(); } else { - $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 0 /*$expandtree*/, $orderby, 0); + $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 1 /*$expandtree*/, $orderby, 0); if($showdocs) { $documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode); @@ -1712,7 +1712,7 @@ $(function() { } }); // Unfold node for currently selected folder - $('#jqtree').tree('openNode', $('#jqtree').tree('getNodeById', ), false); + $('#jqtree').tree('selectNode', $('#jqtree').tree('getNodeById', ), false); $('#jqtree').on( 'tree.click', function(event) { From cb9ce2a42fb778404ca0403ea75976ab3874823e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 17:18:08 +0100 Subject: [PATCH 147/198] add methods for enabling/disabling an extension --- inc/inc.ClassSettings.php | 59 +++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 35ed72a4b..e63d0202b 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -418,7 +418,7 @@ class Settings { /* {{{ */ * * @return true/false */ - function load($configFilePath) { /* {{{ */ + public function load($configFilePath) { /* {{{ */ $contents = file_get_contents($configFilePath); if(!$contents) { return false; @@ -714,6 +714,9 @@ class Settings { /* {{{ */ foreach($extensions as $extension) { $tmp = $extension->attributes(); $extname = strval($tmp['name']); + if(isset($tmp['disable'])) + $disabled = strval($tmp['disable']); + $this->_extensions[$extname]['__disable__'] = $disabled=='1' || $disabled == 'true' ? true : false; foreach($extension->children() as $parameter) { $tmp2 = $parameter->attributes(); $this->_extensions[$extname][strval($tmp2['name'])] = strval($parameter); @@ -733,7 +736,7 @@ class Settings { /* {{{ */ * * @return true/false */ - function setXMLAttributValue($node, $attributName, $attributValue) { /* {{{ */ + protected function setXMLAttributValue($node, $attributName, $attributValue) { /* {{{ */ if (is_bool($attributValue)) { if ($attributValue) $attributValue = "true"; @@ -757,7 +760,7 @@ class Settings { /* {{{ */ * * @return SimpleXMLElement */ - function getXMLNode($rootNode, $parentNodeName, $name) { /* {{{ */ + protected function getXMLNode($rootNode, $parentNodeName, $name) { /* {{{ */ $node = $rootNode->xpath($parentNodeName . '/' . $name); if (empty($node)) { @@ -777,7 +780,7 @@ class Settings { /* {{{ */ * * @return true/false */ - function save($configFilePath=NULL) { /* {{{ */ + public function save($configFilePath=NULL) { /* {{{ */ if (is_null($configFilePath)) $configFilePath = $this->_configFilePath; @@ -1050,6 +1053,7 @@ class Settings { /* {{{ */ // search XML node $extnode = $extnodes->addChild('extension'); $this->setXMLAttributValue($extnode, 'name', $name); + $this->setXMLAttributValue($extnode, 'disable', $extension['__disable__'] ? 'true' : 'false'); /* New code saves all parameters of the extension which have been set * in configuration form. */ @@ -1082,7 +1086,7 @@ class Settings { /* {{{ */ * search and return Config File Path * @return NULL|string Config File Path */ - function searchConfigFilePath() { /* {{{ */ + protected function searchConfigFilePath() { /* {{{ */ $configFilePath = null; if($configDir = Settings::getConfigDir()) { @@ -1139,7 +1143,7 @@ class Settings { /* {{{ */ * * @return string */ - function curPageURL() { /* {{{ */ + protected function curPageURL() { /* {{{ */ $pageURL = 'http'; if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") { @@ -1164,7 +1168,7 @@ class Settings { /* {{{ */ * @param string $file name of file to search * @return string path where file was found */ - function findInIncPath($file) { /* {{{ */ + protected function findInIncPath($file) { /* {{{ */ $incarr = explode(PATH_SEPARATOR, ini_get('include_path')); $found = ''; foreach($incarr as $path) { @@ -1180,7 +1184,7 @@ class Settings { /* {{{ */ * * @return array */ - function check($minversion) { /* {{{ */ + public function check($minversion) { /* {{{ */ // suggestion rootdir if (file_exists("../inc/inc.Settings.php")) $rootDir = realpath ("../inc/inc.Settings.php"); @@ -1425,7 +1429,7 @@ class Settings { /* {{{ */ * @return array * */ - function checkSystem() { /* {{{ */ + public function checkSystem() { /* {{{ */ // result $result = array(); @@ -1512,6 +1516,43 @@ class Settings { /* {{{ */ return $result; } /* }}} */ + /** + * Check if extension is disabled + * + * @param string $extname name of extension + * @return true if extension is disabled + */ + public function extensionIsDisabled($extname) { /* {{{ */ + if(array_key_exists($extname, $this->_extensions)) + return $this->_extensions[$extname]['__disable__']; + + return false; + } /* }}} */ + + /** + * Set extension enabled + * + * @param string $extname name of extension + * @return + */ + public function enableExtension($extname) { /* {{{ */ + if(!array_key_exists($extname, $this->_extensions)) + $this->_extensions[$extname] = array(); + $this->_extensions[$extname]['__disable__'] = false; + } /* }}} */ + + /** + * Set extension enabled + * + * @param string $extname name of extension + * @return + */ + public function disableExtension($extname) { /* {{{ */ + if(!array_key_exists($extname, $this->_extensions)) + $this->_extensions[$extname] = array(); + $this->_extensions[$extname]['__disable__'] = true; + } /* }}} */ + } /* }}} */ ?> From b3ffdd3b7d1fd20d7e2078de337b70dbca40be38 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 17:20:15 +0100 Subject: [PATCH 148/198] extension are disabled in the settings the configuration of the extension will no longer work for disabling an extension --- controllers/class.ExtensionMgr.php | 15 +++ inc/inc.ClassUI.php | 6 +- inc/inc.Extension.php | 8 +- op/op.ExtensionMgr.php | 19 ++- views/bootstrap/class.ExtensionMgr.php | 165 +++++++++++++++---------- 5 files changed, 142 insertions(+), 71 deletions(-) diff --git a/controllers/class.ExtensionMgr.php b/controllers/class.ExtensionMgr.php index 9cae083e4..efd4fbd94 100644 --- a/controllers/class.ExtensionMgr.php +++ b/controllers/class.ExtensionMgr.php @@ -78,4 +78,19 @@ class SeedDMS_Controller_ExtensionMgr extends SeedDMS_Controller_Common { return true; } /* }}} */ + public function toggle() { /* {{{ */ + $dms = $this->params['dms']; + $settings = $this->params['settings']; + $extmgr = $this->params['extmgr']; + $extname = $this->params['extname']; + + if($settings->extensionIsDisabled($extname)) + $settings->enableExtension($extname); + else + $settings->disableExtension($extname); + $settings->save(); + + return true; + } /* }}} */ + } diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index d22e1ec07..c671f19b4 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -55,7 +55,8 @@ class UI extends UI_Default { /* Collect all decorators */ $decorators = array(); foreach($EXT_CONF as $extname=>$extconf) { - if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { if(isset($extconf['decorators'][$class])) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file']; if(file_exists($filename)) { @@ -71,7 +72,8 @@ class UI extends UI_Default { $filename = ''; $httpbasedir = ''; foreach($EXT_CONF as $extname=>$extconf) { - if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* Setting the 'views' element in the configuration can be used to * replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php * without providing an out/out.ViewFolder.php. In that case $httpbasedir diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 5841c8038..8e74c0080 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -22,15 +22,17 @@ $EXT_CONF = $extMgr->getExtensionConfiguration(); $version = new SeedDMS_Version; foreach($EXT_CONF as $extname=>$extconf) { - if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* check for requirements */ if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) + continue; $extconf['disable'] = true; } - } - if(!isset($extconf['disable']) || $extconf['disable'] == false) { +// } +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 55dcd0177..819c2ece3 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -56,7 +56,7 @@ if ($action == "download") { $controller->setParam('extmgr', $extMgr); $controller->setParam('extname', $extname); if (!$controller($_POST)) { - echo json_encode(array('success'=>false, 'error'=>'Could not download extension')); + echo json_encode(array('success'=>false, 'msg'=>'Could not download extension')); } add_log_line(); } /* }}} */ @@ -125,7 +125,22 @@ elseif ($action == "getlist") { /* {{{ */ } add_log_line(); header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab); +} elseif ($action == "toggle") { /* {{{ */ + if (!isset($_POST["extname"])) { + echo json_encode(array('success'=>false, 'msg'=>'Could not toggle extension')); + } + $extname = trim($_POST["extname"]); + if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) { + UI::exitError(getMLText("admin_tools"),getMLText("missing_extension")); + } + $controller->setParam('extmgr', $extMgr); + $controller->setParam('extname', $extname); + if (!$controller($_POST)) { + echo json_encode(array('success'=>false, 'msg'=>'Could not toggle extension')); + } else { + echo json_encode(array('success'=>true, 'msg'=>'Operation succeded')); + } + add_log_line(); } /* }}} */ -?> diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 2357b6d25..9cc5d5c2b 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -31,7 +31,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { header('Content-Type: application/javascript'); ?> $(document).ready( function() { - $('a.download').click(function(ev){ + $('body').on('click', 'a.download', function(ev){ +// $('a.download').click(function(ev){ var element = $(this); $('#'+element.data('extname')+'-download').submit(); /* @@ -54,6 +55,27 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { }); */ }); + $('body').on('click', 'a.toggle', function(ev){ +// $('a.toggle').click(function(ev){ + var element = $(this); + ev.preventDefault(); + $.ajax({url: '../op/op.ExtensionMgr.php', + type: 'POST', + dataType: "json", + data: {action: 'toggle', 'formtoken': '', 'extname': element.data('extname')}, + success: function(data) { + noty({ + text: data.msg, + type: (data.error) ? 'error' : 'success', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + timeout: 1500, + }); + $('div.ajax').trigger('update'); + } + }); + }); $('a.import').click(function(ev){ var element = $(this); @@ -80,11 +102,11 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { echo "\n"; print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; print "\n"; $list = $extmgr->getExtensionListByName($extname); foreach($list as $re) { @@ -113,7 +135,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { echo ""; echo ""; echo ""; - } + } echo "
    ".getMLText('name')."".getMLText('version')."".getMLText('author')."".getMLText('name')."".getMLText('version')."".getMLText('author')."
    \n"; } /* }}} */ @@ -132,6 +154,69 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { } } /* }}} */ + function installedList() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $settings = $this->params['settings']; + $httproot = $this->params['httproot']; + $extmgr = $this->params['extmgr']; + $extdir = $this->params['extdir']; + + echo "\n"; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + $errmsgs = array(); + foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) { + $errmsgs = array(); + if(!$settings->extensionIsDisabled($extname)) { +// if(!isset($extconf['disable']) || $extconf['disable'] == false) { + $extmgr->checkExtension($extname); + $errmsgs = $extmgr->getErrorMsgs(); + if($errmsgs) + echo ""; + else + echo ""; + } else { + echo ""; + } + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + } + echo "
    ".getMLText('name')."".getMLText('version')."".getMLText('author')."
    "; + if($extconf['icon']) + echo "\"".$extname."\""; + echo "".$extconf['title']; + echo "
    ".$extconf['description'].""; + if($errmsgs) + echo "
    getImgPath("attention.gif")."\"> ".implode('
    ', $errmsgs)."
    "; + echo "    		".$extconf['version']; + echo "
    ".$extconf['releasedate'].""; + echo "    		".$extconf['author']['name']."
    ".$extconf['author']['company']."    		"; + echo "
    "; + if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) { + echo "\n"; + } + if($extconf['config']) + echo ""; + echo "
    ".createHiddenFieldWithKey('extensionmgr')."
    "; + if(!$settings->extensionIsDisabled($extname)) { + echo ' '; + } else { + echo ' '; + } + echo "
    "; + echo "
    \n"; + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -142,7 +227,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $extmgr = $this->params['extmgr']; $currenttab = $this->params['currenttab']; $reposurl = $this->params['reposurl']; - + $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); $this->contentStart(); @@ -179,74 +264,26 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
    +
    contentContainerStart(); - echo "\n"; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - $errmsgs = array(); - foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) { - $errmsgs = array(); - if(!isset($extconf['disable']) || $extconf['disable'] == false) { - $extmgr->checkExtension($extname); - $errmsgs = $extmgr->getErrorMsgs(); - if($errmsgs) - echo ""; - else - echo ""; - } else - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; - } - echo "
    ".getMLText('name')."".getMLText('version')."".getMLText('author')."
    "; - if($extconf['icon']) - echo "\"".$extname."\""; - echo "".$extconf['title']; - echo "
    ".$extconf['description'].""; - if($errmsgs) - echo "
    getImgPath("attention.gif")."\"> ".implode('
    ', $errmsgs)."
    "; - echo "    		".$extconf['version']; - echo "
    ".$extconf['releasedate'].""; - echo "    		".$extconf['author']['name']."
    ".$extconf['author']['company']."    		"; - echo "
    "; - if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) { - echo "\n"; - } - if($extconf['config']) - echo ""; - echo "
    ".createHiddenFieldWithKey('extensionmgr')."
    "; - echo "
    "; - echo "
    \n"; +// $this->installedList(); ?>

    -contentContainerEnd(); -?>
    \n"; print "
    ".getMLText('name')."".getMLText('version')."".getMLText('author')."".getMLText('name')."".getMLText('version')."".getMLText('author')."
    \n"; ?>
    From 8409b7e518ec9e993117d736436431493cf48fb6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Dec 2019 17:35:48 +0100 Subject: [PATCH 149/198] add entry for 5.1.14 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a0fda89eb..8d43e51b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,9 @@ - document attributes comment, keywords, categories, expiration date, and sequence can be turned of in the configuration - workflows can be turned off completely +- Extension can be enabled/disabled in the extension manager, the previously + used method by setting a parameter in the extension's config file will no + longer work. -------------------------------------------------------------------------------- Changes in version 5.1.13 From b7deb8427939d1a7c30be50c13330df0e0be6922 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 31 Dec 2019 15:42:15 +0100 Subject: [PATCH 150/198] check if file to be indexed exists --- SeedDMS_Lucene/Lucene/IndexedDocument.php | 46 ++++++++++--------- .../SQLiteFTS/IndexedDocument.php | 46 ++++++++++--------- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php index 237150097..df93e4a35 100644 --- a/SeedDMS_Lucene/Lucene/IndexedDocument.php +++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php @@ -158,29 +158,31 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document { } if($version && !$nocontent) { $path = $dms->contentDir . $version->getPath(); - $content = ''; - $mimetype = $version->getMimeType(); - $this->mimetype = $mimetype; - $cmd = ''; - $mimeparts = explode('/', $mimetype, 2); - if(isset($_convcmd[$mimetype])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd['*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } - if($cmd) { - $this->cmd = $cmd; - try { - $content = self::execWithTimeout($cmd, $timeout); - if($content['stdout']) { - $this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8')); + if(file_exists($path)) { + $content = ''; + $mimetype = $version->getMimeType(); + $this->mimetype = $mimetype; + $cmd = ''; + $mimeparts = explode('/', $mimetype, 2); + if(isset($_convcmd[$mimetype])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd['*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } + if($cmd) { + $this->cmd = $cmd; + try { + $content = self::execWithTimeout($cmd, $timeout); + if($content['stdout']) { + $this->addField(Zend_Search_Lucene_Field::UnStored('content', $content['stdout'], 'utf-8')); + } + if($content['stderr']) { + $this->errormsg = $content['stderr']; + } + } catch (Exception $e) { } - if($content['stderr']) { - $this->errormsg = $content['stderr']; - } - } catch (Exception $e) { } } } diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php index fb87503b8..5e9fb08a1 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php @@ -152,29 +152,31 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document { } if($version && !$nocontent) { $path = $dms->contentDir . $version->getPath(); - $content = ''; - $mimetype = $version->getMimeType(); - $this->mimetype = $mimetype; - $cmd = ''; - $mimeparts = explode('/', $mimetype, 2); - if(isset($_convcmd[$mimetype])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } elseif(isset($_convcmd['*'])) { - $cmd = sprintf($_convcmd[$mimetype], $path); - } - if($cmd) { - $this->cmd = $cmd; - try { - $content = self::execWithTimeout($cmd, $timeout); - if($content['stdout']) { - $this->addField('content', $content['stdout'], 'unstored'); + if(file_exists($path)) { + $content = ''; + $mimetype = $version->getMimeType(); + $this->mimetype = $mimetype; + $cmd = ''; + $mimeparts = explode('/', $mimetype, 2); + if(isset($_convcmd[$mimetype])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd[$mimeparts[0].'/*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } elseif(isset($_convcmd['*'])) { + $cmd = sprintf($_convcmd[$mimetype], $path); + } + if($cmd) { + $this->cmd = $cmd; + try { + $content = self::execWithTimeout($cmd, $timeout); + if($content['stdout']) { + $this->addField('content', $content['stdout'], 'unstored'); + } + if($content['stderr']) { + $this->errormsg = $content['stderr']; + } + } catch (Exception $e) { } - if($content['stderr']) { - $this->errormsg = $content['stderr']; - } - } catch (Exception $e) { } } } From 189e6da70eeac24e9163a3306f796777bad47107 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 1 Jan 2020 09:24:22 +0100 Subject: [PATCH 151/198] better checking for correct version had to be modified because extensions are new disabled in the settings.xml --- inc/inc.Extension.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 8e74c0080..5fb009398 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -23,16 +23,15 @@ $version = new SeedDMS_Version; foreach($EXT_CONF as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* check for requirements */ + $disable = false; if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) continue; - $extconf['disable'] = true; + $disable = true; } -// } -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$disable) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { @@ -57,5 +56,6 @@ foreach($EXT_CONF as $extname=>$extconf) { } } } + } } } From 8ae287436707826679776a50196ea372bd6fb8ea Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 3 Jan 2020 10:21:58 +0100 Subject: [PATCH 152/198] do not use global var EXT_CONF anymore --- CHANGELOG | 1 + controllers/class.ExtensionMgr.php | 2 +- inc/inc.ClassController.php | 4 +- inc/inc.ClassExtensionMgr.php | 6 +-- inc/inc.ClassUI.php | 61 +++++++++++++------------- inc/inc.Extension.php | 19 +++++--- out/out.Settings.php | 1 + views/bootstrap/class.ExtensionMgr.php | 18 +++++--- views/bootstrap/class.Settings.php | 6 ++- 9 files changed, 67 insertions(+), 51 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8d43e51b8..12166e154 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ - Extension can be enabled/disabled in the extension manager, the previously used method by setting a parameter in the extension's config file will no longer work. +- clean up code for managing extensions -------------------------------------------------------------------------------- Changes in version 5.1.13 diff --git a/controllers/class.ExtensionMgr.php b/controllers/class.ExtensionMgr.php index efd4fbd94..e28f4dab7 100644 --- a/controllers/class.ExtensionMgr.php +++ b/controllers/class.ExtensionMgr.php @@ -36,7 +36,7 @@ class SeedDMS_Controller_ExtensionMgr extends SeedDMS_Controller_Common { $extmgr = $this->params['extmgr']; $extname = $this->params['extname']; - $filename = $extmgr->createArchive($extname, $GLOBALS['EXT_CONF'][$extname]['version']); + $filename = $extmgr->createArchive($extname, $extmgr->getExtensionConfiguration()[$extname]['version']); if(null === $this->callHook('download')) { if(file_exists($filename)) { diff --git a/inc/inc.ClassController.php b/inc/inc.ClassController.php index 04e70dca7..2092d9313 100644 --- a/inc/inc.ClassController.php +++ b/inc/inc.ClassController.php @@ -30,14 +30,14 @@ class Controller { * @return object an object of a class implementing the view */ static function factory($class, $params=array()) { /* {{{ */ - global $settings, $session, $EXT_CONF; + global $settings, $session, $extMgr; if(!$class) { return null; } $classname = "SeedDMS_Controller_".$class; $filename = ''; - foreach($EXT_CONF as $extname=>$extconf) { + foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { $filename = $settings->_rootDir.'ext/'.$extname.'/controllers/class.'.$class.".php"; if(file_exists($filename)) { break; diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 7af12f2e2..2d000b21c 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -362,9 +362,9 @@ class SeedDMS_Extension_Mgr { break; default: $tmp = explode('-', $dval, 2); - if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) { - if(self::cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0)) - $this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']); + if(isset($this->extconf[$dkey]['version'])) { + if(self::cmpVersion($tmp[0], $this->extconf[$dkey]['version']) > 0 || ($tmp[1] && self::cmpVersion($tmp[1], $this->extconf[$dkey]['version']) < 0)) + $this->errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $this->extconf[$dkey]['version']); } else { $this->errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey); } diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index c671f19b4..8f8ee5047 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -45,7 +45,7 @@ class UI extends UI_Default { * @return object an object of a class implementing the view */ static function factory($theme, $class='', $params=array()) { /* {{{ */ - global $settings, $session, $EXT_CONF; + global $settings, $session, $extMgr; if(!$class) { $class = 'Bootstrap'; $classname = "SeedDMS_Bootstrap_Style"; @@ -54,14 +54,14 @@ class UI extends UI_Default { } /* Collect all decorators */ $decorators = array(); - foreach($EXT_CONF as $extname=>$extconf) { + foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { - if(isset($extconf['decorators'][$class])) { - $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file']; - if(file_exists($filename)) { - $classname = $extconf['decorators'][$class]['name']; - $decorators[$extname] = $extconf['decorators'][$class]; + if($extMgr->checkExtension($extconf)) { + if(isset($extconf['decorators'][$class])) { + $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file']; + if(file_exists($filename)) { + $decorators[$extname] = $extconf['decorators'][$class]; + } } } } @@ -71,32 +71,33 @@ class UI extends UI_Default { */ $filename = ''; $httpbasedir = ''; - foreach($EXT_CONF as $extname=>$extconf) { + foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { - /* Setting the 'views' element in the configuration can be used to - * replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php - * without providing an out/out.ViewFolder.php. In that case $httpbasedir - * will not be set because out/out.xxx.php is still used. - */ - if(isset($extconf['views'][$class])) { - $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; + if($extMgr->checkExtension($extconf)) { + /* Setting the 'views' element in the configuration can be used to + * replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php + * without providing an out/out.ViewFolder.php. In that case $httpbasedir + * will not be set because out/out.xxx.php is still used. + */ + if(isset($extconf['views'][$class])) { + $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; + if(file_exists($filename)) { + // $httpbasedir = 'ext/'.$extname.'/'; + $classname = $extconf['views'][$class]['name']; + break; + } + } + /* New views are added by creating a file out/out.xx.php and + * views/bootstrap/class.xx.php, without setting the 'views' element + * in the configuration + */ + $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; if(file_exists($filename)) { -// $httpbasedir = 'ext/'.$extname.'/'; - $classname = $extconf['views'][$class]['name']; + $httpbasedir = 'ext/'.$extname.'/'; break; } + $filename = ''; } - /* New views are added by creating a file out/out.xx.php and - * views/bootstrap/class.xx.php, without setting the 'views' element - * in the configuration - */ - $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; - if(file_exists($filename)) { - $httpbasedir = 'ext/'.$extname.'/'; - break; - } - $filename = ''; } } if(!$filename) @@ -141,7 +142,7 @@ class UI extends UI_Default { $view->setParam('onepage', $settings->_onePageMode); foreach($decorators as $extname=>$decorator) { $filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$decorator['file']; - require($filename); + require_once($filename); $view = new $decorator['name']($view); } return $view; diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 5fb009398..77f4b6eb6 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -17,21 +17,28 @@ require_once "inc.Version.php"; require_once "inc.Utils.php"; $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl); -$EXT_CONF = $extMgr->getExtensionConfiguration(); $version = new SeedDMS_Version; -foreach($EXT_CONF as $extname=>$extconf) { +foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { + $disabled = true; + if($extMgr->checkExtension($extconf)) { + $disabled = false; + } else { + // echo $extMgr->getErrorMsg(); + } /* check for requirements */ - $disable = false; + /* if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) - continue; - $disable = true; + $disabled = true; + else + $disabled = false; } - if(!$disable) { + */ + if(!$disabled) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { diff --git a/out/out.Settings.php b/out/out.Settings.php index 0c3718d3a..27833735d 100644 --- a/out/out.Settings.php +++ b/out/out.Settings.php @@ -42,6 +42,7 @@ $groups = $dms->getAllGroups(); if($view) { $view->setParam('settings', $settings); + $view->setParam('extmgr', $extMgr); $view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')); $view->setParam('allusers', $users); $view->setParam('allgroups', $groups); diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 9cc5d5c2b..1a7f2909c 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -99,6 +99,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $extmgr = $this->params['extmgr']; $extname = $this->params['extname']; + $extconf = $extmgr->getExtensionConfiguration(); echo "\n"; print "\n\n"; @@ -112,9 +113,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { foreach($list as $re) { $extmgr->checkExtension($re); $checkmsgs = $extmgr->getErrorMsgs(); - $needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0; + $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; echo "params['extdir']; $extmgr = $this->params['extmgr']; $extname = $this->params['extname']; + $extconf = $extmgr->getExtensionConfiguration(); - if(isset($GLOBALS['EXT_CONF'][$extname])) { - $extconf = $GLOBALS['EXT_CONF'][$extname]; + if(isset($extconf[$extname])) { + $extconf = $extconf[$extname]; if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) { echo '
    '.file_get_contents($extdir."/".$extname."/".$extconf['changelog'])."
    "; } @@ -161,6 +163,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $httproot = $this->params['httproot']; $extmgr = $this->params['extmgr']; $extdir = $this->params['extdir']; + $extconf = $extmgr->getExtensionConfiguration(); echo "
    \n"; print "\n\n"; @@ -171,7 +174,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { print "\n"; print "\n"; $errmsgs = array(); - foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) { + foreach($extconf as $extname=>$extconf) { $errmsgs = array(); if(!$settings->extensionIsDisabled($extname)) { // if(!isset($extconf['disable']) || $extconf['disable'] == false) { @@ -225,6 +228,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $extdir = $this->params['extdir']; $version = $this->params['version']; $extmgr = $this->params['extmgr']; + $extconf = $extmgr->getExtensionConfiguration(); $currenttab = $this->params['currenttab']; $reposurl = $this->params['reposurl']; @@ -291,9 +295,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { continue; $extmgr->checkExtension($re); $checkmsgs = $extmgr->getErrorMsgs(); - $needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0; + $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; echo "params['extmgr']; header('Content-Type: application/javascript'); ?> @@ -207,7 +208,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { }); }); $extconf) { + foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) { if($extconf['config']) { foreach($extconf['config'] as $confkey=>$conf) { switch($conf['type']) { @@ -230,6 +231,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $settings = $this->params['settings']; + $extmgr = $this->params['extmgr']; $currenttab = $this->params['currenttab']; $this->htmlStartPage(getMLText("admin_tools")); @@ -475,7 +477,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); -- SETTINGS - ADVANCED - DISPLAY --> $extconf) { + foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) { if($this->hasHook('processConfig')) $extconf = $this->callHook('processConfig', $extname, $extconf); if($extconf['config']) { From 974ff603e1bf1bbfa9bd66bd312ce0620fd182f2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 Jan 2020 21:20:16 +0100 Subject: [PATCH 153/198] check if hooks return a user object because true also indicates a failed login --- controllers/class.Login.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/controllers/class.Login.php b/controllers/class.Login.php index 01cd4f21a..3a66568e1 100644 --- a/controllers/class.Login.php +++ b/controllers/class.Login.php @@ -85,30 +85,35 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common { } /* Deprecated: Run any additional authentication implemented in a hook */ - if(!$user && isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) { + if(!is_object($user) && isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['authentication'] as $authObj) { if(!$user && method_exists($authObj, 'authenticate')) { $user = $authObj->authenticate($dms, $settings, $login, $pwd); + if(false === $user) { + if(empty($this->errormsg)) + $this->setErrorMsg("authentication_failed"); + return false; + } } } } /* Authenticate against LDAP server {{{ */ - if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { + if (!is_object($user) && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { require_once("../inc/inc.ClassLdapAuthentication.php"); $authobj = new SeedDMS_LdapAuthentication($dms, $settings); $user = $authobj->authenticate($login, $pwd); } /* }}} */ /* Authenticate against SeedDMS database {{{ */ - if(!$user) { + if(!is_object($user)) { require_once("../inc/inc.ClassDbAuthentication.php"); $authobj = new SeedDMS_DbAuthentication($dms, $settings); $user = $authobj->authenticate($login, $pwd); } /* }}} */ /* If the user is still not authenticated, then exit with an error */ - if(!$user) { + if(!is_object($user)) { $this->callHook('loginFailed'); $this->setErrorMsg("login_error_text"); return false; From 9b6949a00a6b092200a3d65d6384456859a7f5a2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 7 Jan 2020 21:21:17 +0100 Subject: [PATCH 154/198] check if document content exists in hits of fulltext search --- views/bootstrap/class.Search.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index f4d49f049..27ae82db7 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -489,9 +489,8 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { else { $document = $entry; $owner = $document->getOwner(); - $lc = $document->getLatestContent(); - $version = $lc->getVersion(); - $previewer->createPreview($lc); + if($lc = $document->getLatestContent()) + $previewer->createPreview($lc); if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($document->getComment())); @@ -506,7 +505,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $belowtitle .= htmlspecialchars($path[$i]->getName())."/"; } $belowtitle .= ""; - $lcattributes = $lc->getAttributes(); + $lcattributes = $lc ? $lc->getAttributes() : null; $attrstr = ''; if($lcattributes) { $attrstr .= "
    \n"; From 699152d95b7f7b6a996f1b46383608dd99761bc5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 10 Jan 2020 14:48:14 +0100 Subject: [PATCH 155/198] use getDMS() instead of accessing _dms --- SeedDMS_Core/Core/inc.ClassDocument.php | 117 ++++++++++++------------ 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 43056e7a0..e932e0ada 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2896,7 +2896,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ function getUser() { /* {{{ */ if (!isset($this->_user)) - $this->_user = $this->_document->_dms->getUser($this->_userID); + $this->_user = $this->_document->getDMS()->getUser($this->_userID); return $this->_user; } /* }}} */ @@ -2912,7 +2912,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ function getPath() { return $this->_document->getDir() . $this->_version . ($this->_fileType != '.' ? $this->_fileType : ''); } function setDate($date = false) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$date) $date = time(); @@ -2942,7 +2942,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($filesize === false) return false; - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentContent` SET `fileSize` = ".$filesize." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; @@ -2963,7 +2963,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if($checksum === false) return false; - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentContent` SET `checksum` = ".$db->qstr($checksum)." where `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) return false; @@ -2973,7 +2973,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function setComment($newComment) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentContent` SET `comment` = ".$db->qstr($newComment)." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version; if (!$db->getResult($queryStr)) @@ -3007,7 +3007,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array latest record from tblDocumentStatusLog */ function getStatus($limit=1) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3041,7 +3041,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of status changes */ function getStatusLog($limit=0) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3076,7 +3076,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function setStatus($status, $comment, $updateUser, $date='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($status)) return false; @@ -3123,7 +3123,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteStatusLog($statuslog) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr= "SELECT `tblDocumentStatus`.* FROM `tblDocumentStatus` WHERE `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentStatus`.`version` = '". $this->_version ."' "; $res = $db->getResultArray($queryStr); @@ -3182,7 +3182,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer either M_NONE or M_READ */ function getAccessMode($u) { /* {{{ */ - $dms = $this->_document->_dms; + $dms = $this->_document->getDMS(); /* Check if 'onCheckAccessDocumentContent' callback is set */ if(isset($this->_dms->callbacks['onCheckAccessDocumentContent'])) { @@ -3292,7 +3292,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of review status */ function getReviewStatus($limit=1) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3352,7 +3352,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteReviewLog($reviewers) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr= "SELECT `tblDocumentReviewers`.* FROM `tblDocumentReviewers` WHERE `tblDocumentReviewers`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentReviewers`.`version` = '". $this->_version ."' "; $res = $db->getResultArray($queryStr); @@ -3420,7 +3420,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of approval status */ function getApprovalStatus($limit=1) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!is_numeric($limit)) return false; @@ -3480,7 +3480,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteApprovalLog($reviewers) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr= "SELECT `tblDocumentApprovers`.* FROM `tblDocumentApprovers` WHERE `tblDocumentApprovers`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentApprovers`.`version` = '". $this->_version ."' "; $res = $db->getResultArray($queryStr); @@ -3541,7 +3541,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addIndReviewer($user, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $userID = $user->getID(); @@ -3592,7 +3592,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addGrpReviewer($group, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -3670,7 +3670,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer new review log id */ function setReviewByInd($user, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the review list. $reviewStatus = $user->getReviewStatus($this->_document->getID(), $this->_version); @@ -3722,7 +3722,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer new review log id */ function setReviewByGrp($group, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the review list. $reviewStatus = $group->getReviewStatus($this->_document->getID(), $this->_version); @@ -3761,7 +3761,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addIndApprover($user, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $userID = $user->getID(); @@ -3810,7 +3810,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function addGrpApprover($group, $requestUser) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -3892,7 +3892,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return integer 0 on success, < 0 in case of an error */ function setApprovalByInd($user, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the approval list. $approvalStatus = $user->getApprovalStatus($this->_document->getID(), $this->_version); @@ -3936,7 +3936,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * group instead of a user */ function setApprovalByGrp($group, $requestUser, $status, $comment, $file='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the approval list. $approvalStatus = $group->getApprovalStatus($this->_document->getID(), $this->_version); @@ -3974,7 +3974,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delIndReviewer($user, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); // Check to see if the user can be removed from the review list. $reviewStatus = $user->getReviewStatus($this->_document->getID(), $this->_version); @@ -4004,7 +4004,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delGrpReviewer($group, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -4035,7 +4035,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delIndApprover($user, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $userID = $user->getID(); @@ -4067,7 +4067,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* }}} */ function delGrpApprover($group, $requestUser, $msg='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $groupID = $group->getID(); @@ -4103,7 +4103,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $state */ function setWorkflowState($state) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if($this->_workflow) { $queryStr = "UPDATE `tblWorkflowDocumentContent` set `state`=". $state->getID() ." WHERE `workflow`=". intval($this->_workflow->getID()). " AND `document`=". intval($this->_document->getID()) ." AND version=". intval($this->_version) .""; @@ -4123,7 +4123,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error, e.g. the version has not a workflow */ function getWorkflowState() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4140,7 +4140,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (is_bool($recs) && !$recs) return false; $this->_workflowState = new SeedDMS_Core_Workflow_State($recs[0]['id'], $recs[0]['name'], $recs[0]['maxtime'], $recs[0]['precondfunc'], $recs[0]['documentstatus']); - $this->_workflowState->setDMS($this->_document->_dms); + $this->_workflowState->setDMS($this->_document->getDMS()); } return $this->_workflowState; } /* }}} */ @@ -4151,7 +4151,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $workflow */ function setWorkflow($workflow, $user) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $this->getWorkflow(); if($workflow && is_object($workflow)) { @@ -4184,7 +4184,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error, e.g. the version has not a workflow */ function getWorkflow() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if (!isset($this->_workflow)) { $queryStr= @@ -4196,8 +4196,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; if(!$recs) return false; - $this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate'])); - $this->_workflow->setDMS($this->_document->_dms); + $this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->getDMS()->getWorkflowState($recs[0]['initstate'])); + $this->_workflow->setDMS($this->_document->getDMS()); } return $this->_workflow; } /* }}} */ @@ -4213,7 +4213,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true on success, otherwise false */ function rewriteWorkflowLog($workflowlog) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $db->startTransaction(); @@ -4250,7 +4250,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error */ function rewindWorkflow() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $this->getWorkflow(); @@ -4291,7 +4291,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * or false in case of error */ function removeWorkflow($user, $unlink=false) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $this->getWorkflow(); @@ -4336,7 +4336,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $subworkflow */ function getParentWorkflow() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* document content must be in a workflow */ $this->getWorkflow(); @@ -4355,7 +4355,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; if($recs[0]['parentworkflow']) - return $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']); + return $this->_document->getDMS()->getWorkflow($recs[0]['parentworkflow']); return false; } /* }}} */ @@ -4366,7 +4366,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param object $subworkflow */ function runSubWorkflow($subworkflow) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* document content must be in a workflow */ $this->getWorkflow(); @@ -4400,7 +4400,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @param string comment for the transition trigger */ function returnFromSubWorkflow($user, $transition=null, $comment='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* document content must be in a workflow */ $this->getWorkflow(); @@ -4430,8 +4430,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ return false; } - $this->_workflow = $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']); - $this->_workflow->setDMS($this->_document->_dms); + $this->_workflow = $this->_document->getDMS()->getWorkflow($recs[0]['parentworkflow']); + $this->_workflow->setDMS($this->_document->getDMS()); if($transition) { if(false === $this->triggerWorkflowTransition($user, $transition, $comment)) { @@ -4456,7 +4456,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return boolean true if user may trigger transaction */ function triggerWorkflowTransitionIsAllowed($user, $transition) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4598,7 +4598,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * false in case of an error */ function triggerWorkflowTransition($user, $transition, $comment='') { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4739,7 +4739,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of operations */ function getWorkflowLog($transition = null) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); /* if(!$this->_workflow) @@ -4759,8 +4759,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $workflowlogs = array(); for ($i = 0; $i < count($resArr); $i++) { - $workflow = $this->_document->_dms->getWorkflow($resArr[$i]["workflow"]); - $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->_dms->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $workflow, $this->_document->_dms->getUser($resArr[$i]["userid"]), $workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); + $workflow = $this->_document->getDMS()->getWorkflow($resArr[$i]["workflow"]); + $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); $workflowlog->setDMS($this); $workflowlogs[$i] = $workflowlog; } @@ -4775,7 +4775,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ * @return array list of operations */ function getLastWorkflowTransition() { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$this->_workflow) $this->getWorkflow(); @@ -4792,7 +4792,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $workflowlogs = array(); $i = 0; - $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->_dms->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->_dms->getUser($resArr[$i]["userid"]), $this->_workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); + $workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $this->_workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]); $workflowlog->setDMS($this); return $workflowlog; @@ -4910,8 +4910,9 @@ class SeedDMS_Core_DocumentLink { /* {{{ */ * @return bool|SeedDMS_Core_User */ function getUser() { - if (!isset($this->_user)) - $this->_user = $this->_document->_dms->getUser($this->_userID); + if (!isset($this->_user)) { + $this->_user = $this->_document->getDMS()->getUser($this->_userID); + } return $this->_user; } @@ -5087,7 +5088,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param string $newComment string new comment of document */ function setComment($newComment) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentFiles` SET `comment` = ".$db->qstr($newComment)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id; if (!$db->getResult($queryStr)) @@ -5110,7 +5111,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @return boolean true on success */ function setDate($date) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!$date) $date = time(); @@ -5157,7 +5158,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param $newComment string new name of document */ function setName($newName) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentFiles` SET `name` = ".$db->qstr($newName)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id; if (!$db->getResult($queryStr)) @@ -5172,7 +5173,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ */ function getUser() { if (!isset($this->_user)) - $this->_user = $this->_document->_dms->getUser($this->_userID); + $this->_user = $this->_document->getDMS()->getUser($this->_userID); return $this->_user; } @@ -5194,7 +5195,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param $newComment string new version of document */ function setVersion($newVersion) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); if(!is_numeric($newVersion) && $newVersion != '') return false; @@ -5218,7 +5219,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @param $newComment string new comment of document */ function setPublic($newPublic) { /* {{{ */ - $db = $this->_document->_dms->getDB(); + $db = $this->_document->getDMS()->getDB(); $queryStr = "UPDATE `tblDocumentFiles` SET `public` = ".($newPublic ? 1 : 0)." WHERE `document` = ".$this->_document->getId()." AND `id` = ". $this->_id; if (!$db->getResult($queryStr)) @@ -5240,7 +5241,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */ * @return integer either M_NONE or M_READ */ function getAccessMode($u) { /* {{{ */ - $dms = $this->_document->_dms; + $dms = $this->_document->getDMS(); /* Check if 'onCheckAccessDocumentLink' callback is set */ if(isset($this->_dms->callbacks['onCheckAccessDocumentFile'])) { From bb38dc7b22352f32171175b1c31079ab602809d3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 Jan 2020 09:32:22 +0100 Subject: [PATCH 156/198] properly handle duplicate names when moving a document/folder --- webdav/webdav.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/webdav/webdav.php b/webdav/webdav.php index ff08f71ee..00c4e0d4f 100644 --- a/webdav/webdav.php +++ b/webdav/webdav.php @@ -1062,6 +1062,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $objdest = $this->reverseLookup($options["dest"]); $newdocname = ''; + /* if the destіnation could not be found, then a folder/document shall + * be renamed. In that case the source object is moved into the ѕame + * or different folder under a new name. + * $objdest will store the new destination folder afterwards + */ if(!$objdest) { /* check if at least the dest directory exists */ $dirname = dirname($options['dest']); @@ -1112,13 +1117,17 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server /* Set the new Folder of the source object */ if(get_class($objsource) == $this->dms->getClassname('document')) { /* Check if name already exists in the folder */ - /* if(!$settings->_enableDuplicateDocNames) { - if($objdest->hasDocumentByName($objsource->getName())) { - return "403 Forbidden"; + if($newdocname) { + if($objdest->hasDocumentByName($newdocname)) { + return "403 Forbidden"; + } + } else { + if($objdest->hasDocumentByName($objsource->getName())) { + return "403 Forbidden"; + } } } - */ $oldFolder = $objsource->getFolder(); if($objsource->setFolder($objdest)) { @@ -1153,8 +1162,14 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server } elseif(get_class($objsource) == $this->dms->getClassname('folder')) { /* Check if name already exists in the folder */ if(!$settings->_enableDuplicateSubFolderNames) { - if($objdest->hasSubFolderByName($objsource->getName())) { - return "403 Forbidden"; + if($newdocname) { + if($objdest->hasSubFolderByName($newdocname)) { + return "403 Forbidden"; + } + } else { + if($objdest->hasSubFolderByName($objsource->getName())) { + return "403 Forbidden"; + } } } $oldFolder = $objsource->getParent(); @@ -1176,7 +1191,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $params['old_folder_path'] = $oldFolder->getFolderPathPlain(); $params['new_folder_path'] = $objdest->getFolderPathPlain(); $params['username'] = $this->user->getFullName(); - $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$objsource->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $this->notifier->toList($this->user, $nl["users"], $subject, $message, $params); From 61ce13d681d33bff94004bb74a0ebadd09169604 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 Jan 2020 09:32:48 +0100 Subject: [PATCH 157/198] add entry for 5.1.14 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 12166e154..15e10fdb6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ used method by setting a parameter in the extension's config file will no longer work. - clean up code for managing extensions +- fix renaming of folders via webdav -------------------------------------------------------------------------------- Changes in version 5.1.13 From 392a7e4a51690f2cbe6bffc024348a887186ded5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 13 Jan 2020 17:31:59 +0100 Subject: [PATCH 158/198] make getFileName() public --- SeedDMS_Preview/Preview/Previewer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php index b8df0ca1c..9e2fe2a34 100644 --- a/SeedDMS_Preview/Preview/Previewer.php +++ b/SeedDMS_Preview/Preview/Previewer.php @@ -52,7 +52,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { * @param integer $width width of preview image * @return string file name of preview image */ - protected function getFileName($object, $width) { /* {{{ */ + public function getFileName($object, $width) { /* {{{ */ if(!$object) return false; From b59f906f273859097a2c2a2605421543b7c1674b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 14 Jan 2020 08:31:43 +0100 Subject: [PATCH 159/198] fis saving of disable flag of extensions --- inc/inc.ClassSettings.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e63d0202b..26206d127 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -716,10 +716,14 @@ class Settings { /* {{{ */ $extname = strval($tmp['name']); if(isset($tmp['disable'])) $disabled = strval($tmp['disable']); + else + $disabled = 0; $this->_extensions[$extname]['__disable__'] = $disabled=='1' || $disabled == 'true' ? true : false; foreach($extension->children() as $parameter) { $tmp2 = $parameter->attributes(); - $this->_extensions[$extname][strval($tmp2['name'])] = strval($parameter); + /* Do not read a parameter with the same name. Just a pre caution */ + if(strval($tmp2['name']) != '__disable__') + $this->_extensions[$extname][strval($tmp2['name'])] = strval($parameter); } } @@ -1058,7 +1062,7 @@ class Settings { /* {{{ */ * in configuration form. */ foreach($extension as $fieldname=>$confvalue) { - if($confvalue) { + if($fieldname != '___disable__' && $confvalue) { $parameter = $extnode->addChild('parameter'); $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; $this->setXMLAttributValue($parameter, 'name', $fieldname); From daf08343e36cff408ef72bebae71d13513a9be01 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 14 Jan 2020 08:32:05 +0100 Subject: [PATCH 160/198] set disable flag of extension otherwise it will not be saved --- views/bootstrap/class.Settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 13492c439..14a48cb56 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -78,7 +78,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { */ protected function showRawConfigHeadline($text) { /* {{{ */ ?> - + showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); if($this->hasHook('processConfig')) $extconf = $this->callHook('processConfig', $extname, $extconf); if($extconf['config']) { - $this->showRawConfigHeadline("".$extconf['title']); + $this->showRawConfigHeadline("".'_extensions[$extname]["__disable__"] ? '1' : '').'" />'.$extconf['title']); foreach($extconf['config'] as $confkey=>$conf) { ob_start(); switch($conf['type']) { From 0dbeebee802e9d4dfde686ee1501e9e438b395e9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 10:57:07 +0100 Subject: [PATCH 161/198] add config for apache 2.4 and 2.2 --- conf/.htaccess | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/conf/.htaccess b/conf/.htaccess index d774f51c9..2e473b4ba 100644 --- a/conf/.htaccess +++ b/conf/.htaccess @@ -1,6 +1,10 @@ # Make sure settings.xml can not be opened from outside! -#Redirect /conf/settings.xml /index.php - -Order allow,deny -Deny from all - +# Deny all requests from Apache 2.4+. + + Require all denied + + +# Deny all requests from Apache 2.0-2.2. + + Deny from all + From 827049ee9a89b03daac1b2db3cc0ba876a8ae7ea Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 12:45:59 +0100 Subject: [PATCH 162/198] nofication field can be turned of when uploading a new document --- views/bootstrap/class.AddDocument.php | 2 ++ views/bootstrap/class.Settings.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 36ccdf1e6..65e530ae7 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -635,6 +635,7 @@ $(document).ready(function() { } $this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); } + if(!$nodocumentformfields || !in_array('notification', $nodocumentformfields)) { $this->contentSubHeading(getMLText("add_document_notify")); $options = array(); @@ -671,6 +672,7 @@ $(document).ready(function() { 'options'=>$options ) ); + } $this->formSubmit(" ".getMLText('add_document')); ?> diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 14a48cb56..31f5810e0 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -288,7 +288,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> showConfigHeadline('settings_Edition'); ?> showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?> -showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment'), true, true); ?> +showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment', 'notification'), true, true); ?> showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?> showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?> showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?> From f1599906d0d1e8fe4196c5412226aa5fe46233e8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 13:07:43 +0100 Subject: [PATCH 163/198] check if $_POST["reqversion"] is empty --- op/op.AddDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index a82105aa5..4c55beb66 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -124,7 +124,7 @@ foreach($attributes_version as $attrdefid=>$attribute) { } */ -$reqversion = (int)$_POST["reqversion"]; +$reqversion = !empty($_POST['reqversion']) ? (int)$_POST["reqversion"] : 0; if ($reqversion<1) $reqversion=1; $sequence = $_POST["sequence"]; From 905adbe6ba0a76055eb4d96491a6748f11cab04e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 13:08:22 +0100 Subject: [PATCH 164/198] do not ask for approver/reviewer if workflow is turned of completely --- views/bootstrap/class.UpdateDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index 12ce32cb6..b1c4b0815 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -349,7 +349,7 @@ console.log(element); ); } $this->warningMsg(getMLText("add_doc_workflow_warning")); - } else { + } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { $docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp); if($workflowmode == 'traditional') { $this->contentSubHeading(getMLText("assign_reviewers")); From f0ab6af744864201aef8d116f00bf5cd2a1d26d1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 13:08:48 +0100 Subject: [PATCH 165/198] asking for version number can be turned of completely --- views/bootstrap/class.AddDocument.php | 2 ++ views/bootstrap/class.Settings.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 65e530ae7..57162b071 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -325,6 +325,7 @@ $(document).ready(function() { } $this->contentSubHeading(getMLText("version_info")); + if(!$nodocumentformfields || !in_array('version', $nodocumentformfields)) { $this->formField( getMLText("version"), array( @@ -335,6 +336,7 @@ $(document).ready(function() { 'value'=>1 ) ); + } $this->formField( getMLText("local_file"), $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '' : '') diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 31f5810e0..3cf73e26f 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -288,7 +288,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); --> showConfigHeadline('settings_Edition'); ?> showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?> -showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment', 'notification'), true, true); ?> +showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version', 'version_comment', 'notification'), true, true); ?> showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?> showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?> showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?> From 6e2dd6c159a1266fdca7d7ce879e8917a55a8481 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Jan 2020 17:48:23 +0100 Subject: [PATCH 166/198] check for presetexpdate and sequence in $_POST --- op/op.EditDocument.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index a8ef4fbc4..9854e28ca 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -67,8 +67,7 @@ if(isset($_POST['categoryidform1'])) { } else { $categories = array(); } -$sequence = isset($_POST["sequence"]) ? $_POST["sequence"] : "keep"; -$sequence = str_replace(',', '.', $_POST["sequence"]); +$sequence = isset($_POST["sequence"]) ? str_replace(',', '.', $_POST["sequence"]) : "keep"; if (!is_numeric($sequence)) { $sequence="keep"; } @@ -77,6 +76,7 @@ if(isset($_POST["attributes"])) else $attributes = array(); +if(isset($_POST['presetexpdate'])) { switch($_POST["presetexpdate"]) { case "date": $tmp = explode('-', $_POST["expdate"]); @@ -103,6 +103,9 @@ default: $expires = null; break; } +} else { + $expires = null; +} $oldname = $document->getName(); $oldcomment = $document->getComment(); From 13fcdf43ca8136b20ecf90b48dcfa2bff7de88d7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 10:36:31 +0100 Subject: [PATCH 167/198] show list of expired documents newer shew any documents --- views/bootstrap/class.MyDocuments.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 9e5da1249..c05ec4bc2 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -821,7 +821,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if($docs = $dms->getDocumentsExpired(-3*365, $user)) { $this->contentHeading(getMLText("documents_expired")); $this->contentContainerStart(); - if (count($resArr)>0) { + if (count($docs)>0) { print "
    "; print "\n\n"; @@ -863,7 +863,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "
    "; } - else printMLText("no_docs_locked"); + else printMLText("no_docs_expired"); $this->contentContainerEnd(); } From fbb2ba3180148620441845ad1c9ad8924895bc26 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 10:38:58 +0100 Subject: [PATCH 168/198] fix list of expired documents --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 15e10fdb6..01f64b8b5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ longer work. - clean up code for managing extensions - fix renaming of folders via webdav +- fix list of expired documents on MyDocuments page -------------------------------------------------------------------------------- Changes in version 5.1.13 From 74300082fcfdf5f360c47bebd4387aa5b3588525 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 20 Jan 2020 11:53:38 +0100 Subject: [PATCH 169/198] fix bug #462, pass showtree to ViewDocument --- CHANGELOG | 1 + out/out.ViewDocument.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 01f64b8b5..6be2a45bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ - clean up code for managing extensions - fix renaming of folders via webdav - fix list of expired documents on MyDocuments page +- pass showtree to ViewDocument (Closes: #462) -------------------------------------------------------------------------------- Changes in version 5.1.13 diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index fd0a7d234..af38db22a 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -77,6 +77,7 @@ if($view) { $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('pdfConverters', isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : array()); $view->setParam('showFullPreview', $settings->_showFullPreview); + $view->setParam('showtree', showtree()); $view->setParam('convertToPdf', $settings->_convertToPdf); $view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : ""); $view->setParam('timeout', $settings->_cmdTimeout); From e830477bf0101d67b1f35890ab08b3927fcd1a80 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 21 Jan 2020 08:11:03 +0100 Subject: [PATCH 170/198] new method getPreviewFile(), start version 1.13.0 --- SeedDMS_Preview/Preview/Base.php | 31 ++++++++++++++++++------ SeedDMS_Preview/Preview/PdfPreviewer.php | 2 ++ SeedDMS_Preview/Preview/Previewer.php | 2 ++ SeedDMS_Preview/package.xml | 26 ++++++++++++++++---- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php index da153b305..f34359e7e 100644 --- a/SeedDMS_Preview/Preview/Base.php +++ b/SeedDMS_Preview/Preview/Base.php @@ -50,6 +50,12 @@ class SeedDMS_Preview_Base { */ protected $xsendfile; + /** + * @var string $lastpreviewfile will be set to the file name of the last preview + * @access protected + */ + protected $lastpreviewfile; + function __construct($previewDir, $timeout=5, $xsendfile=true) { /* {{{ */ if(!is_dir($previewDir)) { if (!SeedDMS_Core_File::makeDir($previewDir)) { @@ -154,14 +160,14 @@ class SeedDMS_Preview_Base { return array_key_exists($mimetype, $this->converters) && $this->converters[$mimetype]; } /* }}} */ -/** - * Send a file from disk to the browser - * - * This function uses either readfile() or the xѕendfile apache module if - * it is installed. - * - * @param string $filename - */ + /** + * Send a file from disk to the browser + * + * This function uses either readfile() or the xѕendfile apache module if + * it is installed. + * + * @param string $filename + */ protected function sendFile($filename) { /* {{{ */ if($this->xsendfile && function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) { header("X-Sendfile: ".$filename); @@ -173,5 +179,14 @@ class SeedDMS_Preview_Base { readfile($filename); } } /* }}} */ + + /** + * Return path of last created preview file + * + * @return string + */ + public function getPreviewFile() { /* {{{ */ + return $this->lastpreviewfile; + } /* }}} */ } diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php index daae6a4ed..d4cc0b477 100644 --- a/SeedDMS_Preview/Preview/PdfPreviewer.php +++ b/SeedDMS_Preview/Preview/PdfPreviewer.php @@ -96,6 +96,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base { return false; if(!$target) $target = $this->previewDir.$dir.md5($infile); + $this->lastpreviewfile = $target.'.png'; if($target != '' && (!file_exists($target.'.pdf') || filectime($target.'.pdf') < filectime($infile))) { $cmd = ''; $mimeparts = explode('/', $mimetype, 2); @@ -110,6 +111,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base { try { self::execWithTimeout($cmd, $this->timeout); } catch(Exception $e) { + $this->lastpreviewfile = ''; return false; } } diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php index 9e2fe2a34..ba69b75a4 100644 --- a/SeedDMS_Preview/Preview/Previewer.php +++ b/SeedDMS_Preview/Preview/Previewer.php @@ -105,6 +105,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { return false; if(!$target) $target = $this->previewDir.$dir.md5($infile).'-'.$width; + $this->lastpreviewfile = $target.'.png'; if($target != '' && (!file_exists($target.'.png') || filectime($target.'.png') < filectime($infile))) { $cmd = ''; $mimeparts = explode('/', $mimetype, 2); @@ -120,6 +121,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { try { self::execWithTimeout($cmd, $this->timeout); } catch(Exception $e) { + $this->lastpreviewfile = ''; return false; } } diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml index 753cf4768..aa4a3992f 100644 --- a/SeedDMS_Preview/package.xml +++ b/SeedDMS_Preview/package.xml @@ -11,11 +11,11 @@ uwe@steinmann.cx yes - 2019-02-11 + 2020-01-21 - 1.2.10 - 1.2.10 + 1.3.0 + 1.3.0 stable @@ -23,8 +23,7 @@ GPL License -new parameter for enabling/disabling xsendfile -fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent +add new methode getPreviewFile() @@ -404,5 +403,22 @@ make sure list of converters is always an array usage of mod_sendfile can be configured + + 2019-02-11 + + + 1.2.10 + 1.2.10 + + + stable + stable + + GPL License + +new parameter for enabling/disabling xsendfile +fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent + + From 069b0b2459625ea679bda8b0135345234e95c04f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 21 Jan 2020 18:26:18 +0100 Subject: [PATCH 171/198] fix text when loading changelog --- views/bootstrap/class.ExtensionMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 1a7f2909c..a7a79a062 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -354,7 +354,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {

    -

    +

    From 4e19b003e5fe740f411723e766cc5ab95f747e44 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Jan 2020 14:26:43 +0100 Subject: [PATCH 172/198] fix typo in variable name --- utils/xmlimport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/xmlimport.php b/utils/xmlimport.php index 08299948a..f429dfd80 100644 --- a/utils/xmlimport.php +++ b/utils/xmlimport.php @@ -796,7 +796,7 @@ function insert_folder($folder) { /* {{{ */ if(in_array('folders', $sections)) { if(!array_key_exists($folder['attributes']['owner'], $objmap['users'])) { $logger->warning("Owner of folder cannot be mapped using default user"); - $owner = $defaultuser; + $owner = $defaultUser; } else { $owner = $dms->getUser($objmap['users'][(int) $folder['attributes']['owner']]); } From 8615f75ac5d9f1568203677b8961a45c6020d239 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Jan 2020 14:27:56 +0100 Subject: [PATCH 173/198] use translation --- views/bootstrap/class.LogManagement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php index 75b23e3e4..b10156f6d 100644 --- a/views/bootstrap/class.LogManagement.php +++ b/views/bootstrap/class.LogManagement.php @@ -142,7 +142,7 @@ $(document).ready( function() {