From ba4a6558b418c79258b265278984ffa23aff2f54 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:44:19 +0100 Subject: [PATCH 01/70] add new document list ReceiveOwner, list docs with revision in AppRevOwner --- SeedDMS_Core/Core/inc.ClassDMS.php | 34 ++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 8d8fe20f4..65785a018 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1016,7 +1016,7 @@ class SeedDMS_Core_DMS { $queryStr = ''; } break; // }}} - case 'AppRevOwner': // Documents waiting for review/approval I'm owning {{{ + case 'AppRevOwner': // Documents waiting for review/approval/revision I'm owning {{{ $user = $param1; $orderby = $param3; if($param4 == 'desc') @@ -1024,7 +1024,7 @@ class SeedDMS_Core_DMS { else $orderdir = 'ASC'; $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ". - "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") "; + "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_IN_REVISION.") "; if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; else if ($orderby=='s') $queryStr .= "ORDER BY `status`"; @@ -1034,6 +1034,36 @@ class SeedDMS_Core_DMS { // "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ". // "ORDER BY `statusDate` DESC"; break; // }}} + case 'ReceiveOwner': // Documents waiting for reception I'm owning {{{ + $user = $param1; + $orderby = $param3; + if($param4 == 'desc') + $orderdir = 'DESC'; + else + $orderdir = 'ASC'; + + $qs = 'SELECT DISTINCT documentID FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`'; + $ra = $this->db->getResultArray($qs); + if (is_bool($ra) && !$ra) { + return false; + } + $docs = array(); + foreach($ra as $d) { + $docs[] = $d['documentID']; + } + + if ($docs) { + $queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") "; + $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."'"; + if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; + else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; + else if ($orderby=='s') $queryStr .= "ORDER BY `status`"; + else $queryStr .= "ORDER BY `name`"; + $queryStr .= " ".$orderdir; + } else { + $queryStr = ''; + } + break; // }}} case 'RejectOwner': // Documents that has been rejected and I'm owning {{{ $user = $param1; $orderby = $param3; From 520a783407f2412a1e23af1bf4c965def61cfd31 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:44:57 +0100 Subject: [PATCH 02/70] add list listReceiveOwner(), group lists in sections --- views/bootstrap/class.MyDocuments.php | 45 +++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index e4b1805a7..f08778eac 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -252,6 +252,36 @@ $(document).ready( function() { } } /* }}} */ + function listReceiveOwner() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; + $cachedir = $this->params['cachedir']; + $showtree = $this->params['showtree']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); + + /* Get list of documents owned by current user */ + $resArr = $dms->getDocumentList('ReceiveOwner', $user, false, $orderby, $orderdir); + if (is_bool($resArr) && !$resArr) { + $this->contentHeading(getMLText("warning")); + $this->contentContainer(getMLText("internal_error_exit")); + $this->htmlEndPage(); + exit; + } + + $this->contentHeading(getMLText("documents_user_reception")); + if($resArr) { + $this->printList($resArr, $previewer, 'listReveiveOwner'); + } + else printMLText("empty_notify_list"); + } /* }}} */ + function listMyDocs() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -559,12 +589,22 @@ $(document).ready( function() { echo '
'; echo '
'; + $this->contentHeading(getMLText("my_documents")); echo ''; + $this->contentHeading(getMLText("tasks")); + echo ''; + $this->contentHeading(getMLText("misc")); + echo '
    '; $resArr = $dms->getDocumentList('LockedByMe', $user); echo '
  • '.count($resArr).''.getMLText("documents_locked_by_you").'
    • '; $resArr = $dms->getDocumentList('CheckedOutByMe', $user); From c12eed91b3888383ca604ff68be6bf4cf2d7fc43 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:45:16 +0100 Subject: [PATCH 03/70] add items for 5.1.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 60c8fa27e..e3ec217df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,9 @@ -------------------------------------------------------------------------------- - merge changes up to 5.0.9 - filter documents by status 'draft' on search page +- list of documents to look at now contains documents in revision +- add list of documents waiting for reception on MyDocuments page +- group document lists on MyDocuments page into three sections -------------------------------------------------------------------------------- Changes in version 5.1.1 From 158fd2147bd9a6f08f3c796e7beb77b9b3f0d5eb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:46:07 +0100 Subject: [PATCH 04/70] add key 'documents_user_reception' --- languages/ar_EG/lang.inc | 1 + languages/bg_BG/lang.inc | 1 + languages/ca_ES/lang.inc | 1 + languages/cs_CZ/lang.inc | 1 + languages/de_DE/lang.inc | 3 ++- languages/el_GR/lang.inc | 1 + languages/en_GB/lang.inc | 3 ++- languages/es_ES/lang.inc | 1 + languages/fr_FR/lang.inc | 1 + languages/hr_HR/lang.inc | 1 + languages/hu_HU/lang.inc | 1 + languages/it_IT/lang.inc | 1 + languages/ko_KR/lang.inc | 1 + languages/nl_NL/lang.inc | 1 + languages/pl_PL/lang.inc | 1 + languages/pt_BR/lang.inc | 1 + languages/ro_RO/lang.inc | 1 + languages/ru_RU/lang.inc | 1 + languages/sk_SK/lang.inc | 1 + languages/sv_SE/lang.inc | 1 + languages/tr_TR/lang.inc | 1 + languages/uk_UA/lang.inc | 1 + languages/zh_CN/lang.inc | 1 + languages/zh_TW/lang.inc | 1 + 24 files changed, 26 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index ee28786b0..e5164bfde 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -307,6 +307,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'مستندات في انتظار المراجعة', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك', 'document_already_checkedout' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 111a8643b..ec68a5a37 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -292,6 +292,7 @@ $text = array( 'documents_to_receipt' => '', 'documents_to_review' => 'Документы, чакащи Вашата рецензия', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание', 'document_already_checkedout' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index dfcad60f7..8d79db7ee 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -297,6 +297,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Documents en espera de revisió d\'usuaris', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció', 'document_already_checkedout' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 337f09bf7..6d865706b 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -314,6 +314,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost', 'document_already_checkedout' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index a3ef7e87b..665b55963 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 (2355), dgrutsch (22) +// Translators: Admin (2356), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -319,6 +319,7 @@ URL: [url]', 'documents_to_receipt' => 'Empfangsbestätigung erforderlich', 'documents_to_review' => 'Prüfung erforderlich', 'documents_to_revise' => 'Erneute Prüfung erforderlich', +'documents_user_reception' => 'Dokumente mit Empfangsbestätigung', 'documents_user_rejected' => 'Abgelehnte Dokumente', 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen', 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 7327e094c..68bfbf68f 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -292,6 +292,7 @@ $text = array( 'documents_to_receipt' => '', 'documents_to_review' => '', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => '', 'document_already_checkedout' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 9625e0ed0..e1e392501 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 (1484), dgrutsch (9), netixw (14) +// Translators: Admin (1485), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -319,6 +319,7 @@ URL: [url]', 'documents_to_receipt' => 'Documents awaiting to confirm the receipt', 'documents_to_review' => 'Documents awaiting your review', 'documents_to_revise' => 'Documents awaiting your revision', +'documents_user_reception' => 'Documents awaiting reception', 'documents_user_rejected' => 'Rejected documents', 'documents_user_requiring_attention' => 'Documents owned by you that require attention', 'document_already_checkedout' => 'This document is already checked out', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index c85a359e0..8975408fb 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -314,6 +314,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Documentos en espera de revisión de usuarios', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención', 'document_already_checkedout' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 67308555f..ddf7ddab8 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -319,6 +319,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Documents en attente de correction', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => 'Documents rejetés', 'documents_user_requiring_attention' => 'Documents à surveiller', 'document_already_checkedout' => 'Ce document est déjà débloqué', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 895bc28d1..f9755ed54 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -319,6 +319,7 @@ Internet poveznica: [url]', 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka', 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled', 'documents_to_revise' => 'Dokumenti za reviziju', +'documents_user_reception' => '', 'documents_user_rejected' => 'Odbijeni dokumenti', 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju', 'document_already_checkedout' => 'Ovaj dokument je već odjavljen', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 2e19ce26a..0e43ce08f 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -314,6 +314,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani', 'document_already_checkedout' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 0ce657ffa..42de76764 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -320,6 +320,7 @@ URL: [url]', '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_user_reception' => '', 'documents_user_rejected' => 'Documenti rifiutati', 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione', 'document_already_checkedout' => 'Questo documento è già approvato', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index e69ae1a95..92e72499b 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -321,6 +321,7 @@ URL: [url]', 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들', 'documents_to_review' => '당신의 검토를 기다리는 문서', 'documents_to_revise' => '문서 정정', +'documents_user_reception' => '', 'documents_user_rejected' => '거부된 문서', 'documents_user_requiring_attention' => '주의가 필요한 당신 소유의 문서', 'document_already_checkedout' => '이문서는 이미 체크아웃 되었습니다', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index e30506918..aee9a2c7c 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -312,6 +312,7 @@ URL: [url]', 'documents_to_receipt' => 'documenten te ontvangen', 'documents_to_review' => 'Documenten die wachten op uw controle', 'documents_to_revise' => 'Te reviseren documenten', +'documents_user_reception' => '', 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker', 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven', 'document_already_checkedout' => 'Al in behandeling genomen documenten', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index ec3341d3f..1cf095055 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -307,6 +307,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi', 'document_already_checkedout' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index d2f14751d..8fd2cb655 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -314,6 +314,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Documents Awaiting User\'s Review', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention', 'document_already_checkedout' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 470bac21e..2580ce65d 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -319,6 +319,7 @@ URL: [url]', 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii', 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră', 'documents_to_revise' => 'Documente de revizut', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție', 'document_already_checkedout' => 'Acest document este deja verificat', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index cdc4ccad5..9f9225969 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -319,6 +319,7 @@ URL: [url]', 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения', 'documents_to_review' => 'Документы, ожидающие вашей рецензии', 'documents_to_revise' => 'Документы на ревизии', +'documents_user_reception' => '', 'documents_user_rejected' => 'Отклоненные документы', 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания', 'document_already_checkedout' => 'Этот документ уже проверен', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index b5fe075dd..d2298c820 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -296,6 +296,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť', 'document_already_checkedout' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 088db1996..4d4decd1a 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -307,6 +307,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Dokument som du behöver granska', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna', 'document_already_checkedout' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index c02bbe766..89747ef57 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -313,6 +313,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar', 'document_already_checkedout' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 17f0ccdf3..ae9951c3f 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -319,6 +319,7 @@ URL: [url]', 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання', 'documents_to_review' => 'Документи, які чекають вашої рецензії', 'documents_to_revise' => 'Документи для повторного розгляду', +'documents_user_reception' => '', 'documents_user_rejected' => 'Документи, які відхилили', 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги', 'document_already_checkedout' => 'Цей документ вже на опрацюванні', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index f08fe2d8c..2aef70d0c 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -298,6 +298,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => '待您校对的文档', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => '需您关注的文档', 'document_already_checkedout' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 65580276a..16c7dc94a 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -296,6 +296,7 @@ URL: [url]', 'documents_to_receipt' => '', 'documents_to_review' => '待您校對的文檔', 'documents_to_revise' => '', +'documents_user_reception' => '', 'documents_user_rejected' => '', 'documents_user_requiring_attention' => '需您關注的文檔', 'document_already_checkedout' => '', From 14ab2120f182277fc84e483ef4d06101496ce7da Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:47:14 +0100 Subject: [PATCH 05/70] take out definition of apache_request_headers(), do use method if not available --- webdav/webdav.php | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/webdav/webdav.php b/webdav/webdav.php index 71a5cc184..dd58d7868 100644 --- a/webdav/webdav.php +++ b/webdav/webdav.php @@ -6,31 +6,6 @@ if(!empty($settings->_coreDir)) else require_once('SeedDMS/Core.php'); -/* Set apache_request_headers() in case it doesn't exists, like - * when using fastcgi (patch by christopher täufert taken from http://php.net/) - */ -if( !function_exists('apache_request_headers') ) { - function apache_request_headers() { - $arh = array(); - $rx_http = '/\AHTTP_/'; - foreach($_SERVER as $key => $val) { - if( preg_match($rx_http, $key) ) { - $arh_key = preg_replace($rx_http, '', $key); - $rx_matches = array(); - // do some nasty string manipulations to restore the original letter case - // this should work in most cases - $rx_matches = explode('_', $arh_key); - if( count($rx_matches) > 0 and strlen($arh_key) > 2 ) { - foreach($rx_matches as $ak_key => $ak_val) $rx_matches[$ak_key] = ucfirst($ak_val); - $arh_key = implode('-', $rx_matches); - } - $arh[$arh_key] = $val; - } - } - return( $arh ); - } -} - /** * SeedDMS access using WebDAV * @@ -79,10 +54,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server // special treatment for litmus compliance test // reply on its identifier header // not needed for the test itself but eases debugging - foreach (apache_request_headers() as $key => $value) { - if (stristr($key, "litmus")) { - error_log("Litmus test $value"); - header("X-Litmus-reply: ".$value); + if( function_exists('apache_request_headers') ) { + foreach (apache_request_headers() as $key => $value) { + if (stristr($key, "litmus")) { + error_log("Litmus test $value"); + header("X-Litmus-reply: ".$value); + } } } From 4bd65d7b6d65ae2a028a9a14d6784444d2bb1de7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:48:54 +0100 Subject: [PATCH 06/70] minor fix in entrie for 4.3.32 --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b7e11a0bf..2626fcc08 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,8 +3,8 @@ -------------------------------------------------------------------------------- - fix saving new mimetype for fulltext search, available languages - put access rights of folder into popup box if more than 3 exists -- define apache_request_headers() if it does not exists, makes webdav - work in fast cgi mode or on webservers other than apache +- do not execute code which uses apache_request_headers() if it does not exists, + makes webdav work in fast cgi mode or on webservers other than apache - clean up of distribution created by makefile - order groups in select boxes by name - javascript added by addToFooterJS() will be written to a temp. file From 3fee35fd3a3da499369677136611220a249b0b3a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 13:54:26 +0100 Subject: [PATCH 07/70] fix typo --- 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 f08778eac..0d7ac2868 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -277,7 +277,7 @@ $(document).ready( function() { $this->contentHeading(getMLText("documents_user_reception")); if($resArr) { - $this->printList($resArr, $previewer, 'listReveiveOwner'); + $this->printList($resArr, $previewer, 'listReceiveOwner'); } else printMLText("empty_notify_list"); } /* }}} */ From 56e7f567c788ad7de9988d0f4f65df1521aa3231 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 14:20:33 +0100 Subject: [PATCH 08/70] enable turn off of updating document reception --- inc/inc.ClassAccessOperation.php | 15 +++++++++++++++ inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + views/bootstrap/class.Settings.php | 4 ++++ views/bootstrap/class.ViewDocument.php | 10 ++++++---- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index f70e6656d..9270b71b6 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -355,6 +355,21 @@ class SeedDMS_AccessOperation { return false; } /* }}} */ + /** + * Check if a review maybe edited + * + * A review may only be updated by the user who originaly addedd the + * review and if it is allowed in the settings + */ + function mayUpdateReceipt($document, $updateUser) { /* {{{ */ + if(get_class($document) == 'SeedDMS_Core_Document') { + if($this->settings->_enableUpdateReceipt && ($updateUser == $this->user) && !$document->hasExpired()) { + return true; + } + } + return false; + } /* }}} */ + /** * Check if document content may be revised * diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 7feb7f8a0..be3efd286 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -143,6 +143,8 @@ class Settings { /* {{{ */ var $_enableSelfRevApp = false; // enable/disable update of a review/approval by the reviewer/approver var $_enableUpdateRevApp = false; + // enable/disable update of a receipt by the recipient + var $_enableUpdateReceipt = false; // enable/disable listing administrator as recipient var $_enableAdminReceipt = false; // enable/disable listing owner as recipient @@ -596,6 +598,7 @@ class Settings { /* {{{ */ $this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]); $this->_enableAdminReceipt = Settings::boolval($tab["enableAdminReceipt"]); $this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]); + $this->_enableUpdateReceipt = Settings::boolval($tab["enableUpdateReceipt"]); $this->_presetExpirationDate = strval($tab["presetExpirationDate"]); $this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]); $this->_versioningFileName = strval($tab["versioningFileName"]); @@ -898,6 +901,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp); $this->setXMLAttributValue($node, "enableAdminReceipt", $this->_enableAdminReceipt); $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt); + $this->setXMLAttributValue($node, "enableUpdateReceipt", $this->_enableUpdateReceipt); $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate); $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus); $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName); diff --git a/op/op.Settings.php b/op/op.Settings.php index 7238d97db..64b9c0cf6 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -176,6 +176,7 @@ if ($action == "saveSettings") $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp"); $settings->_enableAdminReceipt = getBoolValue("enableAdminReceipt"); $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt"); + $settings->_enableUpdateReceipt = getBoolValue("enableUpdateReceipt"); $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion"); $settings->_enableVersionModification = getBoolValue("enableVersionModification"); $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index a08b8a9b7..5bb031e3f 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -666,6 +666,10 @@ if(!is_writeable($settings->_configFilePath)) { : _enableOwnerReceipt) echo "checked" ?> /> + "> + : + _enableUpdateReceipt) echo "checked" ?> /> + "> : _enableVersionDeletion) echo "checked" ?> /> diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 8112d8e22..abd1a5bc7 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -1172,10 +1172,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
      "; if($accessop->mayReceipt($document)) { - if ($is_recipient && $r["status"]==0) { - print "
    • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
      • "; - }else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){ - print "
    • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
      • "; + if ($is_recipient) { + if($r["status"]==0) { + print "
    • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
      • "; + } elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))) { + print "
    • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
      • "; + } } } From 24624f6136f349e2095a6adacfff6a63c9e48262 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 15:15:40 +0100 Subject: [PATCH 09/70] split printList() in printListHeader(), printListFooter() and printList() --- views/bootstrap/class.MyDocuments.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 0d7ac2868..53a312d06 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -54,9 +54,7 @@ $(document).ready( function() { params['dms']; - $user = $this->params['user']; + protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */ $orderby = $this->params['orderby']; $orderdir = $this->params['orderdir']; @@ -73,7 +71,17 @@ $(document).ready( function() { print "".getMLText("status")."\n"; print "".getMLText("action")."\n"; print "\n\n\n"; + } /* }}} */ + protected function printListFooter() { /* {{{ */ + echo "\n"; + } /* }}} */ + + protected function printList($resArr, $previewer, $order=false) { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + + $this->printListHeader($resArr, $previewer, $order); $noaccess = 0; foreach ($resArr as $res) { $document = $dms->getDocument($res["id"]); @@ -90,7 +98,7 @@ $(document).ready( function() { } } } - echo "\n"; + $this->printListFooter(); if($noaccess) { $this->warningMsg(getMLText('list_contains_no_access_docs', array('count'=>$noaccess))); From 600cd490a4168cef91ec1f74ff3e0967ffae7e1e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 17:31:44 +0100 Subject: [PATCH 10/70] first check if document is accessible before calling hook documentListRow() --- views/bootstrap/class.MyDocuments.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 53a312d06..24b2fd46d 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -87,15 +87,14 @@ $(document).ready( function() { $document = $dms->getDocument($res["id"]); $document->verifyLastestContentExpriry(); - $txt = $this->callHook('documentListItem', $document, $previewer); - if(is_string($txt)) - echo $txt; - else { - if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { + if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else echo $this->documentListRow($document, $previewer, false, $res['version']); - } else { - $noaccess++; - } + } else { + $noaccess++; } } $this->printListFooter(); From ed0e13ea0b12e32be5b3b036804485e7efce5b12 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 17:41:52 +0100 Subject: [PATCH 11/70] hook can receive up to 4 parameters --- inc/inc.ClassViewCommon.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php index eac25562a..3ab450356 100644 --- a/inc/inc.ClassViewCommon.php +++ b/inc/inc.ClassViewCommon.php @@ -105,12 +105,26 @@ class SeedDMS_View_Common { $ret = $tmpret; break; case 3: - default: $tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2)); if(is_string($tmpret)) $ret .= $tmpret; else $ret = $tmpret; + break; + case 4: + $tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3)); + if(is_string($tmpret)) + $ret .= $tmpret; + else + $ret = $tmpret; + break; + default: + case 5: + $tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3), func_get_arg(4)); + if(is_string($tmpret)) + $ret .= $tmpret; + else + $ret = $tmpret; } } } From 14d2a7263b81e8c72642ba32cb7fe9b9a48fdccd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 18:31:06 +0100 Subject: [PATCH 12/70] pass all parameters to hook documentListItem, remove old code --- views/bootstrap/class.MyDocuments.php | 50 +-------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 24b2fd46d..00ac681aa 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -88,7 +88,7 @@ $(document).ready( function() { $document->verifyLastestContentExpriry(); if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { - $txt = $this->callHook('documentListItem', $document, $previewer); + $txt = $this->callHook('documentListItem', $document, $previewer, false, $res['version']); if(is_string($txt)) echo $txt; else @@ -128,30 +128,6 @@ $(document).ready( function() { $this->contentHeading(getMLText("documents_to_review")); if($resArr) { $this->printList($resArr, $previewer, 'listReviews'); - /* - print ""; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - - // List the documents for which a review has been requested. - foreach ($resArr as $res) { - $document = $dms->getDocument($res["id"]); - $document->verifyLastestContentExpriry(); - - $txt = $this->callHook('documentListItem', $document, $previewer); - if(is_string($txt)) - echo $txt; - else { - echo $this->documentListRow($document, $previewer, false, $res['version']); - } - } - - echo "\n
      ".getMLText("name")."".getMLText("status")."".getMLText("action")."
      \n"; - */ } else { printMLText("no_docs_to_review"); } @@ -181,30 +157,6 @@ $(document).ready( function() { $this->contentHeading(getMLText("documents_to_approve")); if($resArr) { $this->printList($resArr, $previewer, 'listApprovals'); - /* - print ""; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - - // List the documents for which an approval has been requested. - foreach ($resArr as $res) { - $document = $dms->getDocument($res["id"]); - $document->verifyLastestContentExpriry(); - - $txt = $this->callHook('documentListItem', $document, $previewer); - if(is_string($txt)) - echo $txt; - else { - echo $this->documentListRow($document, $previewer, false, $res['version']); - } - } - - echo "\n
      ".getMLText("name")."".getMLText("status")."".getMLText("action")."
      \n"; - */ } else { printMLText("no_docs_to_approve"); } From 5e93bea2fdc651cf694f0b725520a079a12aa6c4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 18:31:44 +0100 Subject: [PATCH 13/70] show status of reception if document is owned by current user --- views/bootstrap/class.Bootstrap.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 52363192d..849e64340 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2154,6 +2154,23 @@ $(document).ready( function() { } else { $content .= getOverallStatusText($status["status"]); } + if($owner->getID() == $user->getID() && $receiptStatus = $latestContent->getReceiptStatus()) { + $rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); + $allcomments = array(); + foreach ($receiptStatus as $r) { + $rstat[''.$r['status']]++; + if($r['comment']) + $allcomments[] = $r['comment']; + } + $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; + $content .= "; +
      +
      ".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '')."
      +
      ".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."
      +
      "; + if($allcomments) + $content .= implode('
      ', $allcomments); + } $content .= ""; // $content .= "".$version.""; $content .= ""; From 1c281b98e8b9987d11ef200b7a1dddd1fa66029f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 18:32:17 +0100 Subject: [PATCH 14/70] replace table layout by form controll --- views/bootstrap/class.ReceiptDocument.php | 76 +++++++++++------------ 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php index e7d285858..7b15b77ed 100644 --- a/views/bootstrap/class.ReceiptDocument.php +++ b/views/bootstrap/class.ReceiptDocument.php @@ -127,16 +127,17 @@ $(document).ready(function() { print "
      "; } ?> -
      + - - - - - - - - - - - - - -
      :
      +
      + +
      + +
      +
      +
      + +
      -
      - - - +
+
+
+ +
+ + + -
+ - - - - - - - - - - - - - -
:
: +
+ +
+ +
+
+
+ +
-
- - '/> - - +
+
+
+ +
+ + '/> + + Date: Tue, 17 Jan 2017 18:35:30 +0100 Subject: [PATCH 15/70] printPopupBox() can return html instead of printing it --- views/bootstrap/class.Bootstrap.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 9b5e4e323..4fdb6c90c 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2442,13 +2442,16 @@ mayscript> $this->printTimelineHtml($height); } /* }}} */ - protected function printPopupBox($title, $content) { /* {{{ */ -?> - + protected function printPopupBox($title, $content, $ret=false) { /* {{{ */ + $html = ' + '.$title.' -'; + if($ret) + return $html; + else + echo $html; } /* }}} */ protected function printAccordion($title, $content) { /* {{{ */ From b769ae3805e25eab73403d8615dee6db482e18c6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 17 Jan 2017 20:40:42 +0100 Subject: [PATCH 16/70] use popupbox to show comments of document reception --- 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 c9594912f..e353b889b 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2169,7 +2169,7 @@ $(document).ready( function() {
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."
"; if($allcomments) - $content .= implode('
', $allcomments); + $content .= $this->printPopupBox('kkkk', implode('
', $allcomments), true); } $content .= ""; // $content .= "".$version.""; From ffcd0e8a4a8b637440d84bd69e513bdfa739e1c4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:09:32 +0100 Subject: [PATCH 17/70] add style for span.closepopupbox --- styles/bootstrap/application.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index 413ce0ce7..ba0203cfd 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -185,7 +185,13 @@ div.popupbox { padding: 15px; display: none; position: absolute; - width: 200px; + width: 250px; +} + +div.popupbox span.closepopupbox { + position: absolute; + right: 5px; + top: 0px; } @media (max-width: 480px) { From 3dcf867634fd9ae97ed76009175a91c2786c0d46 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:09:50 +0100 Subject: [PATCH 18/70] add code to open and close popup box --- styles/bootstrap/application.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index 037f2731b..c67376d3f 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -989,9 +989,10 @@ $(document).ready(function() { /* {{{ */ }); }); - $('span.openpopupbox').on('click', function(e) { - $('div.popupbox').toggle(); - console.log('Hallo'); + $("body").on("click", "span.openpopupbox", function(e) { + $(""+$(e.target).data("href")).toggle(); + }); + $("body").on("click", "span.closepopupbox", function(e) { + $(this).parent().hide(); }); - }); /* }}} */ From b8d4d12f4edb8d3f6dfe88daa887a9a8e8cc96c9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:10:21 +0100 Subject: [PATCH 19/70] allow to place several popup boxes on a page --- views/bootstrap/class.Bootstrap.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 4fdb6c90c..0beca50f7 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2443,10 +2443,20 @@ mayscript> } /* }}} */ protected function printPopupBox($title, $content, $ret=false) { /* {{{ */ + $id = md5(uniqid()); + /* + $this->addFooterJS(' +$("body").on("click", "span.openpopupbox", function(e) { + $(""+$(e.target).data("href")).toggle(); +// $("div.popupbox").toggle(); +}); +'); + */ $html = ' - '.$title.' - "; if($allcomments) - $content .= $this->printPopupBox('kkkk', implode('
', $allcomments), true); + $content .= $this->printPopupBox(getMLText('comments'), implode('
', $allcomments), true); } $content .= ""; // $content .= "".$version.""; From 75d84138326b316ec4bb80481c8bc3a73a869e86 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:31:34 +0100 Subject: [PATCH 21/70] open popupbox even if title is an tag --- styles/bootstrap/application.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index c67376d3f..935d9bf30 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -992,6 +992,9 @@ $(document).ready(function() { /* {{{ */ $("body").on("click", "span.openpopupbox", function(e) { $(""+$(e.target).data("href")).toggle(); }); + $("body").on("click", "span.openpopupbox i", function(e) { + $(e.target).parent().click(); + }); $("body").on("click", "span.closepopupbox", function(e) { $(this).parent().hide(); }); From 98cf6c65dfcf582b3382c963c29af2428a817a90 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:32:02 +0100 Subject: [PATCH 22/70] set more styles of popupbox --- styles/bootstrap/application.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index ba0203cfd..3cde817fa 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -179,8 +179,12 @@ span.openpopupbox { } div.popupbox { + margin-top: 5px; background-color: #fff; border-radius: 4px; + color: black; + text-align: left; + text-shadow: none; border: 1px solid #ccc; padding: 15px; display: none; From e6e14fb37a6a8bce6d6ba1c25c0cd7ad50685cd5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:45:27 +0100 Subject: [PATCH 23/70] show comments of reception seperated by decline/aknowledge --- views/bootstrap/class.Bootstrap.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index cbba93e53..d7cf903cb 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2156,20 +2156,18 @@ $(document).ready( function() { } if($owner->getID() == $user->getID() && $receiptStatus = $latestContent->getReceiptStatus()) { $rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); - $allcomments = array(); + $allcomments = array('-1'=>array(), '1'=>array()); foreach ($receiptStatus as $r) { $rstat[''.$r['status']]++; if($r['comment']) - $allcomments[] = $r['comment']; + $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']); } $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; $content .= ";
-
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '')."
-
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."
+
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('', implode('
', $allcomments['1']), true) : "")."
+
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('', implode('
', $allcomments['-1']), true) : "")."
"; - if($allcomments) - $content .= $this->printPopupBox(getMLText('comments'), implode('
', $allcomments), true); } $content .= ""; // $content .= "".$version.""; From 17b72a9d0c000a1d363fd8ab6d15dd2fbe22cc1d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 08:46:43 +0100 Subject: [PATCH 24/70] add entry to 5.1.2 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 87a215088..4988bcb53 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ - list of documents to look at now contains documents in revision - add list of documents waiting for reception on MyDocuments page - group document lists on MyDocuments page into three sections +- show progressbar and comments for reception of document in documentlist -------------------------------------------------------------------------------- Changes in version 5.1.1 From 16342981ebd2f6bae17b2e916ba7bae0f88454b7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 11:00:38 +0100 Subject: [PATCH 25/70] output progressbar only if receipts are available --- views/bootstrap/class.Bootstrap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index d7cf903cb..3d6c6c5e3 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2163,11 +2163,13 @@ $(document).ready( function() { $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']); } $totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1']; - $content .= "; + if($totalreceipts) { + $content .= ";
".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('', implode('
', $allcomments['1']), true) : "")."
".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('', implode('
', $allcomments['-1']), true) : "")."
"; + } } $content .= ""; // $content .= "".$version.""; From 825c4378a0613201d5cd6f1868d4d7356601bb51 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 11:08:17 +0100 Subject: [PATCH 26/70] add latest version 5.1.2 which somehow got lost --- SeedDMS_Core/package.xml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 4450cf615..287a7fa15 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2016-11-08 + 2017-01-18 - 5.0.9 - 5.0.9 + 5.1.2 + 5.1.2 stable @@ -24,7 +24,7 @@ GPL License -- all changes from 5.0.8 merged +- all changes from 5.0.9 merged @@ -1278,6 +1278,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated - all changes from 4.3.31 merged + + 2016-11-08 + + + 5.0.9 + 5.0.9 + + + stable + stable + + GPL License + +- all changes from 4.3.32 merged + + 2016-03-09 From 6513642efb983c20e74e94da60ed9e028be39ede Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 11:39:29 +0100 Subject: [PATCH 27/70] change order of lists in section 'tasks' has now same order like tasks in the header menu --- 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 00ac681aa..78f844ae2 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -574,10 +574,10 @@ $(document).ready( function() { $resArr = $dms->getDocumentList('WorkflowByMe', $user); echo '
  • '.count($resArr).''.getMLText("documents_to_process").'
    • '; } - $resArr = $dms->getDocumentList('ReviseByMe', $user); - echo '
  • '.count($resArr).''.getMLText("documents_to_revise").'
    • '; $resArr = $dms->getDocumentList('ReceiptByMe', $user); echo '
  • '.count($resArr).''.getMLText("documents_to_receipt").'
    • '; + $resArr = $dms->getDocumentList('ReviseByMe', $user); + echo '
  • '.count($resArr).''.getMLText("documents_to_revise").'
    • '; echo ''; $this->contentHeading(getMLText("misc")); echo '
      '; From b8a7917c1213951c7d116a56d4e35e89e23decdc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 14:23:16 +0100 Subject: [PATCH 28/70] add '-' to allowed char in mimetype --- op/op.Settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.Settings.php b/op/op.Settings.php index b8602a8f8..0735b65f5 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -182,7 +182,7 @@ if ($action == "saveSettings") // SETTINGS - ADVANCED - INDEX CMD $settings->_converters['fulltext'] = $_POST["converters"]; - $newmimetype = preg_replace('#[^A-Za-z0-9_/+.]+#', '', $_POST["converters_newmimetype"]); + $newmimetype = preg_replace('#[^A-Za-z0-9_/+.-]+#', '', $_POST["converters_newmimetype"]); if($newmimetype && trim($_POST["converters_newcmd"])) { $settings->_converters['fulltext'][$newmimetype] = trim($_POST["converters_newcmd"]); } From 8959a9e1673a78282b17c19eaa9d48d667ab80f6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 14:45:40 +0100 Subject: [PATCH 29/70] add searching for document id --- SeedDMS_Core/Core/inc.ClassDMS.php | 8 +++++++- out/out.Search.php | 3 ++- views/bootstrap/class.Search.php | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 022bd816c..a56042fe6 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -633,7 +633,7 @@ class SeedDMS_Core_DMS { // if none is checkd search all if (count($searchin)==0) - $searchin=array(1, 2, 3, 4); + $searchin=array(1, 2, 3, 4, 5); /*--------- Do it all over again for folders -------------*/ $totalFolders = 0; @@ -649,6 +649,9 @@ class SeedDMS_Core_DMS { if (in_array(4, $searchin)) { $searchFields[] = "`tblFolderAttributes`.`value`"; } + if (in_array(5, $searchin)) { + $searchFields[] = "`tblFolders`.`id`"; + } if (count($searchFields)>0) { foreach ($tkeys as $key) { @@ -802,6 +805,9 @@ class SeedDMS_Core_DMS { $searchFields[] = "`tblDocumentAttributes`.`value`"; $searchFields[] = "`tblDocumentContentAttributes`.`value`"; } + if (in_array(5, $searchin)) { + $searchFields[] = "`tblDocuments`.`id`"; + } if (count($searchFields)>0) { diff --git a/out/out.Search.php b/out/out.Search.php index 24559d48d..913c94fbe 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -189,6 +189,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe case 2: // name case 3: // comment case 4: // attributes + case 5: // id $searchin[$si] = $si; break; } @@ -197,7 +198,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe } // if none is checkd search all - if (count($searchin)==0) $searchin=array(1, 2, 3, 4); + if (count($searchin)==0) $searchin=array(1, 2, 3, 4, 5); // Check to see if the search has been restricted to a particular sub-tree in // the folder hierarchy. diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 870d9775b..fd4f9c86a 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -143,6 +143,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { + From 62c997db196fb360810e8ffe607e8a8d17371edc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 14:46:24 +0100 Subject: [PATCH 30/70] add note for 4.3.32 --- SeedDMS_Core/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index edd27d21f..a4eafc53c 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -26,6 +26,7 @@ - order groups by name returned by getReadAccessList() - add optional parameter to SeedDMS_Core_DMS::filterDocumentLinks() +- SeedDMS_Core_DMS::search() can search for document/folder id From 25d0edb0d76c83ef2a65ccca943dab66c25d0580 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 14:46:38 +0100 Subject: [PATCH 31/70] more entries for closed bugs in 4.3.32 --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 2626fcc08..085ae33ab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 4.3.32 -------------------------------------------------------------------------------- -- fix saving new mimetype for fulltext search, available languages +- fix saving new mimetype for fulltext search, available languages (Closes #308) - put access rights of folder into popup box if more than 3 exists - do not execute code which uses apache_request_headers() if it does not exists, makes webdav work in fast cgi mode or on webservers other than apache @@ -17,6 +17,7 @@ - replace lots of tables in forms by bootstraps control-group - add remove button to folder selector - editing of an exiting review/approval can be turned off +- add searching for id of folder/document (Closes #302) -------------------------------------------------------------------------------- Changes in version 4.3.31 From 32d092f929dbcee5aeda993d5e0dc28760af13b3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 14:50:05 +0100 Subject: [PATCH 32/70] add note about closing ticket #300 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 085ae33ab..4fa8937ed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ - fix saving new mimetype for fulltext search, available languages (Closes #308) - put access rights of folder into popup box if more than 3 exists - do not execute code which uses apache_request_headers() if it does not exists, - makes webdav work in fast cgi mode or on webservers other than apache + makes webdav work in fast cgi mode or on webservers other than apache (Closes #300) - clean up of distribution created by makefile - order groups in select boxes by name - javascript added by addToFooterJS() will be written to a temp. file From 39bebbdcf67506f32b48a8bba411373c7e9adf47 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 15:08:25 +0100 Subject: [PATCH 33/70] switch to new access restrictions --- out/out.EditUserData.php | 12 ++++++++++-- out/out.GroupView.php | 7 +++++-- out/out.ManageNotify.php | 11 +++++++++-- out/out.UsrView.php | 7 +++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/out/out.EditUserData.php b/out/out.EditUserData.php index ed49af30f..26c183c14 100644 --- a/out/out.EditUserData.php +++ b/out/out.EditUserData.php @@ -27,6 +27,10 @@ include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("edit_user_details"),getMLText("access_denied")); } @@ -36,9 +40,13 @@ if (!$user->isAdmin() && ($settings->_disableSelfEdit)) { } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enableuserimage'=>$settings->_enableUserImage, 'enablelanguageselector'=>$settings->_enableLanguageSelector, 'enablethemeselector'=>$settings->_enableThemeSelector, 'passwordstrength'=>$settings->_passwordStrength, 'httproot'=>$settings->_httpRoot)); if($view) { + $view->setParam('enableuserimage', $settings->_enableUserImage); + $view->setParam('enablelanguageselector', $settings->_enableLanguageSelector); + $view->setParam('enablethemeselector', $settings->_enableThemeSelector); + $view->setParam('passwordstrength', $settings->_passwordStrength); + $view->setParam('httproot', $settings->_httpRoot); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.GroupView.php b/out/out.GroupView.php index 940b2dd98..645532b6b 100644 --- a/out/out.GroupView.php +++ b/out/out.GroupView.php @@ -25,6 +25,10 @@ include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_account"),getMLText("access_denied")); } @@ -43,11 +47,10 @@ if (is_bool($allGroups)) { UI::exitError(getMLText("admin_tools"),getMLText("internal_error")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('allusers', $allUsers); $view->setParam('allgroups', $allGroups); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php index bc3b0acff..725a2e9ba 100644 --- a/out/out.ManageNotify.php +++ b/out/out.ManageNotify.php @@ -25,13 +25,20 @@ include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_account"),getMLText("access_denied")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview'], 'timeout'=>$settings->_cmdTimeout)); if($view) { + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); + $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.UsrView.php b/out/out.UsrView.php index 497716b95..10284b079 100644 --- a/out/out.UsrView.php +++ b/out/out.UsrView.php @@ -25,6 +25,10 @@ include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_account"),getMLText("access_denied")); } @@ -38,12 +42,11 @@ if (is_bool($users)) { UI::exitError(getMLText("my_account"),getMLText("internal_error")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('allusers', $users); $view->setParam('enableuserimage', $settings->_enableUserImage); $view->setParam('httproot', $settings->_httpRoot); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } From 034977db87571c65d87cfd53b7b45c5ea259f4e7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 19:57:17 +0100 Subject: [PATCH 34/70] add keys settings_defaultAccessDocs and settings_defaultAccessDocs_desc --- 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 | 6 +++++- languages/el_GR/lang.inc | 4 ++++ languages/en_GB/lang.inc | 6 +++++- 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/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 ++++ 24 files changed, 98 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index e5164bfde..9bc45ad35 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1041,6 +1041,8 @@ URL: [url]', 'settings_dbUser' => '', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -1111,6 +1113,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index ec68a5a37..b5c5542ea 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -906,6 +906,8 @@ $text = array( 'settings_dbUser' => 'Логин', 'settings_dbUser_desc' => 'Логин, въведен в процеса на инсталацията. Не променяй без нужда, само например, ако БД е преместена.', 'settings_dbVersion' => 'Схема БД остаряла', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -976,6 +978,8 @@ $text = array( 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Включи аватари', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 8d79db7ee..4ecd963e1 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -911,6 +911,8 @@ URL: [url]', 'settings_dbUser' => '', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -981,6 +983,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 6d865706b..0403bb648 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1050,6 +1050,8 @@ URL: [url]', 'settings_dbUser' => 'Username', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -1120,6 +1122,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu', 'settings_enableThemeSelector' => 'Volba tématu', 'settings_enableThemeSelector_desc' => 'Volba témat na přihlašovací stránce.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 665b55963..f3b39e3ee 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 (2356), dgrutsch (22) +// Translators: Admin (2360), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1093,6 +1093,8 @@ URL: [url]', 'settings_dbUser' => 'Benutzer', 'settings_dbUser_desc' => 'Der Benutzername, um auf die Datenbank zugreifen zu können.', 'settings_dbVersion' => 'Datenbankschema zu alt', +'settings_defaultAccessDocs' => 'Standardberechtigung für neue Dokumente', +'settings_defaultAccessDocs_desc' => 'Beim Erstellen eines neuen Dokuments wird dies als Standardberechtigung gesetzt.', 'settings_defaultSearchMethod' => 'Voreingestellte Suchmethode', 'settings_defaultSearchMethod_desc' => 'Voreingestellte Suchmethode, wenn über das Suchfeld in der Menüleiste gesucht wird.', 'settings_defaultSearchMethod_valdatabase' => 'Datenbank', @@ -1163,6 +1165,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.', 'settings_enableThemeSelector' => 'Auswahl des Themas', 'settings_enableThemeSelector_desc' => 'Schaltet das Auswahlmenü für die Themenauswahl in der Anmeldemaske ein oder aus.', +'settings_enableUpdateReceipt' => 'Erlaube die Änderung einer Empfangsbestätigung', +'settings_enableUpdateReceipt_desc' => 'Anwählen, um dem Benutzer, der die Empfangsbestätigung erteilt hat, die Änderung der Entscheidung zu erlauben.', 'settings_enableUpdateRevApp' => 'Erlaube die Änderung einer Prüfung/Freigabe', 'settings_enableUpdateRevApp_desc' => 'Anwählen, um dem Benutzer, der die Prüfung/Freigabe durchgeführt hat, die Änderung der Entscheidung zu erlauben, solange das Dokument den Workflow-Schritt noch nicht verlassen hat.', 'settings_enableUserImage' => 'Benutzerbilder einschalten', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 68bfbf68f..6624fbb1e 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -917,6 +917,8 @@ URL: [url]', 'settings_dbUser' => '', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -987,6 +989,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e1e392501..1e6b44c4e 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 (1485), dgrutsch (9), netixw (14) +// Translators: Admin (1489), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1094,6 +1094,8 @@ URL: [url]', 'settings_dbUser' => 'Username', 'settings_dbUser_desc' => 'The username for access to your database entered during the installation process. Do not edit field unless absolutely necessary, for example transfer of the database to a new Host.', 'settings_dbVersion' => 'Database schema too old', +'settings_defaultAccessDocs' => 'Default access for new documents', +'settings_defaultAccessDocs_desc' => 'When a new document is created, this will be the default access right.', 'settings_defaultSearchMethod' => 'Default search method', 'settings_defaultSearchMethod_desc' => 'Default search method, when a search is started by the search form in the main menu.', 'settings_defaultSearchMethod_valdatabase' => 'database', @@ -1164,6 +1166,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.', 'settings_enableThemeSelector' => 'Theme selection', 'settings_enableThemeSelector_desc' => 'Turns on/off the theme selector on the login page.', +'settings_enableUpdateReceipt' => 'Allow editing of existing reception', +'settings_enableUpdateReceipt_desc' => 'Enable this, if the user who has made a reception may change the decission.', 'settings_enableUpdateRevApp' => 'Allow editing of exting review/approval', 'settings_enableUpdateRevApp_desc' => 'Enable this, if the user who has made a review/approval may change the decission as long as the current workflow step has not been finished.', 'settings_enableUserImage' => 'Enable User Image', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 8975408fb..a213b86fb 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1056,6 +1056,8 @@ URL: [url]', 'settings_dbUser' => 'Nombre de usuario', 'settings_dbUser_desc' => 'Nombre de usuario de acceso a su base de datos introducido durante el proceso de instalación. No edite este campo a menos que sea necesario, por ejemplo si la base de datos se transfiere a un nuevo servidor.', 'settings_dbVersion' => 'Esquema de base de datos demasiado antiguo', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Método de búsqueda por defecto', 'settings_defaultSearchMethod_desc' => 'Método de búsqueda por defecto, cuando se inicia una búsqueda mediante el formulario en el menú principal', 'settings_defaultSearchMethod_valdatabase' => 'base de datos', @@ -1126,6 +1128,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Habilitar esto si quiere que el usuario identificado sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.', 'settings_enableThemeSelector' => 'Selección de temas (skins)', 'settings_enableThemeSelector_desc' => 'Habilitar/deshabilitar la selección de temas en la página de login', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Habilitar imágenes de usuario', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index ddf7ddab8..a5893e316 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1038,6 +1038,8 @@ URL: [url]', 'settings_dbUser' => 'Nom d\'utilisateur', 'settings_dbUser_desc' => 'Le nom d\'utilisateur pour l\'accès à votre base de données entré pendant le processus d\'installation. Ne pas modifier le champ sauf si vraiment nécessaire, par exemple pour le transfert de la base de données vers un nouvel hébergement.', 'settings_dbVersion' => 'Schéma de base de données trop ancien', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Méthode de recherche par défaut', 'settings_defaultSearchMethod_desc' => 'Méthode de recherche par défaut, lorsque la recherche est exécutée depuis le moteur de recherche du menu principal', 'settings_defaultSearchMethod_valdatabase' => 'base de données', @@ -1108,6 +1110,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.', 'settings_enableThemeSelector' => 'Sélection du thème', 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Activer image utilisateurs', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index f9755ed54..23925fbff 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1077,6 +1077,8 @@ Internet poveznica: [url]', 'settings_dbUser' => 'Korisničko ime', 'settings_dbUser_desc' => 'Korisničko ime za pristup vašoj bazi podataka unijeto tijekom postupka instalacije. Ne uređujte ovo polje bez prijeke potrebe, npr. prijenos baze podataka na novi Host.', 'settings_dbVersion' => 'Shema baze podataka je prestara', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Zadana metoda pretrage', 'settings_defaultSearchMethod_desc' => 'Zadana metoda pretrage, kada se pretraživanje pokreće putem formulara iz glavnog izbornika', 'settings_defaultSearchMethod_valdatabase' => 'baza podataka', @@ -1147,6 +1149,8 @@ Internet poveznica: [url]', 'settings_enableSelfRevApp_desc' => 'Omogući ovo ako želite da trenutno prijavljeni korisnik bude naveden kao recezent/validator i za promjenu toka rada.', 'settings_enableThemeSelector' => 'Odabir teme', 'settings_enableThemeSelector_desc' => 'Uključuje/isključuje izbornik tema na stranici prijave.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Omogući sliku korisnika', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 0e43ce08f..0f2024cd9 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1055,6 +1055,8 @@ URL: [url]', 'settings_dbUser' => 'Felhasználónév', 'settings_dbUser_desc' => 'Az adatbázis eléréséhez tartozó felhasználónevet a telepítési eljárás során kell megadni. Ne szerkessze ezt a mezőt, csak ha nagyon szükséges, például, ha az adatbázist át kell helyezni egy másik gépre.', 'settings_dbVersion' => 'Adatbázis séma túl régi', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Alapértelmezett keresési módszer', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => 'adatbázis', @@ -1125,6 +1127,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Engedélyezze, a azt szeretné, hogy a bejelentkezett felhasználó listázásra kerüljön felülvizsgálóként/jóváhagyóként és a munkamenet átmeneteknél.', 'settings_enableThemeSelector' => 'Téma választása', 'settings_enableThemeSelector_desc' => 'Kapcsolja be/ki a témaválasztót a bejelentkező oldalon', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Felhasználói kép engedélyezése', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 42de76764..a41813eec 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1089,6 +1089,8 @@ URL: [url]', 'settings_dbUser' => 'Utente', 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.', 'settings_dbVersion' => 'Schema del database obsoleto', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Metodo di ricerca predefinito', 'settings_defaultSearchMethod_desc' => 'Metodo di ricerca predefinito, quando la ricerca viene avviata dal modulo di ricerca nel menu principale.', 'settings_defaultSearchMethod_valdatabase' => 'database', @@ -1159,6 +1161,8 @@ URL: [url]', '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_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' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Abilita immagine utente', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 92e72499b..74d4e30ae 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1070,6 +1070,8 @@ URL : [url]', 'settings_dbUser' => '사용자 이름', 'settings_dbUser_desc' => '설치 과정에서 입력 한 데이터베이스 액세스를 위한 사용자 이름. 새 호스트에 데이터베이스의 예 전송을 위해 절대적으로 필요한 경우가 아니면 필드를 ​​편집하지 마십시오.', 'settings_dbVersion' => '오래된 데이터베이스 스키마', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '기본 검색 방법 설정', 'settings_defaultSearchMethod_desc' => '기본 검색 설정', 'settings_defaultSearchMethod_valdatabase' => '기본 검색 방법 설정', @@ -1140,6 +1142,8 @@ URL : [url]', 'settings_enableSelfRevApp_desc' => '검토 / 승인자로 워크 플로우 전환을 위해 나열되어있는 것이 현재 로그인 한 사용자가 필요한 경우이를 활성화합니다.', 'settings_enableThemeSelector' => '테마 선택', 'settings_enableThemeSelector_desc' => '로그인 페이지의 테마 선택기를 켜기/끄기로 전환합니다.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '사용자 이미지 사용', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index aee9a2c7c..9a29307e9 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1083,6 +1083,8 @@ URL: [url]', 'settings_dbUser' => 'Gebruikersnaam', 'settings_dbUser_desc' => 'De gebruikersnaam voor toegang tot de datbase ingevoerd tijdens de installatie. Verander de waarde niet tenzij echt nodig, bijvoorbeeld bij verplaatsing van de database naar een ander systeem.', 'settings_dbVersion' => 'Database schema te oud', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Default zoekmethode', 'settings_defaultSearchMethod_desc' => 'Default zoekmethode', 'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (database)', @@ -1153,6 +1155,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Schakel in indien the huidig ingelogde gebruiker wordt toegewezen als goedkeurder/ beoordelaar en voor workflow overgangen.', 'settings_enableThemeSelector' => 'Selecteer thema', 'settings_enableThemeSelector_desc' => 'Schakel thema selectie op de aanmeldpagina uit', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Inschakelen Gebruikersplaatjes', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 1cf095055..3d6c402a5 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1035,6 +1035,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_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => 'baza danych', @@ -1105,6 +1107,8 @@ 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_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Włącz obrazy użytkowników', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 8fd2cb655..26cff7cad 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1053,6 +1053,8 @@ URL: [url]', 'settings_dbUser' => 'Nome do usuário', 'settings_dbUser_desc' => 'O nome de usuário para acesso ao banco de dados, informado durante o processo de instalação. Não edite campo a menos que seja absolutamente necessário, por exemplo, a transferência do banco de dados para um novo host.', 'settings_dbVersion' => 'Esquema de banco de dados muito antigo', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Forma padrão para buscas', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => 'Banco de Dados', @@ -1123,6 +1125,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.', 'settings_enableThemeSelector' => 'Seleção de tema', 'settings_enableThemeSelector_desc' => 'Liga/desliga o seletor de tema na página de login.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Ativar Imagem de Usuário', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 2580ce65d..ff306a71b 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1078,6 +1078,8 @@ URL: [url]', 'settings_dbUser' => 'Username', 'settings_dbUser_desc' => 'Username-ul de acces la baza de date introdus în timpul procesului de instalare. Nu editați câmpul decât dacă este absolut necesar (de exemplu transferul bazei de date la un nou Host).', 'settings_dbVersion' => 'Schema bazei de date este prea veche', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'metoda de cautare implicita', 'settings_defaultSearchMethod_desc' => 'Metoda de cautare implicita cand cautarea a fost initiata prin formularul de cautare din meniul principal', 'settings_defaultSearchMethod_valdatabase' => 'baza de date', @@ -1148,6 +1150,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Activați această opțiune dacă doriți ca utilizatorul autentificat să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.', 'settings_enableThemeSelector' => 'Selecție Temă', 'settings_enableThemeSelector_desc' => 'Activare/dezactivare selector temă pe pagina de login.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Activați Imaginea utilizatorului', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 9f9225969..30a6cfd13 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1085,6 +1085,8 @@ URL: [url]', 'settings_dbUser' => 'Логин', 'settings_dbUser_desc' => 'Логин, введённый при установке. Не изменяйте без необходимости, например если БД была перемещена.', 'settings_dbVersion' => 'Схема БД устарела', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Метод поиска по умолчанию', 'settings_defaultSearchMethod_desc' => 'Метод поиска по умолчанию, когда поиск начинается с поисковой формы главного меню.', 'settings_defaultSearchMethod_valdatabase' => 'база данных', @@ -1155,6 +1157,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Включите для того, чтобы пользователи, в настоящее время выполнившие вход в систему, были в списке рецензентов/утверждающих и в изменении процесса.', 'settings_enableThemeSelector' => 'Выбор темы', 'settings_enableThemeSelector_desc' => 'Включить или отключить возможность выбора темы на странице входа.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Включить аватары', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index d2298c820..f98561dfc 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -910,6 +910,8 @@ URL: [url]', 'settings_dbUser' => '', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -980,6 +982,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 4d4decd1a..759120082 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1041,6 +1041,8 @@ URL: [url]', 'settings_dbUser' => 'Användarnamn', 'settings_dbUser_desc' => 'Användarnamnet för tillgång till databasen. Användarnamnet angavs under installationsprocessen.', 'settings_dbVersion' => 'Databasschemat för gammalt', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Standard sökmetod', 'settings_defaultSearchMethod_desc' => 'Standard sökmetod, när en sökning startas i sökformuläret i huvudmenyn.', 'settings_defaultSearchMethod_valdatabase' => 'databas', @@ -1111,6 +1113,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.', 'settings_enableThemeSelector' => 'Tema urval', 'settings_enableThemeSelector_desc' => 'Stäng på/av tema urval vid inloggningssidan.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Aktivera användarbilder', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 89747ef57..2e007e8d9 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1057,6 +1057,8 @@ URL: [url]', 'settings_dbUser' => 'Kullanıcı adı', 'settings_dbUser_desc' => 'Kurulum sırasında veritabanına erişim için girdiğiniz veritabanı kullanıcı adı. Gerekmedikçe değiştirmeyin.', 'settings_dbVersion' => 'Veritabanı yapısı çok eski', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -1127,6 +1129,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'O an giriş yapmış olan kullanıcıları kontrol eden/onaylayan olarak listelemek ve iş akışına dahil etmek için bunu seçebilirsiniz.', 'settings_enableThemeSelector' => 'Tema seçimini aç/kapat', 'settings_enableThemeSelector_desc' => 'Giriş sayfasında tema seçimini aç/kapat', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Kullanıcı Resmine İzin Ver', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index ae9951c3f..f7158f1f7 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1078,6 +1078,8 @@ URL: [url]', 'settings_dbUser' => 'Логін', 'settings_dbUser_desc' => 'Логін, введений при встановленні. Не змінюйте без потреби, наприклад, якщо БД було переміщено.', 'settings_dbVersion' => 'Схема БД застаріла', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => 'Метод пошуку за замовчуванням', 'settings_defaultSearchMethod_desc' => 'Метод пошуку за замовчуванням, коли пошук починається з пошукової форми головного меню.', 'settings_defaultSearchMethod_valdatabase' => 'база даних', @@ -1148,6 +1150,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Увімкніть для того, щоб користувачі, в даний момент авторизовані у системі, були в списку рецензентів/затверджувачів і в зміні процесу.', 'settings_enableThemeSelector' => 'Вибір теми', 'settings_enableThemeSelector_desc' => 'Увімкнути/вимкнути можливість вибору теми на сторінці авторизації.', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Увімкнути аватари', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 2aef70d0c..a3461f631 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -912,6 +912,8 @@ URL: [url]', 'settings_dbUser' => '', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -982,6 +984,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 16c7dc94a..d30cc2176 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -910,6 +910,8 @@ URL: [url]', 'settings_dbUser' => '', 'settings_dbUser_desc' => '', 'settings_dbVersion' => '', +'settings_defaultAccessDocs' => '', +'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', 'settings_defaultSearchMethod_valdatabase' => '', @@ -980,6 +982,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateReceipt' => '', +'settings_enableUpdateReceipt_desc' => '', 'settings_enableUpdateRevApp' => '', 'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', From 88c06c2f3761d0b15f59be78ebe4a650fc0255e8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 20:58:03 +0100 Subject: [PATCH 35/70] add defaultAccessDocs --- inc/inc.ClassSettings.php | 4 ++++ op/op.Settings.php | 1 + views/bootstrap/class.Settings.php | 11 +++++++++++ 3 files changed, 16 insertions(+) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index c94b435ac..e1904fbc2 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -64,6 +64,8 @@ class Settings { /* {{{ */ var $_encryptionKey = ''; // lifetime of cookie in seconds or 0 for end of session var $_cookieLifetime = ''; + // default access mode for documents + var $_defaultAccessDocs = ''; // Strict form checking var $_strictFormCheck = false; // Path to where SeedDMS is located @@ -454,6 +456,7 @@ class Settings { /* {{{ */ $this->_undelUserIds = strval($tab["undelUserIds"]); $this->_encryptionKey = strval($tab["encryptionKey"]); $this->_cookieLifetime = intval($tab["cookieLifetime"]); + $this->_defaultAccessDocs = intval($tab["defaultAccessDocs"]); $this->_restricted = Settings::boolVal($tab["restricted"]); $this->_enableUserImage = Settings::boolVal($tab["enableUserImage"]); $this->_disableSelfEdit = Settings::boolVal($tab["disableSelfEdit"]); @@ -753,6 +756,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "undelUserIds", $this->_undelUserIds); $this->setXMLAttributValue($node, "encryptionKey", $this->_encryptionKey); $this->setXMLAttributValue($node, "cookieLifetime", $this->_cookieLifetime); + $this->setXMLAttributValue($node, "defaultAccessDocs", $this->_defaultAccessDocs); $this->setXMLAttributValue($node, "restricted", $this->_restricted); $this->setXMLAttributValue($node, "enableUserImage", $this->_enableUserImage); $this->setXMLAttributValue($node, "disableSelfEdit", $this->_disableSelfEdit); diff --git a/op/op.Settings.php b/op/op.Settings.php index 0735b65f5..e549fd26a 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -127,6 +127,7 @@ if ($action == "saveSettings") $settings->_undelUserIds = strval($_POST["undelUserIds"]); $settings->_encryptionKey = strval($_POST["encryptionKey"]); $settings->_cookieLifetime = intval($_POST["cookieLifetime"]); + $settings->_defaultAccessDocs = intval($_POST["defaultAccessDocs"]); // TODO Connectors diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 0c6c3c89b..7f6bd8428 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -459,6 +459,17 @@ if(!is_writeable($settings->_configFilePath)) { : showTextField("cookieLifetime", $settings->_cookieLifetime); ?> + "> + : + + + + From 13973dd276e4ef20360ad489b073b604c949dd04 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 20:58:28 +0100 Subject: [PATCH 36/70] set default access for doc when uploading --- op/op.Ajax.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index b466f1b7e..eb3bfe378 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -642,6 +642,15 @@ switch($command) { exit; } else { $document = $res[0]; + + /* Set access as specified in settings. */ + if($settings->_defaultAccessDocs) { + if($settings->_defaultAccessDocs > 0 && $settings->_defaultAccessDocs < 4) { + $document->setInheritAccess(0, true); + $document->setDefaultAccess($settings->_defaultAccessDocs, true); + } + } + if(isset($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'] as $hookObj) { if (method_exists($hookObj, 'postAddDocument')) { From 6d9798753b9b407414a19386fe3ae45ef72b0752 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 20:58:52 +0100 Subject: [PATCH 37/70] set default access and owner --- op/op.AddDocument.php | 23 ++++++++++++++++++++++- views/bootstrap/class.AddDocument.php | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index aaa2685ca..d29b394bb 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -56,6 +56,18 @@ if($settings->_quota > 0) { } } +if($user->isAdmin()) { + $ownerid = (int) $_POST["ownerid"]; + if($ownerid) { + if(!($owner = $dms->getUser($ownerid))) { + UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured")); + } + } else { + $owner = $user; + } +} else { + $owner = $user; +} $comment = trim($_POST["comment"]); $version_comment = trim($_POST["version_comment"]); if($version_comment == "" && isset($_POST["use_comment"])) @@ -287,7 +299,7 @@ for ($file_num=0;$file_numaddDocument($name, $comment, $expires, $user, $keywords, + $res = $folder->addDocument($name, $comment, $expires, $owner, $keywords, $cats, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $sequence, $reviewers, $approvers, $reqversion, @@ -297,6 +309,15 @@ for ($file_num=0;$file_num $folder->getName())),getMLText("error_occured")); } else { $document = $res[0]; + + /* Set access as specified in settings. */ + if($settings->_defaultAccessDocs) { + if($settings->_defaultAccessDocs > 0 && $settings->_defaultAccessDocs < 4) { + $document->setInheritAccess(0, true); + $document->setDefaultAccess($settings->_defaultAccessDocs, true); + } + } + if(isset($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'] as $hookObj) { if (method_exists($hookObj, 'postAddDocument')) { diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index c7ecba0ca..ddb1108e8 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -196,6 +196,24 @@ console.log(element); : printSequenceChooser($folder->getDocuments('s')); if($orderby != 's') echo "
      ".getMLText('order_by_sequence_off'); ?> +isAdmin()) { ?> + + : + + + + + getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { From 3911fa9dd9452feca4220c53bb6d2b00a4fbb9fa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 21:22:07 +0100 Subject: [PATCH 38/70] add entries for 4.3.22 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4fa8937ed..b4067c0b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,8 @@ - add remove button to folder selector - editing of an exiting review/approval can be turned off - add searching for id of folder/document (Closes #302) +- admin may set owner of document when uploading it +- default access rights for documents can be set in configuration -------------------------------------------------------------------------------- Changes in version 4.3.31 From db22c3f34838544c5a6fc5fe983077a82e231ce9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Jan 2017 14:26:55 +0100 Subject: [PATCH 39/70] getReviewersStatus() and getReceiptStatus() only return last version the return lists will no longer include a revision, receipt for version of a document not being the last version --- SeedDMS_Core/Core/inc.ClassUser.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 27d4a19ce..5edd89255 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -1223,6 +1223,9 @@ class SeedDMS_Core_User { /* {{{ */ $status = array("indstatus"=>array(), "grpstatus"=>array()); // See if the user is assigned as an individual reviewer. + /* FIXME: See query of getRevisionStatus() because it also restricts on + * latest version. This may be needed here too. + */ $queryStr = "SELECT `tblDocumentReviewers`.*, `tblDocumentReviewLog`.`status`, ". "`tblDocumentReviewLog`.`comment`, `tblDocumentReviewLog`.`date`, ". "`tblDocumentReviewLog`.`userID` ". @@ -1310,6 +1313,9 @@ class SeedDMS_Core_User { /* {{{ */ $db = $this->_dms->getDB(); $status = array("indstatus"=>array(), "grpstatus"=>array()); + /* FIXME: See query of getRevisionStatus() because it also restricts on + * latest version. This may be needed here too. + */ $queryStr = "SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ". "`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ". @@ -1390,15 +1396,22 @@ class SeedDMS_Core_User { /* {{{ */ $status = array("indstatus"=>array(), "grpstatus"=>array()); + if (!$db->createTemporaryTable("ttcontentid")) { + return false; + } // See if the user is assigned as an individual recipient. + // left join with ttcontentid to restrict result on latest version of document + // unless a document and version is given $queryStr = "SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`status`, ". "`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ". "`tblDocumentReceiptLog`.`userID` ". "FROM `tblDocumentRecipients` ". "LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ". + "LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID` ". "WHERE `tblDocumentRecipients`.`type`='0' ". ($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' "). ($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' "). + ($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` " : ""). "AND `tblDocumentRecipients`.`required`='". $this->_id ."' ". "ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC"; $resArr = $db->getResultArray($queryStr); @@ -1423,10 +1436,12 @@ class SeedDMS_Core_User { /* {{{ */ "`tblDocumentReceiptLog`.`userID` ". "FROM `tblDocumentRecipients` ". "LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ". + "LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRecipients`.`required` ". "WHERE `tblDocumentRecipients`.`type`='1' ". ($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' "). ($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' "). + ($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` " : ""). "AND `tblGroupMembers`.`userID`='". $this->_id ."' ". "ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC"; $resArr = $db->getResultArray($queryStr); @@ -1470,15 +1485,22 @@ class SeedDMS_Core_User { /* {{{ */ $status = array("indstatus"=>array(), "grpstatus"=>array()); + if (!$db->createTemporaryTable("ttcontentid")) { + return false; + } // See if the user is assigned as an individual revisor. + // left join with ttcontentid to restrict result on latest version of document + // unless a document and version is given $queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ". "`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ". "`tblDocumentRevisionLog`.`userID` ". "FROM `tblDocumentRevisors` ". "LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ". + "LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` AND `ttcontentid`.`document` = `tblDocumentRevisors`.`documentID` ". "WHERE `tblDocumentRevisors`.`type`='0' ". ($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' "). ($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' "). + ($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` " : ""). "AND `tblDocumentRevisors`.`required`='". $this->_id ."' ". "ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC"; $resArr = $db->getResultArray($queryStr); @@ -1505,10 +1527,12 @@ class SeedDMS_Core_User { /* {{{ */ "`tblDocumentRevisionLog`.`userID` ". "FROM `tblDocumentRevisors` ". "LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ". + "LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` AND `ttcontentid`.`document` = `tblDocumentRevisors`.`documentID` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRevisors`.`required` ". "WHERE `tblDocumentRevisors`.`type`='1' ". ($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' "). ($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' "). + ($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` " : ""). "AND `tblGroupMembers`.`userID`='". $this->_id ."' ". "ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC"; $resArr = $db->getResultArray($queryStr); From 4191a8feb775bc22eb23ca4652f902cecdec7656 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Jan 2017 14:28:30 +0100 Subject: [PATCH 40/70] list protocol of receipts and revisions --- .../bootstrap/class.DocumentVersionDetail.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php index cba50629d..190f90ce1 100644 --- a/views/bootstrap/class.DocumentVersionDetail.php +++ b/views/bootstrap/class.DocumentVersionDetail.php @@ -410,6 +410,24 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style { } ?> + getReceiptStatus()) { ?> +
      +
      +printProtocol($version, 'receipt'); +?> +
      +
      + + getRevisionStatus()) { ?> +
      +
      +printProtocol($version, 'revision'); +?> +
      +
      + From c1e38ec059231f5f718cb56ed53947a73b9aaa44 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Jan 2017 14:30:26 +0100 Subject: [PATCH 41/70] add note to 5.1.2 --- SeedDMS_Core/package.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index f84c188f3..b68cd9576 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -25,6 +25,9 @@ GPL License - all changes from 5.0.9 merged +- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus() +only return entries of the latest document version if not specific document and +version is passed From 35e9dbb0fb818dd411a10e33ce790a3c256d1c19 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Jan 2017 14:58:39 +0100 Subject: [PATCH 42/70] set proper link to footer js --- views/bootstrap/class.Bootstrap.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 89e4141b1..fdc0aed98 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -146,7 +146,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if(is_dir($this->params['cachedir'].'/js')) { file_put_contents($this->params['cachedir'].'/js/'.$hashjs.'.js', $jscode); } - echo ''."\n"; + parse_str($_SERVER['QUERY_STRING'], $tmp); + $tmp['action'] = 'footerjs'; + $tmp['hash'] = $hashjs; + echo ''."\n"; } if(method_exists($this, 'js')) { parse_str($_SERVER['QUERY_STRING'], $tmp); From 3c05f5f5cbabaed8a84b2ba0619a8786b550f210 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 23 Jan 2017 07:52:19 +0100 Subject: [PATCH 43/70] save array in ext configuration as comma separated list --- inc/inc.ClassSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index d33e30343..8cda50f58 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -989,7 +989,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($extnode, 'name', $name); foreach($GLOBALS['EXT_CONF'][$name]['config'] as $fieldname=>$conf) { $parameter = $extnode->addChild('parameter'); - $parameter[0] = isset($extension[$fieldname]) ? $extension[$fieldname] : ''; + $parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : ''; $this->setXMLAttributValue($parameter, 'name', $fieldname); } From 4108cf1696bd76a1a03f8ec4d25ab5113ab55ec8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 23 Jan 2017 07:53:01 +0100 Subject: [PATCH 44/70] =?UTF-8?q?add=20saving=20list=20of=20users=20and=20?= =?UTF-8?q?group=D1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- out/out.Settings.php | 5 +++++ views/bootstrap/class.Settings.php | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/out/out.Settings.php b/out/out.Settings.php index 5c081ae45..0aefca5b5 100644 --- a/out/out.Settings.php +++ b/out/out.Settings.php @@ -36,9 +36,14 @@ if (!$accessop->check_view_access($view, $_GET)) { if(!trim($settings->_encryptionKey)) $settings->_encryptionKey = md5(uniqid()); +$users = $dms->getAllUsers($settings->_sortUsersInList); +$groups = $dms->getAllGroups(); + if($view) { $view->setParam('settings', $settings); $view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')); + $view->setParam('allusers', $users); + $view->setParam('allgroups', $groups); $view->setParam('accessobject', $accessop); $view($_GET); exit; diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 0e36e9693..923a4ec6e 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -85,6 +85,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $users = $this->params['allusers']; + $groups = $this->params['allgroups']; $settings = $this->params['settings']; $currenttab = $this->params['currenttab']; @@ -818,6 +820,32 @@ if(!is_writeable($settings->_configFilePath)) { " value="1" _extensions[$extname][$confkey]) && $settings->_extensions[$extname][$confkey]) echo 'checked'; ?> /> _extensions[$extname][$confkey])) + $selusers = explode(',', $settings->_extensions[$extname][$confkey]); + else + $selusers = array(); + echo ''; + break; + case 'groups': + if(isset($settings->_extensions[$extname][$confkey])) + $selgroups = explode(',', $settings->_extensions[$extname][$confkey]); + else + $selgroups = array(); + echo ''; + break; + } + break; default: ?> " title="" value="_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" size="" /> From b05df3ce6b3fbbcc335ae58ddec364468f54bf5a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 23 Jan 2017 07:57:40 +0100 Subject: [PATCH 45/70] set cachedir as it is used in Bootstrap class --- inc/inc.ClassUI.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index a0b457d87..ba062e561 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -81,6 +81,7 @@ class UI extends UI_Default { $view->setParam('partitionsize', $settings->_partitionSize); $view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); + $view->setParam('cachedir', $settings->_cacheDir); return $view; } return null; From 09e7d66e76fa868ed0c560288f019ab332f921ca Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 23 Jan 2017 08:56:32 +0100 Subject: [PATCH 46/70] new keys and various updates (especially sk_SK) --- languages/ar_EG/lang.inc | 8 +++-- languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 11 ++++++- languages/el_GR/lang.inc | 2 ++ languages/en_GB/lang.inc | 2 ++ languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hr_HR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/ko_KR/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 6 ++-- languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 68 +++++++++++++++++++++------------------- 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 ++ 24 files changed, 94 insertions(+), 39 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 9bc45ad35..73b11db55 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 (1270) +// Translators: Admin (1272) $text = array( '2_factor_auth' => '', @@ -238,7 +238,7 @@ URL: [url]', 'choose_workflow_action' => 'اختر اجراء مسار عمل', 'choose_workflow_state' => 'اختر حالة مسار عمل', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'ﻢﺴﺣ ﺎﻠﻤﺤﻓﻮﻇﺎﺗ', 'clear_clipboard' => '', 'clear_password' => '', 'clipboard' => 'لوحة القصاصات', @@ -532,7 +532,7 @@ URL: [url]', 'hu_HU' => 'مجرية', 'id' => 'معرف', 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.', -'import' => '', +'import' => 'ﺎﺴﺘﺧﺭﺎﺟ', 'importfs' => '', 'import_fs' => '', 'import_fs_warning' => '', @@ -889,6 +889,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index b5c5542ea..fabbb1cd7 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -767,6 +767,8 @@ $text = array( 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 4ecd963e1..37f9a208a 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -772,6 +772,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 0403bb648..2bccebe1d 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -898,6 +898,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index f3b39e3ee..f34776717 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 (2360), dgrutsch (22) +// Translators: Admin (2362), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -941,6 +941,15 @@ Benutzer: [username] URL: [url]', 'revision_request_email_subject' => '[sitename]: [name] - Aufforderung zur Wiederholungsprüfung', 'revision_status' => 'Status', +'revision_submit_email_body' => 'Erneute Freigabe erteilen +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Status: [status] +Kommentar: [comment] +Benutzer: [username] +URL: [url]', +'revision_submit_email_subject' => '[sitename]: [name] - Erneute Freigabe erteilen', 'revisors' => 'Überprü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.', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 6624fbb1e..8e56d50a6 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -778,6 +778,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 1e6b44c4e..d15c7442b 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -942,6 +942,8 @@ User: [username] URL: [url]', 'revision_request_email_subject' => '[sitename]: [name] - Revision request', 'revision_status' => 'Status', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', '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.', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index a213b86fb..8befdcd45 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -904,6 +904,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index a5893e316..aa4f149f4 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -899,6 +899,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 23925fbff..efa8d315c 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -925,6 +925,8 @@ Internet poveznica: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', '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.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 0f2024cd9..695c99ac3 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -904,6 +904,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index a41813eec..b879a4e45 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -937,6 +937,8 @@ User: [username] URL: [url]', 'revision_request_email_subject' => '[sitename]: [name] - Richiesta di revisione', '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.', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 74d4e30ae..1b0200aa2 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -918,6 +918,8 @@ URL: [url]', 'revision_request_email_body' => '수정 요청 메일 내용', 'revision_request_email_subject' => '수정 요청 이메일 제목', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '감사', 'revisor_already_assigned' => '이미 감사가 선임이 된 사용자.', 'revisor_already_removed' => '감사는 문서의 개정을 과정에서 삭제했거나 이미 개정을 완료 했습니다.', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 9a29307e9..eaf15d5c3 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -927,6 +927,8 @@ User: [username] URL: [url]', 'revision_request_email_subject' => '[sitename]: [name] – Verzoek tot herziening', 'revision_status' => 'Status revisie', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => 'Herzieners', 'revisor_already_assigned' => 'Gebruiker is reeds herziener', 'revisor_already_removed' => 'Herziener reeds verwijderd', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 3d6c402a5..a09091d66 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 (746), netixw (84), romi (93), uGn (112) +// Translators: Admin (747), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', @@ -384,7 +384,7 @@ URL: [url]', 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!', 'dropfolderdir_missing' => '', 'dropfolder_file' => 'Plik z folderu rozwijanego', -'dropfolder_folder' => '', +'dropfolder_folder' => 'Katalog ze strefy drop', 'dropupload' => 'Szybki upload', 'drop_files_here' => 'Przeciągnij tu pliki!', 'dump_creation' => 'Utworzenie zrzutu bazy danych', @@ -883,6 +883,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 26cff7cad..acee34809 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -901,6 +901,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index ff306a71b..74cb644e7 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -926,6 +926,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', '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.', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 30a6cfd13..ff730003a 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -933,6 +933,8 @@ URL: [url]', URL: [url]', 'revision_request_email_subject' => '[sitename]: [name] - Запрос на ревизию', 'revision_status' => 'Состояние ревизии', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => 'Ревизор', 'revisor_already_assigned' => 'Пользователь уже назначен как ревизор', 'revisor_already_removed' => 'Ревизор уже удален из процесса ревизии, либо уже рассмотрел документ', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index f98561dfc..f524978a8 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 (512), destinqo (19) +// Translators: Admin (544), destinqo (19) $text = array( '2_factor_auth' => '', @@ -268,7 +268,7 @@ URL: [url]', 'current_quota' => '', 'current_state' => '', 'current_version' => 'Aktuálna verzia', -'daily' => '', +'daily' => 'Denná', 'databasesearch' => '', 'date' => 'Dátum', 'days' => '', @@ -372,7 +372,7 @@ URL: [url]', 'edit_user' => 'Upraviť používateľa', 'edit_user_details' => 'Upraviť podrobnosti používateľa', 'edit_version' => '', -'el_GR' => '', +'el_GR' => 'Grécky', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'', @@ -771,6 +771,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', @@ -875,9 +877,9 @@ URL: [url]', 'settings_backupDir_desc' => '', 'settings_cacheDir' => '', 'settings_cacheDir_desc' => '', -'settings_Calendar' => '', -'settings_calendarDefaultView' => '', -'settings_calendarDefaultView_desc' => '', +'settings_Calendar' => 'Nastavenie kalendára', +'settings_calendarDefaultView' => 'Predvolené zobrazenie kalendára', +'settings_calendarDefaultView_desc' => 'Predvolené zobrazenie kalendára', 'settings_cannot_disable' => '', 'settings_checkOutDir' => '', 'settings_checkOutDir_desc' => '', @@ -914,7 +916,7 @@ URL: [url]', 'settings_defaultAccessDocs_desc' => '', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', -'settings_defaultSearchMethod_valdatabase' => '', +'settings_defaultSearchMethod_valdatabase' => 'databáza', 'settings_defaultSearchMethod_valfulltext' => '', 'settings_delete_install_folder' => '', 'settings_disableSelfEdit' => '', @@ -934,19 +936,19 @@ URL: [url]', 'settings_enableAdminReceipt_desc' => '', 'settings_enableAdminRevApp' => '', 'settings_enableAdminRevApp_desc' => '', -'settings_enableCalendar' => '', -'settings_enableCalendar_desc' => '', -'settings_enableClipboard' => '', +'settings_enableCalendar' => 'Zapnúť kalendár', +'settings_enableCalendar_desc' => 'Zapnúť/vypnúť kalendár', +'settings_enableClipboard' => 'Aktivovať schránky', 'settings_enableClipboard_desc' => '', 'settings_enableConverting' => '', 'settings_enableConverting_desc' => '', -'settings_enableDropUpload' => '', +'settings_enableDropUpload' => 'Zapnúť rýchle nahratie', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '', 'settings_enableDuplicateDocNames_desc' => '', 'settings_enableEmail' => 'Povoliť e-mail', 'settings_enableEmail_desc' => 'Povoliť/zakázať automatické emailové upozornenie', -'settings_enableFolderTree' => '', +'settings_enableFolderTree' => 'Aktivovať strom priečinkov', 'settings_enableFolderTree_desc' => '', 'settings_enableFullSearch' => '', 'settings_enableFullSearch_desc' => '', @@ -954,10 +956,10 @@ URL: [url]', 'settings_enableGuestAutoLogin_desc' => '', 'settings_enableGuestLogin' => '', 'settings_enableGuestLogin_desc' => '', -'settings_enableHelp' => '', +'settings_enableHelp' => 'Zapnúť nápovedu', 'settings_enableHelp_desc' => '', -'settings_enableLanguageSelector' => '', -'settings_enableLanguageSelector_desc' => '', +'settings_enableLanguageSelector' => 'Aktivovať voľbu jazyka', +'settings_enableLanguageSelector_desc' => 'Zobraziť výber pre jazyk používateľského rozhrania potom, čo bol prihlásený.', 'settings_enableLargeFileUpload' => '', 'settings_enableLargeFileUpload_desc' => '', 'settings_enableMenuTasks' => '', @@ -980,7 +982,7 @@ URL: [url]', 'settings_enableRevisionWorkflow_desc' => '', 'settings_enableSelfRevApp' => '', 'settings_enableSelfRevApp_desc' => '', -'settings_enableThemeSelector' => '', +'settings_enableThemeSelector' => 'Výber šablóny', 'settings_enableThemeSelector_desc' => '', 'settings_enableUpdateReceipt' => '', 'settings_enableUpdateReceipt_desc' => '', @@ -997,18 +999,18 @@ URL: [url]', 'settings_encryptionKey' => '', 'settings_encryptionKey_desc' => '', 'settings_error' => '', -'settings_expandFolderTree' => '', -'settings_expandFolderTree_desc' => '', +'settings_expandFolderTree' => 'Rozbaliť', +'settings_expandFolderTree_desc' => 'Rozbaľte strom priečinkov', 'settings_expandFolderTree_val0' => '', 'settings_expandFolderTree_val1' => '', 'settings_expandFolderTree_val2' => '', 'settings_Extensions' => '', 'settings_extraPath' => '', 'settings_extraPath_desc' => '', -'settings_firstDayOfWeek' => '', -'settings_firstDayOfWeek_desc' => '', -'settings_footNote' => '', -'settings_footNote_desc' => '', +'settings_firstDayOfWeek' => 'Prvý deň v týždni', +'settings_firstDayOfWeek_desc' => 'Prvý deň v týždni', +'settings_footNote' => 'Poznámka pod čiarou', +'settings_footNote_desc' => 'Správa sa zobrazí v dolnej časti každej stránky', 'settings_fullSearchEngine' => '', 'settings_fullSearchEngine_desc' => '', 'settings_fullSearchEngine_vallucene' => 'Zend Lucene', @@ -1082,7 +1084,7 @@ URL: [url]', 'settings_previewWidthDetail' => '', 'settings_previewWidthDetail_desc' => '', 'settings_previewWidthList' => '', -'settings_previewWidthList_desc' => '', +'settings_previewWidthList_desc' => 'Šírka pre náhľad obrázkov je uvedené v zoznamoch', 'settings_printDisclaimer' => '', 'settings_printDisclaimer_desc' => '', 'settings_quota' => '', @@ -1091,12 +1093,12 @@ URL: [url]', 'settings_removeFromDropFolder_desc' => '', 'settings_restricted' => '', 'settings_restricted_desc' => '', -'settings_rootDir' => '', -'settings_rootDir_desc' => '', +'settings_rootDir' => 'Koreňový adresár', +'settings_rootDir_desc' => 'Cesta k miestu, kde sa nachádza SeedDMS', 'settings_rootFolderID' => '', 'settings_rootFolderID_desc' => '', 'settings_SaveError' => '', -'settings_Server' => '', +'settings_Server' => 'Nastavenie servera', 'settings_showFullPreview' => '', 'settings_showFullPreview_desc' => '', 'settings_showMissingTranslations' => '', @@ -1120,14 +1122,14 @@ URL: [url]', 'settings_smtpUser' => '', 'settings_smtpUser_desc' => '', 'settings_sortFoldersDefault' => '', -'settings_sortFoldersDefault_desc' => '', -'settings_sortFoldersDefault_val_name' => '', -'settings_sortFoldersDefault_val_sequence' => '', +'settings_sortFoldersDefault_desc' => 'Toto nastavenie triedi metódy pre zložky a dokumenty v zobrazení priečinkov.', +'settings_sortFoldersDefault_val_name' => 'podľa mena', +'settings_sortFoldersDefault_val_sequence' => 'podľa sekvencií', 'settings_sortFoldersDefault_val_unsorted' => '', -'settings_sortUsersInList' => '', +'settings_sortUsersInList' => 'Triediť užívateľov v zozname', 'settings_sortUsersInList_desc' => '', -'settings_sortUsersInList_val_fullname' => '', -'settings_sortUsersInList_val_login' => '', +'settings_sortUsersInList_val_fullname' => 'Triediť podľa celého mena', +'settings_sortUsersInList_val_login' => 'Triediť podľa prihlásenie', 'settings_stagingDir' => '', 'settings_stagingDir_desc' => '', 'settings_start_install' => '', @@ -1137,7 +1139,7 @@ URL: [url]', 'settings_strictFormCheck_desc' => '', 'settings_suggestionvalue' => '', 'settings_System' => 'Systém', -'settings_theme' => '', +'settings_theme' => 'Prednastavená téma', 'settings_theme_desc' => '', 'settings_titleDisplayHack' => '', 'settings_titleDisplayHack_desc' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 759120082..1c689fe75 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -889,6 +889,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 2e007e8d9..6df64b41b 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -905,6 +905,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index f7158f1f7..e7dea96d8 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -926,6 +926,8 @@ URL: [url]', URL: [url]', 'revision_request_email_subject' => '[sitename]: [name] - Запит на ревізію', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => 'Ревізори', 'revisor_already_assigned' => 'Ревізор вже призначений', 'revisor_already_removed' => 'Ревізора вже видалено', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index a3461f631..88cebe2c8 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -773,6 +773,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index d30cc2176..ab1b92688 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -771,6 +771,8 @@ URL: [url]', 'revision_request_email_body' => '', 'revision_request_email_subject' => '', 'revision_status' => '', +'revision_submit_email_body' => '', +'revision_submit_email_subject' => '', 'revisors' => '', 'revisor_already_assigned' => '', 'revisor_already_removed' => '', From 27247438f50985a7da01040608b0b5cc606893be Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 24 Jan 2017 14:20:10 +0100 Subject: [PATCH 47/70] call new hook finishReviseDocument --- controllers/class.ReviseDocument.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php index 391e8ac14..323ee0784 100644 --- a/controllers/class.ReviseDocument.php +++ b/controllers/class.ReviseDocument.php @@ -91,6 +91,8 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common { if ($revisionCT == $revisionTotal) { $newStatus=S_RELEASED; if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) { + if(!$this->callHook('finishReviseDocument', $content)) { + } } } else { $newStatus=S_IN_REVISION; From b814b07e2ad15fe91efaa06bc0d8124a47057253 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 24 Jan 2017 14:20:43 +0100 Subject: [PATCH 48/70] reorganize page like MyDocuments page --- out/out.ObjectCheck.php | 58 ++++++ views/bootstrap/class.ObjectCheck.php | 255 +++++++++++++++++++------- 2 files changed, 249 insertions(+), 64 deletions(-) diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index 0ce8e839c..f54d6b53e 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -35,6 +35,11 @@ if (!$accessop->check_view_access($view, $_GET)) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } +$listtype = 'listRepair'; +if (isset($_GET["list"])) { + $listtype = $_GET['list']; +} + if(isset($_GET['repair']) && $_GET['repair'] == 1) { $repair = 1; } else { @@ -68,8 +73,60 @@ $nochecksumversions = $dms->getNoChecksumDocumentContent(); $duplicateversions = $dms->getDuplicateDocumentContent(); $rootfolder = $dms->getFolder($settings->_rootFolderID); +function repair_tree($dms, $user, $folder, $path=':') { /* {{{ */ + $objects = array(); + + /* Don't do folderlist check for root folder */ + if($path != ':') { + /* If the path contains a folder id twice, the a cyclic relation + * exists. + */ + $tmparr = explode(':', $path); + array_shift($tmparr); + if(count($tmparr) != count(array_unique($tmparr))) { + $objects[] = array('object'=>$folder, 'msg'=>'Folder path contains cyclic relation'); + } + $folderList = $folder->getFolderList(); + /* Check the folder */ + if($folderList != $path) { + $objects[] = array('object'=>$folder, 'msg'=>"Folderlist is '".$folderList."', should be '".$path); + } + } + + $subfolders = $folder->getSubFolders(); + foreach($subfolders as $subfolder) { + $objects = array_merge($objects, repair_tree($dms, $user, $subfolder, $path.$folder->getId().':')); + } + $path .= $folder->getId().':'; + $documents = $folder->getDocuments(); + foreach($documents as $document) { + /* Check the folder list of the document */ + $folderList = $document->getFolderList(); + if($folderList != $path) { + $objects[] = array('object'=>$document, 'msg'=>"Folderlist is '".$folderList."', should be '".$path); + } + + /* Check if the content is available */ + $versions = $document->getContent(); + if($versions) { + foreach($versions as $version) { + $filepath = $dms->contentDir . $version->getPath(); + if(!file_exists($filepath)) { + $objects[] = array('object'=>$version, 'msg'=>'Document content is missing'); + } + } + } else { + $objects[] = array('object'=>$version, 'msg'=>'Document has no content at all'); + } + } + + return $objects; +} /* }}} */ +$repairobjects = repair_tree($dms, $user, $folder); + if($view) { $view->setParam('folder', $folder); + $view->setParam('listtype', $listtype); $view->setParam('unlinkedcontent', $unlinkedversions); $view->setParam('unlinkedfolders', $unlinkedfolders); $view->setParam('unlinkeddocuments', $unlinkeddocuments); @@ -81,6 +138,7 @@ if($view) { $view->setParam('setchecksum', $setchecksum); $view->setParam('repair', $repair); $view->setParam('rootfolder', $rootfolder); + $view->setParam('repairobjects', $repairobjects); $view->setParam('accessobject', $accessop); $view($_GET); exit; diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index f95189cb5..c8a23232a 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -31,6 +31,57 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { + function _tree($dms, $user, $folder, $path=':') { /* {{{ */ + + $objects = array(); + + /* Don't do folderlist check for root folder */ + if($path != ':') { + /* If the path contains a folder id twice, the a cyclic relation + * exists. + */ + $tmparr = explode(':', $path); + array_shift($tmparr); + if(count($tmparr) != count(array_unique($tmparr))) { + $objects[] = array('object'=>$folder, 'msg'=>'Folder path contains cyclic relation'); + } + $folderList = $folder->getFolderList(); + /* Check the folder */ + if($folderList != $path) { + $objects[] = array('object'=>$folder, 'msg'=>"Folderlist is '".$folderList."', should be '".$path); + } + } + + $subfolders = $folder->getSubFolders(); + foreach($subfolders as $subfolder) { + $objects = array_merge($objects, $this->_tree($dms, $user, $subfolder, $path.$folder->getId().':')); + } + $path .= $folder->getId().':'; + $documents = $folder->getDocuments(); + foreach($documents as $document) { + /* Check the folder list of the document */ + $folderList = $document->getFolderList(); + if($folderList != $path) { + $objects[] = array('object'=>$document, 'msg'=>"Folderlist is '".$folderList."', should be '".$path); + } + + /* Check if the content is available */ + $versions = $document->getContent(); + if($versions) { + foreach($versions as $version) { + $filepath = $dms->contentDir . $version->getPath(); + if(!file_exists($filepath)) { + $objects[] = array('object'=>$version, 'msg'=>'Document content is missing'); + } + } + } else { + $objects[] = array('object'=>$version, 'msg'=>'Document has no content at all'); + } + } + + return $objects; + } /* }}} */ + function tree($dms, $folder, $repair, $path=':', $indent='') { /* {{{ */ global $user; @@ -185,65 +236,44 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } } /* }}} */ - function js() { /* {{{ */ - $user = $this->params['user']; - $folder = $this->params['folder']; - - header('Content-Type: application/javascript; charset=UTF-8'); - - $this->printDeleteFolderButtonJs(); - $this->printDeleteDocumentButtonJs(); - } /* }}} */ - - function show() { /* {{{ */ + function listRepair() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; $folder = $this->params['folder']; - $unlinkedversions = $this->params['unlinkedcontent']; - $unlinkedfolders = $this->params['unlinkedfolders']; - $unlinkeddocuments = $this->params['unlinkeddocuments']; - $nofilesizeversions = $this->params['nofilesizeversions']; - $nochecksumversions = $this->params['nochecksumversions']; - $duplicateversions = $this->params['duplicateversions']; $repair = $this->params['repair']; - $unlink = $this->params['unlink']; - $setfilesize = $this->params['setfilesize']; - $setchecksum = $this->params['setchecksum']; - $rootfolder = $this->params['rootfolder']; - $this->enableClipboard = $this->params['enableclipboard']; + $objects = $this->params['repairobjects']; - $this->htmlAddHeader(''."\n", 'js'); - - $this->htmlStartPage(getMLText("admin_tools")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->contentHeading(getMLText("objectcheck")); - if($repair) { - echo "
      ".getMLText('repairing_objects')."
      "; - } - $this->contentContainerStart(); - print ""; - print "\n\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - $this->needsrepair = false; - $this->tree($dms, $folder, $repair); - print "
      ".getMLText("name")."".getMLText("owner")."".getMLText("error")."
      \n"; + if($objects) { + if($repair) { + echo "
      ".getMLText('repairing_objects')."
      "; + } + print ""; + print "\n\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n\n\n"; + $this->needsrepair = false; + print "
      ".getMLText("name")."".getMLText("owner")."".getMLText("error")."
      \n"; - if($this->needsrepair && $repair == 0) { - echo '

      '.getMLText('do_object_repair').'

      '; + if($this->needsrepair && $repair == 0) { + echo '

      '.getMLText('do_object_repair').'

      '; + } } - $this->contentContainerEnd(); + } /* }}} */ + function listUnlinkedFolders() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $unlinkedfolders = $this->params['unlinkedfolders']; + + $this->contentHeading(getMLText("unlinked_folders")); if($unlinkedfolders) { - $this->contentHeading(getMLText("unlinked_folders")); - $this->contentContainerStart(); print ""; print "\n\n"; print "\n"; @@ -262,12 +292,17 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { echo ""; } print "
      ".getMLText("name")."
      \n"; - $this->contentContainerEnd(); } + } /* }}} */ + function listUnlinkedDocuments() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $unlinkeddocuments = $this->params['unlinkeddocuments']; + + $this->contentHeading(getMLText("unlinked_documents")); if($unlinkeddocuments) { - $this->contentHeading(getMLText("unlinked_documents")); - $this->contentContainerStart(); print ""; print "\n\n"; print "\n"; @@ -286,16 +321,22 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { echo ""; } print "
      ".getMLText("name")."
      \n"; - $this->contentContainerEnd(); } + } /* }}} */ + + function listUnlinkedContent() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $unlinkedcontent = $this->params['unlinkedcontent']; + $unlink = $this->params['unlink']; $this->contentHeading(getMLText("unlinked_content")); - $this->contentContainerStart(); if($unlink) { echo "

      ".getMLText('unlinking_objects')."

      "; } - if($unlinkedversions) { + if($unlinkedcontent) { print ""; print "\n\n"; print "\n"; @@ -304,7 +345,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { print "\n"; print "\n"; print "\n\n\n"; - foreach($unlinkedversions as $version) { + foreach($unlinkedcontent as $version) { $doc = $version->getDocument(); print ""; if($unlink) { @@ -318,11 +359,15 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } } - $this->contentContainerEnd(); + } /* }}} */ + + function listMissingFileSize() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $nofilesizeversions = $this->params['nofilesizeversions']; $this->contentHeading(getMLText("missing_filesize")); - $this->contentContainerStart(); - if($nofilesizeversions) { print "
      ".getMLText("document")."".getMLText("mimetype")."
      ".$doc->getId()."".$version->getVersion()."".$version->getOriginalFileName()."".$version->getMimeType()."
      "; print "\n\n"; @@ -347,10 +392,15 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } } - $this->contentContainerEnd(); + } /* }}} */ + + function listMissingChecksum() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $nochecksumversions = $this->params['nochecksumversions']; $this->contentHeading(getMLText("missing_checksum")); - $this->contentContainerStart(); if($nochecksumversions) { print "
      "; @@ -375,14 +425,18 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { echo '

      '.getMLText('do_object_setchecksum').'

      '; } } + } /* }}} */ - $this->contentContainerEnd(); + function listDuplicateContent() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $duplicateversions = $this->params['duplicateversions']; $this->contentHeading(getMLText("duplicate_content")); - $this->contentContainerStart(); if($duplicateversions) { - print "
      "; + print "
      "; print "\n\n"; print "\n"; print "\n"; @@ -403,8 +457,81 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } print "
      ".getMLText("document")."".getMLText("version")."
      \n"; } +} /* }}} */ + + function js() { /* {{{ */ + $user = $this->params['user']; + $folder = $this->params['folder']; + + header('Content-Type: application/javascript; charset=UTF-8'); + + $this->printDeleteFolderButtonJs(); + $this->printDeleteDocumentButtonJs(); +?> +$(document).ready( function() { + $('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){ + ev.preventDefault(); + $('#kkkk.ajax').data('action', $(this).data('action')); + $('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')}); + }); + $('body').on('click', 'table th a', function(ev){ + ev.preventDefault(); + $('#kkkk.ajax').data('action', $(this).data('action')); + $('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby'), orderdir: $(this).data('orderdir')}); + }); +}); +params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $listtype = $this->params['listtype']; + $unlinkedcontent = $this->params['unlinkedcontent']; + $unlinkedfolders = $this->params['unlinkedfolders']; + $unlinkeddocuments = $this->params['unlinkeddocuments']; + $nofilesizeversions = $this->params['nofilesizeversions']; + $nochecksumversions = $this->params['nochecksumversions']; + $duplicateversions = $this->params['duplicateversions']; + $repair = $this->params['repair']; + $unlink = $this->params['unlink']; + $setfilesize = $this->params['setfilesize']; + $setchecksum = $this->params['setchecksum']; + $rootfolder = $this->params['rootfolder']; + $repairobjects = $this->params['repairobjects']; + $this->enableClipboard = $this->params['enableclipboard']; + + $this->htmlAddHeader(''."\n", 'js'); + + $this->htmlStartPage(getMLText("admin_tools")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); + + echo '
      '; + echo '
      '; + $this->contentHeading(getMLText("object_check_critical")); + echo ''; + $this->contentHeading(getMLText("object_check_warning")); + echo ''; + echo '
      '; + echo '
      '; + + echo '
      '; + + echo '
      '; + echo '
      '; - $this->contentContainerEnd(); $this->contentEnd(); $this->htmlEndPage(); } /* }}} */ From 6a43c85eb9b76e848baba13d52dc0623359cbb8a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 24 Jan 2017 14:21:55 +0100 Subject: [PATCH 49/70] getUnlinkedDocumentContent, getNoFileSizeDocumentContent, getNoChecksumDocumentContent return only false if db query fails --- SeedDMS_Core/Core/inc.ClassDMS.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index a56042fe6..01f639324 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -2102,7 +2102,7 @@ class SeedDMS_Core_DMS { function getUnlinkedDocumentContent() { /* {{{ */ $queryStr = "SELECT * FROM tblDocumentContent WHERE document NOT IN (SELECT id FROM tblDocuments)"; $resArr = $this->db->getResultArray($queryStr); - if (!$resArr) + if ($resArr === false) return false; $versions = array(); @@ -2126,7 +2126,7 @@ class SeedDMS_Core_DMS { function getNoFileSizeDocumentContent() { /* {{{ */ $queryStr = "SELECT * FROM tblDocumentContent WHERE fileSize = 0 OR fileSize is null"; $resArr = $this->db->getResultArray($queryStr); - if (!$resArr) + if ($resArr === false) return false; $versions = array(); @@ -2150,7 +2150,7 @@ class SeedDMS_Core_DMS { function getNoChecksumDocumentContent() { /* {{{ */ $queryStr = "SELECT * FROM tblDocumentContent WHERE checksum = '' OR checksum is null"; $resArr = $this->db->getResultArray($queryStr); - if (!$resArr) + if ($resArr === false) return false; $versions = array(); From 39b02a3b9b28ffbb966da44932ac55da4b713385 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 24 Jan 2017 14:23:21 +0100 Subject: [PATCH 50/70] add new keys --- 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/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 ++ 24 files changed, 50 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 73b11db55..a95d21c30 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -751,6 +751,8 @@ URL: [url]', 'no_version_modification' => 'ﻻ ﺖﻋﺪﻴﻟ ﻊﻠﻳ ﺎﻠﻨﺴﺧﺓ', 'no_workflow_available' => '', 'objectcheck' => 'التحقق من مستند/مجلد', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'مهمل', 'october' => 'اكتوبر', 'old' => 'قديم', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index fabbb1cd7..fafc87338 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -658,6 +658,8 @@ $text = array( 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => 'Проверка на Папка/Документ', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Остарял', 'october' => 'октомври', 'old' => 'Стар', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 37f9a208a..701ee9426 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -663,6 +663,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => '', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Obsolet', 'october' => 'Octubre', 'old' => 'Vell', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 2bccebe1d..7d8923678 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -758,6 +758,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => 'workflow nedostupný', 'objectcheck' => 'kontrola adresáře/dokumentu', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Zastaralé', 'october' => 'Říjen', 'old' => 'Starý', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index f34776717..5fe78d0f7 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 (2362), dgrutsch (22) +// Translators: Admin (2364), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -762,6 +762,8 @@ URL: [url]', 'no_version_modification' => 'Keine Modifikationen an einer Version', 'no_workflow_available' => 'Kein Workflow verfügbar', 'objectcheck' => 'Ordner- und Dokumentenprüfung', +'object_check_critical' => 'Kritische Fehler', +'object_check_warning' => 'Warnungen', 'obsolete' => 'veraltet', 'october' => 'Oktober', 'old' => 'Alt', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 8e56d50a6..24ffdc2da 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -669,6 +669,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => '', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => '', 'october' => 'Οκτώβριος', 'old' => 'Παλιό', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index d15c7442b..2fcdf5436 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 (1489), dgrutsch (9), netixw (14) +// Translators: Admin (1491), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -763,6 +763,8 @@ URL: [url]', 'no_version_modification' => 'No version modification', 'no_workflow_available' => 'No workflow available', 'objectcheck' => 'Folder/Document check', +'object_check_critical' => 'Critical errors', +'object_check_warning' => 'Warnings', 'obsolete' => 'Obsolete', 'october' => 'October', 'old' => 'Old', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 8befdcd45..f74f28e6a 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -758,6 +758,8 @@ URL: [url]', 'no_version_modification' => 'Ninguna Modificación de Versión', 'no_workflow_available' => '', 'objectcheck' => 'Chequeo de carpeta/documento', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Obsoleto', 'october' => 'Octubre', 'old' => 'Viejo', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index aa4f149f4..69d82a356 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -763,6 +763,8 @@ URL: [url]', 'no_version_modification' => 'Pas de modification de version', 'no_workflow_available' => '', 'objectcheck' => 'Vérification des dossiers et documents', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Obsolète', 'october' => 'Octobre', 'old' => 'Ancien', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index efa8d315c..21b93625d 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -762,6 +762,8 @@ Internet poveznica: [url]', 'no_version_modification' => 'Nema modifikacije verzije', 'no_workflow_available' => 'Nema dostupnog toka rada', 'objectcheck' => 'Provjera mapa / dokumenata', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Zastarjelo', 'october' => 'Listopad', 'old' => 'Staro', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 695c99ac3..7c7cbdaee 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -758,6 +758,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => 'Mappa/Dokumentum ellenőrzés', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Elavult', 'october' => 'Október', 'old' => 'Régi', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index b879a4e45..ecdc6eb6e 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -764,6 +764,8 @@ URL: [url]', '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' => '', 'obsolete' => 'Obsoleto', 'october' => 'Ottobre', 'old' => 'Vecchio', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 1b0200aa2..8d283ad60 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -763,6 +763,8 @@ URL : [url]', 'no_version_modification' => '버전의 변동사항이 없습니다.', 'no_workflow_available' => '사용 가능한 워크 플로우 없습니다.', 'objectcheck' => '폴더 / 문서 확인', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => '폐기', 'october' => '10월', 'old' => '이전', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index eaf15d5c3..84dd22d9f 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -755,6 +755,8 @@ URL: [url]', 'no_version_modification' => 'Geen versiewijziging', 'no_workflow_available' => 'Geen workflow beschikbaar', 'objectcheck' => 'Map/Document controle', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'verouderd', 'october' => 'oktober', 'old' => 'Oude', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index a09091d66..b068aea39 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -751,6 +751,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => 'Sprawdź Katalog/Dokument', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Zdezaktualizowany', 'october' => 'Październik', 'old' => 'Stary', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index acee34809..576d44536 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -756,6 +756,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => 'Verificação da Pasta/Documento', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Obsolete', 'october' => 'October', 'old' => 'Antigo', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 74cb644e7..d710d8d45 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -763,6 +763,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => 'Nici un workflow disponibil', 'objectcheck' => 'Verificare folder/document', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Învechit', 'october' => 'Octombrie', 'old' => 'Vechi', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index ff730003a..6773d0a5e 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -762,6 +762,8 @@ URL: [url]', 'no_version_modification' => 'Отсутствует модификация версии', 'no_workflow_available' => 'Отсутствует процесс', 'objectcheck' => 'Проверка целостности', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Устарел', 'october' => 'Октябрь', 'old' => 'Старый', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index f524978a8..7c5ffe4ad 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -662,6 +662,8 @@ URL: [url]', 'no_version_modification' => 'Žiadne zmeny', 'no_workflow_available' => '', 'objectcheck' => 'Kontrola Adresárov/Dokumentov', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Zastaralé', 'october' => 'Október', 'old' => 'Stare', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 1c689fe75..bed554300 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -751,6 +751,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => 'Katalog/Dokument-kontroll', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Föråldrat', 'october' => 'oktober', 'old' => 'gammalt', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 6df64b41b..34e08b7d4 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -757,6 +757,8 @@ URL: [url]', 'no_version_modification' => 'Versiyon değişikliği yapılmamış', 'no_workflow_available' => 'Uygun iş akışı yok', 'objectcheck' => 'Klasör/Doküman kontrol', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Geçersiz', 'october' => 'Ekim', 'old' => 'Eski', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index e7dea96d8..0f03d32af 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -762,6 +762,8 @@ URL: [url]', 'no_version_modification' => 'Відсутня модифікація версії', 'no_workflow_available' => 'Немає доступних процесів', 'objectcheck' => 'Перевірка каталогу чи документа', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => 'Застарів', 'october' => 'Жовтень', 'old' => 'Старий', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 88cebe2c8..363971ab1 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -664,6 +664,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => '文件夹/文件检查', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => '过时的', 'october' => '十 月', 'old' => 'Old', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index ab1b92688..dce3e37bb 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -662,6 +662,8 @@ URL: [url]', 'no_version_modification' => '', 'no_workflow_available' => '', 'objectcheck' => '資料夾/檔檢查', +'object_check_critical' => '', +'object_check_warning' => '', 'obsolete' => '過時的', 'october' => '十 月', 'old' => 'Old', From bbcff75b00b7e8c16cd84938b75eb14a55b4bb42 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 09:52:16 +0100 Subject: [PATCH 51/70] create temp table for document revisions --- SeedDMS_Core/Core/inc.DBAccessPDO.php | 47 ++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php index 19ae61706..95935ca4b 100644 --- a/SeedDMS_Core/Core/inc.DBAccessPDO.php +++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php @@ -88,10 +88,15 @@ class SeedDMS_Core_DatabaseAccess { private $_ttcontentid; /** - * @var boolean set to true if temp. table for doc content has been created + * @var boolean set to true if temp. table for doc reception has been created */ private $_ttreceiptid; + /** + * @var boolean set to true if temp. table for doc revision has been created + */ + private $_ttrevisionid; + /** * @var boolean set to true if in a database transaction */ @@ -157,6 +162,7 @@ class SeedDMS_Core_DatabaseAccess { $this->_ttstatid = false; $this->_ttcontentid = false; $this->_ttreceiptid = false; + $this->_ttrevisionid = false; $this->_debug = false; } /* }}} */ @@ -341,7 +347,7 @@ class SeedDMS_Core_DatabaseAccess { } return $this->_ttreviewid; } - else if (!strcasecmp($tableName, "ttapproveid")) { + elseif (!strcasecmp($tableName, "ttapproveid")) { switch($this->_driver) { case 'sqlite': $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` AS ". @@ -374,7 +380,7 @@ class SeedDMS_Core_DatabaseAccess { } return $this->_ttapproveid; } - else if (!strcasecmp($tableName, "ttstatid")) { + elseif (!strcasecmp($tableName, "ttstatid")) { switch($this->_driver) { case 'sqlite': $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` AS ". @@ -407,7 +413,7 @@ class SeedDMS_Core_DatabaseAccess { } return $this->_ttstatid; } - else if (!strcasecmp($tableName, "ttcontentid")) { + elseif (!strcasecmp($tableName, "ttcontentid")) { switch($this->_driver) { case 'sqlite': $queryStr = "CREATE TEMPORARY TABLE `ttcontentid` AS ". @@ -473,6 +479,39 @@ class SeedDMS_Core_DatabaseAccess { } return $this->_ttreceiptid; } + elseif (!strcasecmp($tableName, "ttrevisionid")) { + switch($this->_driver) { + case 'sqlite': + $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` AS ". + "SELECT `tblDocumentRevisionLog`.`revisionID`, ". + "MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ". + "FROM `tblDocumentRevisionLog` ". + "GROUP BY `tblDocumentRevisionLog`.`revisionID` ". + "ORDER BY `maxLogID`"; + break; + default: + $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` (PRIMARY KEY (`revisionID`), INDEX (`maxLogID`)) ". + "SELECT `tblDocumentRevisionLog`.`revisionID`, ". + "MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ". + "FROM `tblDocumentRevisionLog` ". + "GROUP BY `tblDocumentRevisionLog`.`revisionID` ". + "ORDER BY `maxLogID`"; + } + if (!$this->_ttrevisionid) { + if (!$this->getResult($queryStr)) + return false; + $this->_ttrevisionid=true; + } + else { + if (is_bool($override) && $override) { + if (!$this->getResult("DELETE FROM `ttrevisionid`")) + return false; + if (!$this->getResult($queryStr)) + return false; + } + } + return $this->_ttrevisionid; + } return false; } /* }}} */ From 761247fe0decdd75f775b97a89ec07b46b17eafc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 09:52:48 +0100 Subject: [PATCH 52/70] add new methods getDocumentsInReception() and getDocumentsInRevision() --- SeedDMS_Core/Core/inc.ClassDMS.php | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 82e08e329..6f1879dc9 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -2726,6 +2726,44 @@ class SeedDMS_Core_DMS { return $transition; } /* }}} */ + /** + * Return all documents waiting for or in reception + * + * This function retrieves all documents and its version which are waiting for + * reception + * + * @return object instance of {@link SeedDMS_Core_DocumentContent} or false + */ + function getDocumentsInReception() { /* {{{ */ + if (!$this->db->createTemporaryTable("ttreceiptid") || !$this->db->createTemporaryTable("ttcontentid")) { + return false; + } + $queryStr = + "SELECT `tblDocumentRecipients`.* FROM `tblDocumentRecipients` LEFT JOIN `ttreceiptid` ON `tblDocumentRecipients`.`receiptID` = `ttreceiptid`.`receiptID` LEFT JOIN `tblDocumentReceiptLog` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` AND `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` WHERE `tblDocumentReceiptLog`.`status`=0 AND `ttcontentid`.`maxVersion` IS NOT NULL"; + $resArr = $this->db->getResultArray($queryStr); + + return $resArr; + } /* }}} */ + + /** + * Return all documents waiting for or in revision + * + * This function retrieves all documents and its version which are waiting for + * revision or already in revision + * + * @return object instance of {@link SeedDMS_Core_DocumentContent} or false + */ + function getDocumentsInRevision() { /* {{{ */ + if (!$this->db->createTemporaryTable("ttrevisionid") || !$this->db->createTemporaryTable("ttcontentid")) { + return false; + } + $queryStr = + "SELECT `tblDocumentRevisors`.* FROM `tblDocumentRevisors` LEFT JOIN `ttrevisionid` ON `tblDocumentRevisors`.`revisionID` = `ttrevisionid`.`revisionID` LEFT JOIN `tblDocumentRevisionLog` ON `ttrevisionid`.`maxLogID` = `tblDocumentRevisionLog`.`revisionLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` AND `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` WHERE `tblDocumentRevisionLog`.`status` in (0, -3) AND `ttcontentid`.`maxVersion` IS NOT NULL"; + $resArr = $this->db->getResultArray($queryStr); + + return $resArr; + } /* }}} */ + /** * Returns document content which is not linked to a document * From 69e1bb66ad9647d77f49eec350b214e35a9b04be Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 09:53:18 +0100 Subject: [PATCH 53/70] list documents in revision/reception without access --- out/out.ObjectCheck.php | 36 ++++++++++ views/bootstrap/class.ObjectCheck.php | 98 +++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index f54d6b53e..cd764ad20 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -71,6 +71,36 @@ $unlinkeddocuments = $dms->checkDocuments(); $nofilesizeversions = $dms->getNoFileSizeDocumentContent(); $nochecksumversions = $dms->getNoChecksumDocumentContent(); $duplicateversions = $dms->getDuplicateDocumentContent(); +$tmprevs = $dms->getDocumentsInRevision(); +$docsinrevision = array(); +foreach($tmprevs as $rev) { + if($doc = $dms->getDocument($rev['documentID'])) { + if($rev['type'] == 0) { + $ruser = $dms->getUser($rev['required']); + $mode = $doc->getAccessMode($ruser); + } elseif($rev['type'] == 1) { + $rgroup = $dms->getGroup($rev['required']); + $mode = $doc->getGroupAccessMode($rgroup); + } + if($mode < M_READ) + $docsinrevision[] = $doc; + } +} +$tmprevs = $dms->getDocumentsInReception(); +$docsinreception = array(); +foreach($tmprevs as $rev) { + if($doc = $dms->getDocument($rev['documentID'])) { + if($rev['type'] == 0) { + $ruser = $dms->getUser($rev['required']); + $mode = $doc->getAccessMode($ruser); + } elseif($rev['type'] == 1) { + $rgroup = $dms->getGroup($rev['required']); + $mode = $doc->getGroupAccessMode($rgroup); + } + if($mode < M_READ) + $docsinreception[] = $doc; + } +} $rootfolder = $dms->getFolder($settings->_rootFolderID); function repair_tree($dms, $user, $folder, $path=':') { /* {{{ */ @@ -133,12 +163,18 @@ if($view) { $view->setParam('nofilesizeversions', $nofilesizeversions); $view->setParam('nochecksumversions', $nochecksumversions); $view->setParam('duplicateversions', $duplicateversions); + $view->setParam('docsinrevision', $docsinrevision); + $view->setParam('docsinreception', $docsinreception); $view->setParam('unlink', $unlink); $view->setParam('setfilesize', $setfilesize); $view->setParam('setchecksum', $setchecksum); $view->setParam('repair', $repair); $view->setParam('rootfolder', $rootfolder); $view->setParam('repairobjects', $repairobjects); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); + $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('accessobject', $accessop); $view($_GET); exit; diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index c8a23232a..a234312d7 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -18,6 +18,11 @@ */ require_once("class.Bootstrap.php"); +/** + * Include class to preview documents + */ +require_once("SeedDMS/Preview.php"); + /** * Class which outputs the html page for ObjectCheck view * @@ -31,6 +36,55 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { + protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */ + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; + + print ""; + print "\n\n"; + print "\n"; + if($order) + print "\n"; + else + print "\n"; + if($order) + print "\n"; + else + print "\n"; + print "\n"; + print "\n\n\n"; + } /* }}} */ + + protected function printListFooter() { /* {{{ */ + echo "\n
      ".getMLText("name")." ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '' : '') : '')." · ".getMLText("last_update")." ".($orderby == 'u' ? ($orderdir == 'desc' ? '' : '') : '')." · ".getMLText("expires")." ".($orderby == 'e' ? ($orderdir == 'desc' ? '' : '') : '')."".getMLText("name")."".getMLText("status")."".($orderby == 's' ? " ".($orderdir == 'desc' ? '' : '') : '')."".getMLText("status")."".getMLText("action")."
      "; + } /* }}} */ + + protected function printList($resArr, $previewer, $order=false) { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + + $this->printListHeader($resArr, $previewer, $order); + $noaccess = 0; + foreach ($resArr as $document) { + $document->verifyLastestContentExpriry(); + + if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { + $txt = $this->callHook('documentListItem', $document, $previewer, false); + if(is_string($txt)) + echo $txt; + else + echo $this->documentListRow($document, $previewer, false); + } else { + $noaccess++; + } + } + $this->printListFooter(); + + if($noaccess) { + $this->warningMsg(getMLText('list_contains_no_access_docs', array('count'=>$noaccess))); + } + } /* }}} */ + function _tree($dms, $user, $folder, $path=':') { /* {{{ */ $objects = array(); @@ -459,6 +513,46 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } } /* }}} */ + function listDocsInRevisionNoAccess() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $docsinrevision = $this->params['docsinrevision']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); + + $this->contentHeading(getMLText("docs_in_revision_no_access")); + + if($docsinrevision) { + $this->printList($docsinrevision, $previewer, 'listDocsInRevisionNoAccess'); + } + } /* }}} */ + + function listDocsInReceptionNoAccess() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $docsinreception = $this->params['docsinreception']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); + + $this->contentHeading(getMLText("docs_in_revision_no_access")); + + if($docsinreception) { + $this->printList($docsinreception, $previewer, 'listDocsInReceptionNoAccess'); + } + } /* }}} */ + function js() { /* {{{ */ $user = $this->params['user']; $folder = $this->params['folder']; @@ -494,6 +588,8 @@ $(document).ready( function() { $nofilesizeversions = $this->params['nofilesizeversions']; $nochecksumversions = $this->params['nochecksumversions']; $duplicateversions = $this->params['duplicateversions']; + $docsinrevision = $this->params['docsinrevision']; + $docsinreception = $this->params['docsinreception']; $repair = $this->params['repair']; $unlink = $this->params['unlink']; $setfilesize = $this->params['setfilesize']; @@ -523,6 +619,8 @@ $(document).ready( function() { $this->contentHeading(getMLText("object_check_warning")); echo ''; echo ''; echo '
      '; From 86530371f4c436d83e18e266db2b7adfc8f83af1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 09:55:15 +0100 Subject: [PATCH 54/70] add changes to 5.1.2 --- SeedDMS_Core/package.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index b68cd9576..f50417b77 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -28,6 +28,9 @@ - SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus() only return entries of the latest document version if not specific document and version is passed +- temp. table for revisions can be created +- new methods SeedDMS_Core_DMS::getDocumentsInReception() and +SeedDMS_Core_DMS::getDocumentsInRevision() From 2077cd6bcb5786164bc852abab8ae9751aff14d4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 09:56:52 +0100 Subject: [PATCH 55/70] add items to 5.1.2 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index aa76d4197..1572e8d29 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,8 @@ - add list of documents waiting for reception on MyDocuments page - group document lists on MyDocuments page into three sections - show progressbar and comments for reception of document in documentlist +- restructure page for document/folder check, add check for missing access + on documents by recipient or revisor -------------------------------------------------------------------------------- Changes in version 5.1.1 From cf65fe96053667e130ea726b7b60ab7065a718da Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 10:00:23 +0100 Subject: [PATCH 56/70] add new keys --- 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/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 ++ 24 files changed, 50 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index a95d21c30..ef963df37 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -294,6 +294,8 @@ URL: [url]', 'de_DE' => 'الألمانية', 'disclaimer' => 'هذه المنطقة محظورة. الدخول فقط مسموح للموظفين المعتمدين. اي اختراق سيتم التعامل معه وفقا للقوانين المحلية والدولية.', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'المستند', 'documentcontent' => '', 'documents' => 'المستندات', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index fafc87338..0db8f8784 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -279,6 +279,8 @@ $text = array( 'de_DE' => '', 'disclaimer' => 'Работим аккуратно и задълбочено. От това зависи бъдeщето на нашата страна и благополучието на народа.nПетилетката за три години!nДа не оставим неодрусана слива в наше село!', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Документ', 'documentcontent' => '', 'documents' => 'Документи', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 701ee9426..e7f5e47d7 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -284,6 +284,8 @@ URL: [url]', 'de_DE' => 'Alemany', 'disclaimer' => 'Aquesta és una àrea restringida. Només es permet l\'accés a usuaris autoritzats. Qualsevol intrusió es perseguirà d\'acord amb les lleis internacionals.', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Document', 'documentcontent' => '', 'documents' => 'Documents', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 7d8923678..66612025e 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -301,6 +301,8 @@ URL: [url]', 'de_DE' => 'Němčina', 'disclaimer' => 'Toto je neveřejná oblast. Přístup povolen pouze oprávněným uživatelům. Jakékoliv narušení bude stíháno podle platných právních norem.', 'discspace' => 'Místo na disku', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Dokument', 'documentcontent' => '', 'documents' => 'Dokumenty', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 5fe78d0f7..b7c1b3d5b 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 (2364), dgrutsch (22) +// Translators: Admin (2366), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -306,6 +306,8 @@ URL: [url]', 'de_DE' => 'Deutsch', 'disclaimer' => 'Dies ist ein geschützter Bereich. Nur authorisiertes Personal hat Zugriff. Jegliche Verstöße werden nach geltendem Recht (Englisch und International) verfolgt.', 'discspace' => 'Plattenplatz', +'docs_in_reception_no_access' => 'Dokumente mit Empfangsbestätigung ohne Zugriff des Empfängers', +'docs_in_revision_no_access' => 'Dokumente in Revision ohne Zugriff des Prüfers', 'document' => 'Dokument', 'documentcontent' => 'Dokumentenversion', 'documents' => 'Dokumente', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 24ffdc2da..ad93374b1 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -279,6 +279,8 @@ $text = array( 'de_DE' => 'German/Γερμανικά', 'disclaimer' => '', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Έγγραφο', 'documentcontent' => '', 'documents' => 'Έγγραφα', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 2fcdf5436..aff121206 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 (1491), dgrutsch (9), netixw (14) +// Translators: Admin (1493), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -306,6 +306,8 @@ URL: [url]', 'de_DE' => 'German', 'disclaimer' => 'This is a classified area. Access is permitted only to authorized personnel. Any violation will be prosecuted according to the national and international laws.', 'discspace' => 'Disc space', +'docs_in_reception_no_access' => 'Documents with recepiton without access by recipient', +'docs_in_revision_no_access' => 'Documents in revision without access by revisor', 'document' => 'Document', 'documentcontent' => 'Document content', 'documents' => 'Documents', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index f74f28e6a..d56dd21e4 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -301,6 +301,8 @@ URL: [url]', 'de_DE' => 'Aleman', 'disclaimer' => 'Esta es un área restringida. Se permite el acceso únicamente a personal autorizado. Cualquier intrusión se perseguirá conforme a las leyes internacionales.', 'discspace' => 'Espacio en disco', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Documento', 'documentcontent' => '', 'documents' => 'Documentos', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 69d82a356..5d7238384 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -306,6 +306,8 @@ URL: [url]', 'de_DE' => 'Allemand', 'disclaimer' => 'Cet espace est protégé. Son accès est strictement réservé aux utilisateurs autorisés.
      Tout accès non autorisé est punissable par les lois internationales.', 'discspace' => 'Espace disque', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Document', 'documentcontent' => '', 'documents' => 'Documents', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 21b93625d..c7ca21f5e 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -306,6 +306,8 @@ Internet poveznica: [url]', 'de_DE' => 'Njemački', 'disclaimer' => 'Ovo je klasificirano područje. Pristup je omogućen samo ovlaštenim osobama. Sa svakim kršenjem bit će postupano sukladno nacionalnim i međunarodnim zakonima.', 'discspace' => 'Prostor na disku', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Dokument', 'documentcontent' => '', 'documents' => 'Dokumenti', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 7c7cbdaee..9ae96862e 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -301,6 +301,8 @@ URL: [url]', 'de_DE' => 'Német', 'disclaimer' => 'Ez egy bizalmas terület. Hozzáférés kizárólag a meghatalmazott személyek részére engedélyezett. Bárminemű megsértését a nemzeti, illetve a nemzetközi jog szerint fogják büntetni.', 'discspace' => 'Lemezterület', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Dokumentum', 'documentcontent' => '', 'documents' => 'Dokumentumok', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index ecdc6eb6e..382559be4 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -307,6 +307,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' => '', 'document' => 'Documento', 'documentcontent' => '', 'documents' => 'Documenti', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 8d283ad60..f8ae12238 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -308,6 +308,8 @@ URL: [url]', 'de_DE' => '독일어', 'disclaimer' => '본 사이트는 접근이 허가된 자에게만 사용이 허용된 곳 입니다. 허가받지 않은 접근이나 불법행위는 국내 및 국제법에 따라 기소 될 것입니다.', 'discspace' => '디스크 공간', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => '문서', 'documentcontent' => '', 'documents' => '문서', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 84dd22d9f..139e9a822 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -299,6 +299,8 @@ URL: [url]', 'de_DE' => 'Duits', 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.', 'discspace' => 'Schijfruimte', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Document', 'documentcontent' => '', 'documents' => 'Documenten', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index b068aea39..1fd9926d9 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -294,6 +294,8 @@ URL: [url]', 'de_DE' => 'niemiecki', 'disclaimer' => 'To jest zastrzeżona strefa. Dostęp do niej ma wyłącznie wyznaczony personel. Wszelkie naruszenia będą ścigane zgodnie z prawem krajowym i międzynarodowym.', 'discspace' => 'Miejsce na dysku', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Dokument', 'documentcontent' => '', 'documents' => 'Dokumenty', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 576d44536..2b4ff6e33 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -301,6 +301,8 @@ URL: [url]', 'de_DE' => 'Alemão', 'disclaimer' => 'Esta é uma área restrita, o acesso é permitido apenas ao pessoal autorizado. Qualquer violação será tratado de acordo com as normas internas e leis vigentes.', 'discspace' => 'Espaço em Disco', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Documento', 'documentcontent' => '', 'documents' => 'Documentos', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index d710d8d45..0eed5ad8e 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -306,6 +306,8 @@ URL: [url]', 'de_DE' => 'Germana', 'disclaimer' => 'Aceasta este o zonă clasificată. Accesul este permis numai personalului autorizat. Orice încălcare va fi urmărită penal în conformitate cu legile naționale și internaționale.', 'discspace' => 'Spațiu pe disc', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Document', 'documentcontent' => '', 'documents' => 'Documente', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 6773d0a5e..e85f6448e 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -306,6 +306,8 @@ URL: [url]', 'de_DE' => 'German', 'disclaimer' => 'Работник, помни! От тебя зависит успех фирмы и всей страны!', 'discspace' => 'Дисковое пространство', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Документ', 'documentcontent' => '', 'documents' => 'док.', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 7c5ffe4ad..ebe8543f3 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -283,6 +283,8 @@ URL: [url]', 'de_DE' => 'Nemčina', 'disclaimer' => 'Toto je zabezpečená zóna. Prístup je povolený len autorizovaným osobám.', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Dokument', 'documentcontent' => '', 'documents' => 'Dokumenty', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index bed554300..49ae7ce04 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -294,6 +294,8 @@ URL: [url]', 'de_DE' => 'tyska', 'disclaimer' => 'Detta är ett sekretessbelagt område. Bara auktoriserade personer äger tillträde. Vid överträdelse kommer åtal att väckas i enlighet med nationella och internationella lagar.', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Dokument', 'documentcontent' => '', 'documents' => 'Dokument', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 34e08b7d4..9e89d5f76 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -300,6 +300,8 @@ URL: [url]', 'de_DE' => 'Almanca', 'disclaimer' => 'Bu sisteme sadece yetkilendirilmiş personel yetki seviyesine göre erişebilir. Herhangi bir ihlalde veya ihlal girişiminde, ulusal ve uluslararası yasalara göre takibat yapılacaktır.', 'discspace' => 'Disk alanı', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Doküman', 'documentcontent' => '', 'documents' => 'Dokümanlar', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 0f03d32af..e620c91d9 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -306,6 +306,8 @@ URL: [url]', 'de_DE' => 'German', 'disclaimer' => 'Авторизована зона. Несанкціонований доступ переслідується згідно національного законодавства.', 'discspace' => 'Дисковий простір', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => 'Документ', 'documentcontent' => '', 'documents' => 'док.', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 363971ab1..710202cd4 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -285,6 +285,8 @@ URL: [url]', 'de_DE' => '德国语', 'disclaimer' => '警告：这是机密区.只有授权用户才被允许访问.任何违反行为将受到法律制裁', 'discspace' => '磁盘空间', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => '文档', 'documentcontent' => '', 'documents' => '文档', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index dce3e37bb..ae0f57797 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -283,6 +283,8 @@ URL: [url]', 'de_DE' => '德國語', 'disclaimer' => '警告：這是機密區.只有授權使用者才被允許訪問.任何違反行為將受到法律制裁', 'discspace' => '', +'docs_in_reception_no_access' => '', +'docs_in_revision_no_access' => '', 'document' => '文檔', 'documentcontent' => '', 'documents' => '文檔', From 475239e1ba1c547ce615552e1715fbaa93a0cdbb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 10:43:21 +0100 Subject: [PATCH 57/70] turn of sorting in lists --- views/bootstrap/class.ObjectCheck.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index a234312d7..61284bae8 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -37,15 +37,15 @@ require_once("SeedDMS/Preview.php"); class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */ - $orderby = $this->params['orderby']; - $orderdir = $this->params['orderdir']; - print ""; print "\n\n"; print "\n"; - if($order) + if($order) { + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; + print "\n"; - else + } else print "\n"; if($order) print "\n"; @@ -529,7 +529,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { $this->contentHeading(getMLText("docs_in_revision_no_access")); if($docsinrevision) { - $this->printList($docsinrevision, $previewer, 'listDocsInRevisionNoAccess'); + $this->printList($docsinrevision, $previewer); } } /* }}} */ From 99a83c0d9799f921f108d198d248f746f85c35e5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 10:43:43 +0100 Subject: [PATCH 58/70] set showtree in view --- out/out.ObjectCheck.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index cd764ad20..a55f48876 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -156,6 +156,7 @@ $repairobjects = repair_tree($dms, $user, $folder); if($view) { $view->setParam('folder', $folder); + $view->setParam('showtree', showtree()); $view->setParam('listtype', $listtype); $view->setParam('unlinkedcontent', $unlinkedversions); $view->setParam('unlinkedfolders', $unlinkedfolders); From ec4712b5bfff0e307b1aa30615e5eebec17f1074 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 11:54:36 +0100 Subject: [PATCH 59/70] limit sql statement in getDuplicateDocumentContent() to 1000 hits --- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 6f1879dc9..c1aecad96 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -2846,7 +2846,7 @@ class SeedDMS_Core_DMS { * in version 4.0.0 of SeedDMS for finding duplicates. */ function getDuplicateDocumentContent() { /* {{{ */ - $queryStr = "SELECT a.*, b.id as dupid FROM tblDocumentContent a LEFT JOIN tblDocumentContent b ON a.checksum=b.checksum where a.id!=b.id ORDER by a.id"; + $queryStr = "SELECT a.*, b.id as dupid FROM tblDocumentContent a LEFT JOIN tblDocumentContent b ON a.checksum=b.checksum where a.id!=b.id ORDER by a.id LIMIT 1000"; $resArr = $this->db->getResultArray($queryStr); if (!$resArr) return false; From cf3dba89e015cd17760b3a251f0ad6632ccea61d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 11:55:33 +0100 Subject: [PATCH 60/70] add note to 5.1.2 --- SeedDMS_Core/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index f50417b77..e0b0694c0 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -31,6 +31,7 @@ version is passed - temp. table for revisions can be created - new methods SeedDMS_Core_DMS::getDocumentsInReception() and SeedDMS_Core_DMS::getDocumentsInRevision() +- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000 From f4648a70233bc690b9694184ad6a646f3c8cab2d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 11:56:01 +0100 Subject: [PATCH 61/70] take out old function tree(), fix listing missing checksums --- views/bootstrap/class.ObjectCheck.php | 207 +------------------------- 1 file changed, 1 insertion(+), 206 deletions(-) diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 61284bae8..ac74a3cf3 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -85,211 +85,6 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { } } /* }}} */ - function _tree($dms, $user, $folder, $path=':') { /* {{{ */ - - $objects = array(); - - /* Don't do folderlist check for root folder */ - if($path != ':') { - /* If the path contains a folder id twice, the a cyclic relation - * exists. - */ - $tmparr = explode(':', $path); - array_shift($tmparr); - if(count($tmparr) != count(array_unique($tmparr))) { - $objects[] = array('object'=>$folder, 'msg'=>'Folder path contains cyclic relation'); - } - $folderList = $folder->getFolderList(); - /* Check the folder */ - if($folderList != $path) { - $objects[] = array('object'=>$folder, 'msg'=>"Folderlist is '".$folderList."', should be '".$path); - } - } - - $subfolders = $folder->getSubFolders(); - foreach($subfolders as $subfolder) { - $objects = array_merge($objects, $this->_tree($dms, $user, $subfolder, $path.$folder->getId().':')); - } - $path .= $folder->getId().':'; - $documents = $folder->getDocuments(); - foreach($documents as $document) { - /* Check the folder list of the document */ - $folderList = $document->getFolderList(); - if($folderList != $path) { - $objects[] = array('object'=>$document, 'msg'=>"Folderlist is '".$folderList."', should be '".$path); - } - - /* Check if the content is available */ - $versions = $document->getContent(); - if($versions) { - foreach($versions as $version) { - $filepath = $dms->contentDir . $version->getPath(); - if(!file_exists($filepath)) { - $objects[] = array('object'=>$version, 'msg'=>'Document content is missing'); - } - } - } else { - $objects[] = array('object'=>$version, 'msg'=>'Document has no content at all'); - } - } - - return $objects; - } /* }}} */ - - function tree($dms, $folder, $repair, $path=':', $indent='') { /* {{{ */ - global $user; - - /* Don't do folderlist check for root folder */ - if($path != ':') { - /* If the path contains a folder id twice, the a cyclic relation - * exists. - */ - $tmparr = explode(':', $path); - array_shift($tmparr); - if(count($tmparr) != count(array_unique($tmparr))) { - print "\n"; - print ""; - print ""; - - $owner = $folder->getOwner(); - print ""; - print ""; - if($repair) { - print "\n"; - } else { - print "\n"; - } - print "\n"; - } - $folderList = $folder->getFolderList(); - /* Check the folder */ - if($folderList != $path) { - print "\n"; - $this->needsrepair = true; - print ""; - print ""; - - $owner = $folder->getOwner(); - print ""; - print ""; - if($repair) { - $folder->repair(); - print "\n"; - } else { - print "\n"; - } - print "\n"; - } - } - - $subfolders = $folder->getSubFolders(); - foreach($subfolders as $subfolder) { - $this->tree($dms, $subfolder, $repair, $path.$folder->getId().':', $indent.' '); - } - $path .= $folder->getId().':'; - $documents = $folder->getDocuments(); - foreach($documents as $document) { - /* Check the folder list of the document */ - $folderList = $document->getFolderList(); - if($folderList != $path) { - print "\n"; - $this->needsrepair = true; - $lc = $document->getLatestContent(); - print ""; - print ""; - $owner = $document->getOwner(); - print ""; - print ""; - if($repair) { - $document->repair(); - print "\n"; - } else { - print "\n"; - } - print "\n"; - } - - /* Check if the content is available */ - $versions = $document->getContent(); - if($versions) { - foreach($versions as $version) { - $filepath = $dms->contentDir . $version->getPath(); - if(!file_exists($filepath)) { - print "\n"; - print "getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; - print ""; - print ""; - $owner = $document->getOwner(); - print ""; - print ""; - if($repair) { - print "\n"; - } else { - print "\n"; - } - echo ""; - print "\n"; - } - } - } else { - print "\n"; - print "\n"; - print ""; - $owner = $document->getOwner(); - print ""; - print ""; - print "\n"; - } - } - } /* }}} */ - function listRepair() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -614,7 +409,7 @@ $(document).ready( function() { echo '
    • '.count($unlinkeddocuments).''.getMLText("unlinked_documents").'
      • '; echo '
    • '.count($unlinkedcontent).''.getMLText("unlinked_content").'
      • '; echo '
    • '.count($nofilesizeversions).''.getMLText("missing_filesize").'
      • '; - echo '
    • '.count($nochecksumversions).''.getMLText("missing_checksum").'
      • '; + echo '
    • '.count($nochecksumversions).''.getMLText("missing_checksum").'
      • '; echo ''; $this->contentHeading(getMLText("object_check_warning")); echo '
        '; From 40956e9501e559e0388f4c2dca7710aabda90cce Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 12:24:47 +0100 Subject: [PATCH 62/70] =?UTF-8?q?pa=D1=95s=20owner=20to=20controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/class.AddDocument.php | 3 ++- op/op.AddDocument.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php index 4a8948fe3..a4e151f89 100644 --- a/controllers/class.AddDocument.php +++ b/controllers/class.AddDocument.php @@ -43,6 +43,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $expires = $this->getParam('expires'); $keywords = $this->getParam('keywords'); $cats = $this->getParam('categories'); + $owner = $this->getParam('owner'); $userfiletmp = $this->getParam('userfiletmp'); $userfilename = $this->getParam('userfilename'); $filetype = $this->getParam('filetype'); @@ -64,7 +65,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $result = $this->callHook('addDocument'); if($result === null) { $filesize = SeedDMS_Core_File::fileSize($userfiletmp); - $res = $folder->addDocument($name, $comment, $expires, $user, $keywords, + $res = $folder->addDocument($name, $comment, $expires, $owner, $keywords, $cats, $userfiletmp, basename($userfilename), $filetype, $userfiletype, $sequence, $reviewers, $approvers, $reqversion, diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index fb3fc8d4f..325733b42 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -367,6 +367,7 @@ for ($file_num=0;$file_numsetParam('expires', $expires); $controller->setParam('keywords', $keywords); $controller->setParam('categories', $cats); + $controller->setParam('owner', $owner); $controller->setParam('userfiletmp', $userfiletmp); $controller->setParam('userfilename', $userfilename); $controller->setParam('filetype', $fileType); From b07cd2d44297e46bf5d76bbc11180b201d570750 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 14:48:12 +0100 Subject: [PATCH 63/70] fix getRevisionStatus() it didn't always return the last entry of the revision log --- SeedDMS_Core/Core/inc.ClassGroup.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php index 16cafc9bb..3c8afed0f 100644 --- a/SeedDMS_Core/Core/inc.ClassGroup.php +++ b/SeedDMS_Core/Core/inc.ClassGroup.php @@ -461,18 +461,24 @@ class SeedDMS_Core_Group { /* {{{ */ $status = array(); + if (!$db->createTemporaryTable("ttcontentid")) { + return false; + } // See if the group is assigned as a revisor. $queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ". "`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ". "`tblDocumentRevisionLog`.`userID` ". "FROM `tblDocumentRevisors` ". "LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ". + "LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` AND `ttcontentid`.`document` = `tblDocumentRevisors`.`documentID` ". "WHERE `tblDocumentRevisors`.`type`='1' ". ($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' "). ($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' "). - "AND `tblDocumentRevisors`.`required`='". $this->_id ."' "; + ($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` " : ""). + "AND `tblDocumentRevisors`.`required`='". $this->_id ."' ". + "ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC"; $resArr = $db->getResultArray($queryStr); - if (is_bool($resArr) && $resArr == false) + if ($resArr === false) return false; if (count($resArr)>0) { $status['status'] = array(); From c98ff369777abfd5df0668505a5ccea915ac3ff9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 14:49:05 +0100 Subject: [PATCH 64/70] minor uncrucial corrections --- SeedDMS_Core/Core/inc.ClassUser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 5edd89255..0369cd2ed 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -1504,9 +1504,10 @@ class SeedDMS_Core_User { /* {{{ */ "AND `tblDocumentRevisors`.`required`='". $this->_id ."' ". "ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC"; $resArr = $db->getResultArray($queryStr); - if (is_bool($resArr) && $resArr === false) + if ($resArr === false) return false; if (count($resArr)>0) { + $status['indstatus'] = array(); foreach ($resArr as $res) { if($res['date']) { if(isset($status["indstatus"][$res['documentID']])) { From 0d5f7a607a0d782631deea21fa85e74e0e9c7725 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 14:49:37 +0100 Subject: [PATCH 65/70] finishRevision() puts document version in to 'waiting' need to be able to start a new revision --- SeedDMS_Core/Core/inc.ClassDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 936c2e4b9..9379ea3fd 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -4805,6 +4805,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ /* Does it make sense to put all revisions into sleeping mode? I guess * not. If a document was released or rejected the revision are useless * anyway + */ foreach($revisionStatus as $status) { if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) { $queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, @@ -4819,7 +4820,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } } } - */ if(!$this->setStatus($docstatus, $docmsg, $requestUser)) { $db->rollbackTransaction(); return false; From b90d1a6be5958327ec784af0a33f4561d70c1b70 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 14:51:38 +0100 Subject: [PATCH 66/70] pass comment to finishRevision() --- controllers/class.ReviseDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php index 323ee0784..7ed205668 100644 --- a/controllers/class.ReviseDocument.php +++ b/controllers/class.ReviseDocument.php @@ -52,7 +52,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common { } elseif ($revisiontype == "grp") { if(0 > $content->setRevision($group, $user, $revisionstatus, $comment)) { $this->error = 1; - $this->errormsg = "revision_update_failed"; + $this->errormsg = $ll."revision_update_failed"; return false; } } @@ -90,7 +90,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common { // then release the document otherwise put it back into revision workflow if ($revisionCT == $revisionTotal) { $newStatus=S_RELEASED; - if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) { + if ($content->finishRevision($user, $newStatus, 'Finished revision workflow', getMLText("automatic_status_update"))) { if(!$this->callHook('finishReviseDocument', $content)) { } } From a7ea0743287f7f27c0ead471d2c5cb5ed042c91f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 14:53:23 +0100 Subject: [PATCH 67/70] set formtoken in button to sustitute user --- views/bootstrap/class.UsrMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index a54b43831..5e2e8b8e5 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -142,7 +142,7 @@ $(document).ready( function() { echo "
      ".getMLText("name")." ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '' : '') : '')." · ".getMLText("last_update")." ".($orderby == 'u' ? ($orderdir == 'desc' ? '' : '') : '')." · ".getMLText("expires")." ".($orderby == 'e' ? ($orderdir == 'desc' ? '' : '') : '')."".getMLText("name")."".getMLText("status")."".($orderby == 's' ? " ".($orderdir == 'desc' ? '' : '') : '')."
      getID()."\">getID()."\">"; - print htmlspecialchars($path); - print "".htmlspecialchars($owner->getFullName())."Folder path contains cyclic relation".getMLText('repaired')."
      getID()."\">getID()."\">"; - $tmppath = $folder->getPath(); - for ($i = 1; $i < count($tmppath); $i++) { - print "/".htmlspecialchars($tmppath[$i]->getName()); - } - print "".htmlspecialchars($owner->getFullName())."Folderlist is '".$folderList."', should be '".$path."'".getMLText('repaired')."
      getID()."\">getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\">getID()."\">/"; - $folder = $document->getFolder(); - $tmppath = $folder->getPath(); - for ($i = 1; $i < count($tmppath); $i++) { - print htmlspecialchars($tmppath[$i]->getName())."/"; - } - print htmlspecialchars($document->getName()); - print "".htmlspecialchars($owner->getFullName())."Folderlist is '".$folderList."', should be '".$path."'".getMLText('repaired')."
      getID()."\">getMimeIcon($version->getFileType())."\" title=\"".$version->getMimeType()."\">getID()."\">/"; - $folder = $document->getFolder(); - $tmppath = $folder->getPath(); - for ($i = 1; $i < count($tmppath); $i++) { - print htmlspecialchars($tmppath[$i]->getName())."/"; - } - print htmlspecialchars($document->getName()); - print "".htmlspecialchars($owner->getFullName())."Document content of version ".$version->getVersion()." is missing ('".$path."')Cannot repaired"; - echo "
      "; - if($document->getAccessMode($user) >= M_ALL) { - echo $this->printDeleteDocumentButton($document, 'splash_rm_document', true); - } else { - echo ''; - } - if($document->getAccessMode($user) >= M_READWRITE) { - print ''; - } else { - print ''; - } - if($document->getAccessMode($user) >= M_READWRITE) { - print $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true); - } - if($this->enableClipboard) { - print ''; - } - echo "
      "; - echo "
      getID()."\">/"; - $folder = $document->getFolder(); - $tmppath = $folder->getPath(); - for ($i = 1; $i < count($tmppath); $i++) { - print htmlspecialchars($tmppath[$i]->getName())."/"; - } - print htmlspecialchars($document->getName()); - print "".htmlspecialchars($owner->getFullName())."Document has no content! Delete the document manually.
      "; if($user->isAdmin() && $seluser->getID() != $user->getID()) - echo "getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."\n"; + echo "getID())."&formtoken=".createFormKey('substituteuser')."\"> ".getMLText('substitute_user')." "; } } /* }}} */ From 247f27fa548ec4c095ffeac1a1df0f92f6e537fc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 14:58:41 +0100 Subject: [PATCH 68/70] add more notes to 5.1.2 --- SeedDMS_Core/package.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index e0b0694c0..20c3ed153 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -32,6 +32,9 @@ version is passed - new methods SeedDMS_Core_DMS::getDocumentsInReception() and SeedDMS_Core_DMS::getDocumentsInRevision() - limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000 +- finishRevsion() puts all revisors into state waiting, so a new revision can be started +- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last +log entry first From efa316dbf8b9f2a1c94f2c11a8cc35079f0b331c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 15:09:51 +0100 Subject: [PATCH 69/70] propperly set defaultaccess --- controllers/class.AddDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php index a4e151f89..14cd6448b 100644 --- a/controllers/class.AddDocument.php +++ b/controllers/class.AddDocument.php @@ -60,7 +60,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { $notificationusers = $this->getParam('notificationusers'); $initialdocumentstatus = $this->getParam('initialdocumentstatus'); $maxsizeforfulltext = $this->getParam('maxsizeforfulltext'); - $defaultAccessDocs = $this->getParam('defaultaccessdocs'); + $defaultaccessdocs = $this->getParam('defaultaccessdocs'); $result = $this->callHook('addDocument'); if($result === null) { From 94cf01710250e24e9b1d44cb52b09179f6aa2296 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 25 Jan 2017 15:11:12 +0100 Subject: [PATCH 70/70] add entry to 5.1.2 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 1572e8d29..912558317 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ - show progressbar and comments for reception of document in documentlist - restructure page for document/folder check, add check for missing access on documents by recipient or revisor +- overhaul revision workflow, add hook after revision workflow was finished -------------------------------------------------------------------------------- Changes in version 5.1.1