diff --git a/CHANGELOG b/CHANGELOG
index e4dd01a38..98f9dfb58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+ Changes in version 5.0.2
+--------------------------------------------------------------------------------
+- merged changes from 4.3.26
+
--------------------------------------------------------------------------------
Changes in version 5.0.1
--------------------------------------------------------------------------------
@@ -18,6 +23,13 @@
- add .xml to online file types by default
- add home folder for users
+--------------------------------------------------------------------------------
+ Changes in version 4.3.26
+--------------------------------------------------------------------------------
+- move some left over javascript from html code into application.js (Closes #253)
+- take out last empty line from view/bootstrap/class.Search.php which causes a
+ header to be send to early (Closes: #252, #254)
+
--------------------------------------------------------------------------------
Changes in version 4.3.25
--------------------------------------------------------------------------------
diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index c9d5c6a1e..2a90a39b1 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -42,7 +42,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
do {
$timeleft = $timeout - time();
$read = array($pipes[1]);
- stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+ stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
if (!empty($read)) {
$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index b7dee2403..c37770104 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,10 +11,10 @@
uwe@steinmann.cx
yes
- 2016-02-01
-
+ 2016-03-29
+
- 1.1.7
+ 1.1.8
1.1.7
@@ -23,7 +23,7 @@
GPL License
-add command for indexing postѕcript files
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
@@ -202,5 +202,21 @@ declare SeeDMS_Lucene_Indexer::open() static
run external commands with a timeout
+
+ 2016-02-01
+
+
+ 1.1.7
+ 1.1.7
+
+
+ stable
+ stable
+
+ GPL License
+
+add command for indexing postѕcript files
+
+
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 7284cbc18..dd41a7ebc 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -93,7 +93,7 @@ class SeedDMS_Preview_Previewer {
do {
$timeleft = $timeout - time();
$read = array($pipes[1]);
- stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+ stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
if (!empty($read)) {
$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index f3162f2ac..5130e59d9 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
uwe@steinmann.cx
yes
- 2016-03-08
-
+ 2016-03-29
+
- 1.1.6
- 1.1.6
+ 1.1.7
+ 1.1.7
stable
@@ -28,6 +28,7 @@
add method getFilesize()
timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
check if object passed to createPreview(), hasPreview() is not null
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
@@ -168,5 +169,21 @@ add method getFilesize()
timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
+
+ 2016-03-08
+
+
+ 1.1.6
+ 1.1.6
+
+
+ stable
+ stable
+
+ GPL License
+
+check if object passed to createPreview(), hasPreview() is not null
+
+
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index d28e254d0..5228570ca 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -47,7 +47,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
do {
$timeleft = $timeout - time();
$read = array($pipes[1]);
- stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+ stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
if (!empty($read)) {
$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 4425ba1ea..c55c1ced0 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,10 +11,10 @@
uwe@steinmann.cx
yes
- 2016-03-15
-
+ 2016-03-29
+
- 1.0.4
+ 1.0.5
1.0.1
@@ -23,7 +23,7 @@
GPL License
-make it work with sqlite3 < 3.8.0
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
@@ -130,5 +130,21 @@ check if index exists before removing it when creating a new one
add command for indexing postѕcript files
+
+ 2016-03-15
+
+
+ 1.0.4
+ 1.0.1
+
+
+ stable
+ stable
+
+ GPL License
+
+make it work with sqlite3 < 3.8.0
+
+
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 3cef9d6ab..53e9cb517 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -209,7 +209,7 @@ switch($command) {
case 'testmail': /* {{{ */
if($user && $user->isAdmin()) {
if($user->getEmail()) {
- $emailobj = new SeedDMS_EmailNotify($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+ $emailobj = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
$params = array();
if($emailobj->toIndividual($settings->_smtpSendFrom, $user, "testmail_subject", "testmail_body", $params)) {
diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index b1ab5ff61..858b0629d 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -106,6 +106,11 @@ div.statusbar a.btn {
margin-bottom: 10px;
}
+#database .chosen-container,
+#fulltext .chosen-container {
+ width: 95% !important;
+}
+
.chosen-container-multi .chosen-choices {
border: 1px solid #cccccc;
border-radius: 4px;
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 10b00bb91..8f18e3619 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -382,6 +382,9 @@ $(document).ready( function() {
});
});
+ $('button.history-back').on('click', function(event) {
+ window.history.back();
+ });
});
function onAddClipboard(ev) { /* {{{ */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b36de33ad..7eb6d4cb4 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1154,6 +1154,10 @@ function folderSelected(id, name) {