From 408592ee90cad4fd15cae6beb818e8779b9ad0ae Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Nov 2016 18:10:22 +0100 Subject: [PATCH 01/13] replace some php short tags (Closes: #294) --- views/bootstrap/class.Bootstrap.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index f15793d59..38d95aed4 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1405,14 +1405,14 @@ $(function() { $('#jqtree').tree({ saveState: true, data: data, - saveState: 'jqtree', + saveState: 'jqtree', openedIcon: '', closedIcon: '', _onCanSelectNode: function(node) { if(node.is_folder) { - folderSelected(node.id, node.name); + folderSelected(node.id, node.name); } else - documentSelected(node.id, node.name); + documentSelected(node.id, node.name); }, autoOpen: true, drapAndDrop: true, @@ -1426,16 +1426,16 @@ $(function() { }); // Unfold tree if folder is opened $('#jqtree').tree('openNode', $('#jqtree').tree('getNodeById', ), false); - $('#jqtree').bind( + $('#jqtree').bind( 'tree.click', function(event) { var node = event.node; - $('#jqtree').tree('openNode', node); + $('#jqtree').tree('openNode', node); // event.preventDefault(); if(node.is_folder) { - folderSelected(node.id, node.name); + folderSelected(node.id, node.name); } else - documentSelected(node.id, node.name); + documentSelected(node.id, node.name); } ); }); From b4be06793458da905edbc4ff8a5133bae3549093 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Nov 2016 18:11:13 +0100 Subject: [PATCH 02/13] add note about closing #294 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index ff01e84c0..f4c01c783 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ -------------------------------------------------------------------------------- - merged changes from 4.3.31 - fix saving online editing file +- replace some php short tags by Date: Tue, 15 Nov 2016 20:39:35 +0100 Subject: [PATCH 03/13] add some default converters --- conf/settings.xml.template | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/conf/settings.xml.template b/conf/settings.xml.template index e8dc40c6a..ff047728d 100644 --- a/conf/settings.xml.template +++ b/conf/settings.xml.template @@ -293,7 +293,20 @@ enableNotificationAppRev = "true" enableOwnerNotification = "false" enableNotificationWorkflow = "false" - /> + /> + + pdftotext -nopgbrk %s - | sed -e 's/ [a-zA-Z0-9.]\{1\} / /g' -e 's/[0-9.]//g' + catdoc %s + ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1 + id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g' + id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g' + cat %s + html2text %s + docx2txt %s - + + + unoconv -d document -e PageRange=1 -f pdf --stdout -v '%f'|gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dPDFFitPage -r72x72 -sOutputFile=- -dFirstPage=1 -dLastPage=1 -q - | convert -resize %wx png:- '%o' + From 125697a287eb70f9669d61fc8a2c2e701b33b40a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Nov 2016 21:08:03 +0100 Subject: [PATCH 04/13] setConverters() overrides existing converters --- SeedDMS_Preview/Preview/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php index 2e46f593a..b68186c69 100644 --- a/SeedDMS_Preview/Preview/Base.php +++ b/SeedDMS_Preview/Preview/Base.php @@ -103,7 +103,7 @@ class SeedDMS_Preview_Base { * and the value is the command to be called for creating the preview */ function setConverters($arr) { /* {{{ */ - $this->converters = array_merge($arr, $this->converters); + $this->converters = array_merge($this->converters, $arr); } /* }}} */ /** From a7cff8e309c4bfee29975fdfed664e828107d883 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Nov 2016 21:08:26 +0100 Subject: [PATCH 05/13] new version 1.2.1 --- SeedDMS_Preview/package.xml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml index e91edf1de..6422fe77c 100644 --- a/SeedDMS_Preview/package.xml +++ b/SeedDMS_Preview/package.xml @@ -11,10 +11,10 @@ uwe@steinmann.cx yes - 2016-11-07 - + 2016-11-15 + - 1.2.0 + 1.2.1 1.2.0 @@ -23,7 +23,7 @@ GPL License -add new previewer which converts document to pdf instead of png +setConverters() overrides exiting converters @@ -238,5 +238,21 @@ fix calculation of timeout (Bug #269) check if cache dir exists before deleting it in deleteDocumentPreviews() + + 2016-11-07 + + + 1.2.0 + 1.2.0 + + + stable + stable + + GPL License + +add new previewer which converts document to pdf instead of png + + From 45e99fa372351cf530e8c77381c03a17362993c0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Nov 2016 21:13:04 +0100 Subject: [PATCH 06/13] add more converters for preview --- conf/settings.xml.template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/settings.xml.template b/conf/settings.xml.template index ff047728d..ad8f8481d 100644 --- a/conf/settings.xml.template +++ b/conf/settings.xml.template @@ -293,8 +293,8 @@ enableNotificationAppRev = "true" enableOwnerNotification = "false" enableNotificationWorkflow = "false" - /> - + /> + pdftotext -nopgbrk %s - | sed -e 's/ [a-zA-Z0-9.]\{1\} / /g' -e 's/[0-9.]//g' catdoc %s ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1 @@ -304,8 +304,12 @@ html2text %s docx2txt %s - - + unoconv -d document -e PageRange=1 -f pdf --stdout -v '%f'|gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dPDFFitPage -r72x72 -sOutputFile=- -dFirstPage=1 -dLastPage=1 -q - | convert -resize %wx png:- '%o' + convert -resize %wx '%f' '%o' + convert -resize %wx '%f' '%o' + convert -resize %wx '%f' '%o' + a2ps -1 -a1 -R -B -o - '%f' | gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dFirstPage=1 -dLastPage=1 -dPDFFitPage -r72x72 -sOutputFile=- -q - | convert -resize %wx png:- '%o' From 4e93bf4ca2ccbe5a336b6ee80fe02c78418de64b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Nov 2016 17:03:27 +0100 Subject: [PATCH 07/13] fix php tag --- 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 38d95aed4..b4a5977ff 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1425,7 +1425,7 @@ $(function() { } }); // Unfold tree if folder is opened - $('#jqtree').tree('openNode', $('#jqtree').tree('getNodeById', ), false); + $('#jqtree').tree('openNode', $('#jqtree').tree('getNodeById', ), false); $('#jqtree').bind( 'tree.click', function(event) { From 80166278ba4965ed287a20e0c2d5cd6531202c0e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Nov 2016 21:56:48 +0100 Subject: [PATCH 08/13] remove some left over php short tags --- views/bootstrap/class.EditOnline.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php index 8c1c9e711..10995b10e 100644 --- a/views/bootstrap/class.EditOnline.php +++ b/views/bootstrap/class.EditOnline.php @@ -54,7 +54,7 @@ $(document).ready(function() { theme: 'defaultTheme', timeout: 1500, }); - $('div.ajax').trigger('update', {documentid: getId() ?>}); + $('div.ajax').trigger('update', {documentid: getId(); ?>}); }, "json"); return false; }); @@ -118,7 +118,7 @@ echo "
\n"; $this->contentHeading(getMLText("content")); ?>
- +