From b8a7917c1213951c7d116a56d4e35e89e23decdc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 18 Jan 2017 14:23:16 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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