From a002ebe704f2c42c5dcc0692695489e87b2df1fe Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 1 Sep 2017 17:58:14 +0200 Subject: [PATCH 01/19] include settings before logInit --- out/out.ObjectCheck.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index 7882cd9d9..43fbd4135 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -20,8 +20,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Version.php"); -include("../inc/inc.LogInit.php"); include("../inc/inc.Settings.php"); +include("../inc/inc.LogInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.Init.php"); include("../inc/inc.Extension.php"); From 3b06c5c8a1212d021beec7ac004849eef97ff2fc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 5 Sep 2017 06:24:35 +0200 Subject: [PATCH 02/19] better handling of deleted documents, doesn't show error anymore --- out/out.Timeline.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/out/out.Timeline.php b/out/out.Timeline.php index 7f4bbfd47..ebf045c30 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -40,18 +40,15 @@ if(isset($_GET['skip'])) else $skip = array(); +$document = null; +$content = null; if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['documentid'])) { - $document = $dms->getDocument($_GET["documentid"]); - if (!is_object($document)) { - $view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); + if($document = $dms->getDocument($_GET["documentid"])) { + if(isset($_GET['version']) && $_GET['version'] && is_numeric($_GET['version'])) { + $content = $document->getContentByVersion($_GET['version']); + } } -} else - $document = null; - -if(isset($_GET['version']) && $_GET['version'] && is_numeric($_GET['version'])) { - $content = $document->getContentByVersion($_GET['version']); -} else - $content = null; +} if($view) { $view->setParam('dms', $dms); From 64ed59acbaf022c9d0dd62ce91c42e1c479121c2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 5 Sep 2017 06:27:55 +0200 Subject: [PATCH 03/19] few updates of phrases --- languages/it_IT/lang.inc | 14 +++++++------- languages/ko_KR/lang.inc | 10 +++++----- languages/pt_BR/lang.inc | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 2b30c49dc..05a41479a 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1557), rickr (144), s.pnt (26) +// Translators: Admin (1563), rickr (144), s.pnt (26) $text = array( '2_factor_auth' => 'Autorizzazione a due fattori', @@ -474,14 +474,14 @@ URL: [url]', 'expired' => 'Scaduto', 'expired_at_date' => '', 'expires' => 'Scadenza', -'expire_by_date' => '', +'expire_by_date' => 'Scadenza per Data', 'expire_in_1d' => '', 'expire_in_1h' => '', -'expire_in_1m' => '', -'expire_in_1w' => '', -'expire_in_1y' => '', +'expire_in_1m' => '1 Mese', +'expire_in_1w' => '7 Giorni', +'expire_in_1y' => '1 Anno', 'expire_in_2h' => '', -'expire_in_2y' => '', +'expire_in_2y' => '2 Anni', 'expire_today' => '', 'expire_tomorrow' => '', 'expiry_changed_email' => 'Scadenza cambiata', @@ -665,7 +665,7 @@ URL: [url]', 'linked_documents' => 'Documenti collegati', 'linked_files' => 'Allegati', 'linked_to_current_version' => '', -'linked_to_document' => '', +'linked_to_document' => 'Collegato al documento', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', 'link_to_version' => '', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 03be2801b..edc3b4407 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (940), daivoc (421), fofwisdom (166) +// Translators: Admin (944), daivoc (421), fofwisdom (166) $text = array( '2_factor_auth' => '이중 인증', @@ -481,7 +481,7 @@ URL: [url]', 'expire_in_1w' => '1주 후 만료', 'expire_in_1y' => '1년 후 만료', 'expire_in_2h' => '', -'expire_in_2y' => '', +'expire_in_2y' => '2년 후에 만료', 'expire_today' => '', 'expire_tomorrow' => '', 'expiry_changed_email' => '유효 기간 변경', @@ -585,7 +585,7 @@ URL: [url]', 'include_content' => '내용을 포함', 'include_documents' => '문서 포함', 'include_subdirectories' => '하위 디렉터리 포함', -'indexing_tasks_in_queue' => '', +'indexing_tasks_in_queue' => '큐에서 대기중인 색인 작업들', 'index_converters' => '인덱스 문서 변환', 'index_done' => '마침', 'index_error' => '오류', @@ -669,7 +669,7 @@ URL: [url]', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 upload page 사용하십시오.', 'link_to_version' => '', -'list_access_rights' => '', +'list_access_rights' => '모든 접근 권한 나열', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => '로컬 파일', @@ -813,7 +813,7 @@ URL : [url]', 'only_jpg_user_images' => '.JPG - 이미지만 사용자가 이미지로 사용할 수 있습니다', 'order_by_sequence_off' => '순서에 의한 정렬 설정이 켜져 있습니다. 이 매개 변수를 사용하고 싶은 경우 이것을 활성화 해야 합니다.', 'original_filename' => '원래본 파일명', -'overall_indexing_progress' => '', +'overall_indexing_progress' => '전체 색인 진행률', 'owner' => '소유자', 'ownership_changed_email' => '소유자 변경', 'ownership_changed_email_body' => '소유자 변경 diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 7e4647691..09484b4c2 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (954), flaviove (627), lfcristofoli (352) +// Translators: Admin (960), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => '', @@ -470,11 +470,11 @@ URL: [url]', 'expire_by_date' => 'Data de vencimento', 'expire_in_1d' => '', 'expire_in_1h' => '', -'expire_in_1m' => '', +'expire_in_1m' => 'Expira em 1 mês', 'expire_in_1w' => 'Expira em uma (01) semana', -'expire_in_1y' => '', +'expire_in_1y' => 'Expira em 1 ano', 'expire_in_2h' => '', -'expire_in_2y' => '', +'expire_in_2y' => 'Expira em 2 anos', 'expire_today' => '', 'expire_tomorrow' => '', 'expiry_changed_email' => 'Data de validade mudou', @@ -1106,7 +1106,7 @@ URL: [url]', 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo', 'settings_contentOffsetDir_desc' => 'Para contornar as limitações do sistema de arquivos subjacente, uma nova estrutura de diretórios foi concebida que existe dentro do diretório de conteúdo (Content Directory). Isso requer um diretório base para começar. Normalmente, deixe Isso para a configuração padrão, 1048576, mas pode ser qualquer número ou cadeia de caracteres que ainda não existe dentro (Diretório de conteúdo)', 'settings_convertToPdf' => 'Converte o PDF para visualização', -'settings_convertToPdf_desc' => '', +'settings_convertToPdf_desc' => 'Se um documento não puder ser mostrado pelo navegador, uma versão em PDF será mostrada.', 'settings_cookieLifetime' => 'Tempo de Vida dos Cookies', 'settings_cookieLifetime_desc' => 'O tempo de vida de um cookie em segundos. Se definido como 0, o cookie será removido quando o navegador é fechado.', 'settings_coreDir' => 'Diretório Núcleo do SeedDMS', @@ -1275,7 +1275,7 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', -'settings_maxUploadSize' => '', +'settings_maxUploadSize' => 'Tamanho máximo para arquivos enviados.', 'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', 'settings_notfound' => 'Não encontrado', From 45d0c2618f4c183182d877fde444c9f4cedcbba4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 5 Sep 2017 09:27:55 +0200 Subject: [PATCH 04/19] start new version 4.3.37 --- CHANGELOG | 4 ++++ Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 23 +++++++++++++++++++---- inc/inc.Version.php | 2 +- install/install.php | 2 +- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 65ba943fa..4ab10c2ed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 4.3.37 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 4.3.36 -------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 6e54b8d05..573f30a44 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.3.36 +VERSION=4.3.37 SRC=CHANGELOG inc conf utils index.php languages views op out doc styles LICENSE webdav install restapi pdfviewer # webapp diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index ea2e2a1e8..24e0e233e 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -307,7 +307,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '4.3.36'; + $this->version = '4.3.37'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index c6a22e772..9236411f0 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2017-03-22 + 2017-09-05 - 4.3.36 - 4.3.36 + 4.3.37 + 4.3.37 stable @@ -24,7 +24,6 @@ GPL License -- fix sql statement for creating temp. tables (sqlite) @@ -1157,5 +1156,21 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set + + 2017-03-22 + + + 4.3.36 + 4.3.36 + + + stable + stable + + GPL License + +- fix sql statement for creating temp. tables (sqlite) + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index d0a7b4d5d..5b821627e 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "4.3.36"; + public $_number = "4.3.37"; private $_string = "SeedDMS"; function __construct() { diff --git a/install/install.php b/install/install.php index 3aac8f012..78fce9940 100644 --- a/install/install.php +++ b/install/install.php @@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.3.36"); +define("SEEDDMS_VERSION", "4.3.37"); require_once('../inc/inc.ClassSettings.php'); From ef6f263fc1d1f8ef2e23cebfbc2640595a643a1b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Sep 2017 08:16:25 +0200 Subject: [PATCH 05/19] create indexer only if action is not set or 'show' (Closes #340) --- out/out.Indexer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/out/out.Indexer.php b/out/out.Indexer.php index cc41c252b..904ac6584 100644 --- a/out/out.Indexer.php +++ b/out/out.Indexer.php @@ -37,6 +37,7 @@ if(!$settings->_enableFullSearch) { UI::exitError(getMLText("admin_tools"),getMLText("fulltextsearch_disabled")); } +if(!isset($_GET['action']) || $_GET['action'] == 'show') if(isset($_GET['create']) && $_GET['create'] == 1) { if(isset($_GET['confirm']) && $_GET['confirm'] == 1) { $index = $indexconf['Indexer']::create($settings->_luceneDir); From b5fad8ddecbd884e0342b1c239dc15f58a860c53 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Sep 2017 08:18:33 +0200 Subject: [PATCH 06/19] add entry for 5.1.4 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9d86f8008..df6aa06e1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ -------------------------------------------------------------------------------- Changes in version 5.1.4 -------------------------------------------------------------------------------- +- fix javascript error when indexing document, because the indexer was also + created when the js-code was requested (Closes #340) -------------------------------------------------------------------------------- Changes in version 5.1.3 From bb3071bdae0372b03b3659535f28764a71837129 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Sep 2017 08:21:28 +0200 Subject: [PATCH 07/19] use cmd timeout when indexing document (Closes 344) --- op/op.Ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index d25efbb3f..6fd1843ab 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -754,7 +754,7 @@ switch($command) { $index = $indexconf['Indexer']::open($settings->_luceneDir); if($index) { $indexconf['Indexer']::init($settings->_stopWordsFile); - $idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false); + $idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout); if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) { if (method_exists($hookObj, 'preIndexDocument')) { From 5f564e2b966f0c66347584be2c5ee0b1386d5a6d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Sep 2017 08:22:21 +0200 Subject: [PATCH 08/19] add entry for 5.0.14 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b4a314aca..f6f900093 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 5.0.14 -------------------------------------------------------------------------------- +- use cmd timeout when indexing documents (Closes #344) -------------------------------------------------------------------------------- Changes in version 5.0.13 From b4bcb94b6c6f9bfaf07cac157fb0b74cd81e6fb5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 11 Sep 2017 08:30:35 +0200 Subject: [PATCH 09/19] intialize $index even if action != show --- out/out.Indexer.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/out/out.Indexer.php b/out/out.Indexer.php index 904ac6584..85137fa2c 100644 --- a/out/out.Indexer.php +++ b/out/out.Indexer.php @@ -37,24 +37,27 @@ if(!$settings->_enableFullSearch) { UI::exitError(getMLText("admin_tools"),getMLText("fulltextsearch_disabled")); } -if(!isset($_GET['action']) || $_GET['action'] == 'show') -if(isset($_GET['create']) && $_GET['create'] == 1) { - if(isset($_GET['confirm']) && $_GET['confirm'] == 1) { - $index = $indexconf['Indexer']::create($settings->_luceneDir); +if(!isset($_GET['action']) || $_GET['action'] == 'show') { + if(isset($_GET['create']) && $_GET['create'] == 1) { + if(isset($_GET['confirm']) && $_GET['confirm'] == 1) { + $index = $indexconf['Indexer']::create($settings->_luceneDir); + if(!$index) { + UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex")); + } + $indexconf['Indexer']::init($settings->_stopWordsFile); + } else { + header('Location: out.CreateIndex.php'); + exit; + } + } else { + $index = $indexconf['Indexer']::open($settings->_luceneDir); if(!$index) { UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex")); } $indexconf['Indexer']::init($settings->_stopWordsFile); - } else { - header('Location: out.CreateIndex.php'); - exit; } } else { - $index = $indexconf['Indexer']::open($settings->_luceneDir); - if(!$index) { - UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex")); - } - $indexconf['Indexer']::init($settings->_stopWordsFile); + $index = null; } if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) { From 626c65b0e4385b6abb86fb656de1259805209d4d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 07:14:09 +0200 Subject: [PATCH 10/19] createPreview() returns falls if converter programm fails --- SeedDMS_Preview/Preview/Previewer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php index 970fcdb95..c32271c29 100644 --- a/SeedDMS_Preview/Preview/Previewer.php +++ b/SeedDMS_Preview/Preview/Previewer.php @@ -140,6 +140,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base { try { self::execWithTimeout($cmd, $this->timeout); } catch(Exception $e) { + return false; } } return true; From 8c776c82698fe0ca07e42efd0ef638e137a43eb2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 07:14:39 +0200 Subject: [PATCH 11/19] new version 1.2.3 --- SeedDMS_Preview/package.xml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml index 71eb627ba..6c0211aef 100644 --- a/SeedDMS_Preview/package.xml +++ b/SeedDMS_Preview/package.xml @@ -11,10 +11,10 @@ uwe@steinmann.cx yes - 2017-03-02 - + 2017-09-18 + - 1.2.2 + 1.2.3 1.2.0 @@ -23,8 +23,7 @@ GPL License -commands can be set for mimetypes 'xxxx/*' and '*' -pass mimetype as parameter '%m' to converter +createPreview() returns false if running the converter command fails @@ -271,5 +270,22 @@ add new previewer which converts document to pdf instead of png setConverters() overrides exiting converters + + 2017-03-02 + + + 1.2.2 + 1.2.0 + + + stable + stable + + GPL License + +commands can be set for mimetypes 'xxxx/*' and '*' +pass mimetype as parameter '%m' to converter + + From 82ca6f830253a6b6986b67a1915a01d4b2eff2e0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 10:22:39 +0200 Subject: [PATCH 12/19] createPreview() returns false if command cannot be executed --- SeedDMS_Preview/Preview/PdfPreviewer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php index f3c618b9f..49b303359 100644 --- a/SeedDMS_Preview/Preview/PdfPreviewer.php +++ b/SeedDMS_Preview/Preview/PdfPreviewer.php @@ -101,6 +101,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base { try { self::execWithTimeout($cmd, $this->timeout); } catch(Exception $e) { + return false; } } return true; From a1ca5991d891e049f01ee8523288a25531c7b413 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 10:23:26 +0200 Subject: [PATCH 13/19] remove some empty lines --- SeedDMS_Preview/Preview/Base.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php index b68186c69..25a36cdee 100644 --- a/SeedDMS_Preview/Preview/Base.php +++ b/SeedDMS_Preview/Preview/Base.php @@ -64,13 +64,13 @@ class SeedDMS_Preview_Base { 2 => array("pipe", "w") ); $pipes = array(); - + $timeout += time(); $process = proc_open($cmd, $descriptorspec, $pipes); if (!is_resource($process)) { throw new Exception("proc_open failed on: " . $cmd); } - + $output = ''; $timeleft = $timeout - time(); $read = array($pipes[1]); @@ -78,13 +78,13 @@ class SeedDMS_Preview_Base { $exeptions = NULL; do { stream_select($read, $write, $exeptions, $timeleft, 200000); - + if (!empty($read)) { $output .= fread($pipes[1], 8192); } $timeleft = $timeout - time(); } while (!feof($pipes[1]) && $timeleft > 0); - + if ($timeleft <= 0) { proc_terminate($process); throw new Exception("command timeout on: " . $cmd); @@ -109,7 +109,7 @@ class SeedDMS_Preview_Base { /** * Check if converter for a given mimetype is set * - * @param string $mimetype + * @param string $mimetype * @return boolean true if converter exists, otherwise false */ function hasConverter($mimetype) { /* {{{ */ From f666996f201fd5b15eea802abdc4b31c7cb5372f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 10:23:40 +0200 Subject: [PATCH 14/19] remove default icon if preview could not be created --- op/op.Preview.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/op/op.Preview.php b/op/op.Preview.php index 91c057be0..85effaf9f 100644 --- a/op/op.Preview.php +++ b/op/op.Preview.php @@ -71,8 +71,15 @@ if(!empty($_GET["width"])) $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]); else $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); -if(!$previewer->hasPreview($object)) - $previewer->createPreview($object); +if(!$previewer->hasPreview($object)) { + if(!$previewer->createPreview($object)) { + } +} +if(!$previewer->hasPreview($object)) { + header('Content-Type: image/svg+xml'); + readfile('../views/'.$theme.'/images/empty.svg'); + exit; +} header('Content-Type: image/png'); $previewer->getPreview($object); From 450d4cc27d7bf85f64b40dee2f5b05ed10197562 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 10:54:05 +0200 Subject: [PATCH 15/19] fix label in form --- views/bootstrap/class.PasswordForgotten.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.PasswordForgotten.php b/views/bootstrap/class.PasswordForgotten.php index dcf88d2b2..89363237a 100644 --- a/views/bootstrap/class.PasswordForgotten.php +++ b/views/bootstrap/class.PasswordForgotten.php @@ -82,7 +82,7 @@ document.form1.email.focus();

- +
From 649ed029868d957e4cc96fa8dbcb22dfb2e89e5c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 18 Sep 2017 10:54:13 +0200 Subject: [PATCH 16/19] add entry for 4.3.37 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 4ab10c2ed..d43439ad7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 4.3.37 -------------------------------------------------------------------------------- +- fix label in password forgotten form (Closes #346) -------------------------------------------------------------------------------- Changes in version 4.3.36 From 3e2d6e3f745bafd98b2fca9274c990414bb9715f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Sep 2017 09:20:56 +0200 Subject: [PATCH 17/19] add preview width for dropfolder lists --- inc/inc.ClassSettings.php | 10 ++++++++++ op/op.Settings.php | 2 ++ out/out.DropFolderChooser.php | 3 ++- views/bootstrap/class.DropFolderChooser.php | 12 +++++++----- views/bootstrap/class.Settings.php | 8 ++++++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 1c06d76db..e253030d7 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -217,8 +217,12 @@ class Settings { /* {{{ */ var $_cmdTimeout = 5; // Preview image width in lists var $_previewWidthList = 40; + // Preview image width in menu lists + var $_previewWidthMenuList = 40; // Preview image width on document details page var $_previewWidthDetail = 100; + // Preview image width in drop folder list + var $_previewWidthDropFolderList = 100; // show full preview on document details page var $_showFullPreview = false; // convert to pdf for preview on document details page @@ -404,8 +408,12 @@ class Settings { /* {{{ */ $this->_theme = strval($tab["theme"]); if(isset($tab["previewWidthList"])) $this->_previewWidthList = intval($tab["previewWidthList"]); + if(isset($tab["previewWidthMenuList"])) + $this->_previewWidthMenuList = intval($tab["previewWidthMenuList"]); if(isset($tab["previewWidthDetail"])) $this->_previewWidthDetail = intval($tab["previewWidthDetail"]); + if(isset($tab["previewWidthDropFolderList"])) + $this->_previewWidthDropFolderList = intval($tab["previewWidthDropFolderList"]); $this->_showFullPreview = Settings::boolVal($tab["showFullPreview"]); $this->_convertToPdf = Settings::boolVal($tab["convertToPdf"]); @@ -719,7 +727,9 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages)); $this->setXMLAttributValue($node, "theme", $this->_theme); $this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList); + $this->setXMLAttributValue($node, "previewWidthMenuList", $this->_previewWidthMenuList); $this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail); + $this->setXMLAttributValue($node, "previewWidthDropFolderList", $this->_previewWidthDropFolderList); $this->setXMLAttributValue($node, "showFullPreview", $this->_showFullPreview); $this->setXMLAttributValue($node, "convertToPdf", $this->_convertToPdf); diff --git a/op/op.Settings.php b/op/op.Settings.php index 7466686d3..3ca583bb3 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -65,6 +65,8 @@ if ($action == "saveSettings") $settings->_availablelanguages = $_POST["availablelanguages"]; $settings->_theme = $_POST["theme"]; $settings->_previewWidthList = $_POST["previewWidthList"]; + $settings->_previewWidthMenuList = $_POST["previewWidthMenuList"]; + $settings->_previewWidthDropFolderList = $_POST["previewWidthDropFolderList"]; $settings->_previewWidthDetail = $_POST["previewWidthDetail"]; $settings->_showFullPreview = getBoolValue("showFullPreview"); $settings->_convertToPdf = getBoolValue("convertToPdf"); diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php index 5eaa38892..89ed922c1 100644 --- a/out/out.DropFolderChooser.php +++ b/out/out.DropFolderChooser.php @@ -49,7 +49,8 @@ if($view) { $view->setParam('dropfolderfile', isset($_GET["dropfolderfile"]) ? $_GET["dropfolderfile"] : ''); $view->setParam('form', $form); $view->setParam('cachedir', $settings->_cacheDir); - $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewWidthMenuList', $settings->_previewWidthMenuList); + $view->setParam('previewWidthList', $settings->_previewWidthDropFolderList); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('showfolders', $showfolders); $view($_GET); diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php index 966da8cd3..2c9243064 100644 --- a/views/bootstrap/class.DropFolderChooser.php +++ b/views/bootstrap/class.DropFolderChooser.php @@ -56,10 +56,10 @@ $('.folderselect').click(function(ev) { $dropfolderdir = $this->params['dropfolderdir']; $showfolders = $this->params['showfolders']; $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthMenuList']; $timeout = $this->params['timeout']; $folderid = isset($_GET['folderid']) ? $_GET['folderid'] : 0; - $previewwidth = 40; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $c = 0; // count files @@ -78,10 +78,12 @@ $('.folderselect').click(function(ev) { if($showfolders == 0 && !is_dir($dir.'/'.$entry)) { $c++; $mimetype = finfo_file($finfo, $dir.'/'.$entry); - $previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype); - $filecontent .= "
  • "; - if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) { - $filecontent .= "
    "; + $filecontent .= "
  • "; + if($previewwidth) { + $previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype); + if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) { + $filecontent .= "
    "; + } } $filecontent .= "
    ".$entry."
    ".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."
    • \n"; } elseif($showfolders && is_dir($dir.'/'.$entry)) { diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 32d24628d..1fac139f5 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -187,6 +187,14 @@ if(!is_writeable($settings->_configFilePath)) { : showTextField("previewWidthList", $settings->_previewWidthList); ?> + "> + : + showTextField("previewWidthMenuList", $settings->_previewWidthMenuList); ?> + + "> + : + showTextField("previewWidthDropFolderList", $settings->_previewWidthDropFolderList); ?> + "> : showTextField("previewWidthDetail", $settings->_previewWidthDetail); ?> From 0967c109d0635c8586d93f1a33bd50644175acc4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Sep 2017 09:22:43 +0200 Subject: [PATCH 18/19] urlencode file name in printDropFolderChooserHtml() --- 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 70d7205f9..0602ab109 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1150,7 +1150,7 @@ $(document).ready(function() { print "
    \n"; print ""; print ""; - print "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; + print "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; print "
    \n"; ?>