Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -120,6 +120,8 @@
                      Changes in version 5.1.14
 --------------------------------------------------------------------------------
 - allow mimetype to specify documents which can be edited online
+- show number of indexing tasks in bar
+- fix comparison of last indexing time with creation date of document content
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.13

SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php

@@ -96,7 +96,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".time().")";
+		$sql = "INSERT INTO docs (docid, title, comment, keywords, category, owner, content, mimetype, origfilename, created) VALUES(".$doc->getFieldValue('document_id').", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($doc->getFieldValue('comment')).", ".$this->_conn->quote($doc->getFieldValue('keywords')).", ".$this->_conn->quote($doc->getFieldValue('category')).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($doc->getFieldValue('content')).", ".$this->_conn->quote($doc->getFieldValue('mimetype')).", ".$this->_conn->quote($doc->getFieldValue('origfilename')).", ".$doc->getFieldValue('created')/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {
 			return false;

SeedDMS_SQLiteFTS/package.xml

@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-04-11</date>
+ <date>2019-11-28</date>
  <time>11:00:40</time>
  <version>
-  <release>1.0.10</release>
+  <release>1.0.11</release>
-  <api>1.0.10</api>
+  <api>1.0.11</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-IndexedDocument() remembers cmd and mimetype
+Set 'created' in index to creation date of indexed content (was set to current
+timestamp)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -226,5 +227,21 @@ allow conversion commands for mimetypes with wildcards
 execWithTimeout() reads data from stderr and saves it into error msg
    </notes>
   </release>
+  <release>
+   <date>2018-04-11</date>
+   <time>11:00:40</time>
+   <version>
+    <release>1.0.10</release>
+    <api>1.0.10</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+IndexedDocument() remembers cmd and mimetype
+   </notes>
+  </release>
  </changelog>
 </package>

out/out.FolderChooser.php

@@ -29,7 +29,7 @@ require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.Authentication.php");
 
 if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
-	if (isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) {
+	if (!isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) {
 		$nodeid = $settings->_rootFolderID;
 	} else {
 		$nodeid = intval($_GET["node"]);
@@ -48,9 +48,9 @@ if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rootfolderid'=>$settings->_rootFolderID));
 if($view) {
+	$view->setParam('orderby', $settings->_sortFoldersDefault);
 	if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
 		$view->setParam('node', $node);
-		$view->setParam('orderby', $settings->_sortFoldersDefault);
 	} else {
 		$view->setParam('form', $form);
 		$view->setParam('mode', $mode);

views/bootstrap/class.Bootstrap.php

@@ -1080,7 +1080,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					(!empty($value['type']) ? ' type="'.$value['type'].'"' : '').
 					(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
 					(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
-					(is_string($value['value']) || !empty($value['value']) ? ' value="'.$value['value'].'"' : '').
+					((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : '').
 					(!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : '').
 					(!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : '').
 					(!empty($value['checked']) ? ' checked' : '').

views/bootstrap/class.FolderChooser.php

@@ -52,6 +52,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$mode = $this->params['mode'];
+		$orderby = $this->params['orderby'];
 		$exclude = $this->params['exclude'];
 		$form = $this->params['form'];
 		$rootfolderid = $this->params['rootfolderid'];
@@ -59,7 +60,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
 //		$this->htmlStartPage(getMLText("choose_target_folder"));
 //		$this->contentContainerStart();
 if(1) {
-		$this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form);
+		$this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form, ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby);
 		echo '<script src="../out/out.FolderChooser.php?action=js&'.$_SERVER['QUERY_STRING'].'"></script>'."\n";
 } else {
 			$this->printNewTreeNavigation($rootfolderid, $mode, 0, $form);

views/bootstrap/class.Indexer.php

@@ -63,6 +63,7 @@ function check_queue() {
 			beforeSend: function() {
 				queue_count++;            // Add request to the counter
 				$('.queue-bar').css('width', (queue_count*100/MAX_REQUESTS)+'%');
+				$('.queue-bar').text(queue_count + '/' + MAX_REQUESTS);
 			},
 			error: function(xhr, textstatus) {
 				noty({
@@ -162,7 +163,7 @@ $(document).ready( function() {
 					$created = 0;
 				}
 				$content = $document->getLatestContent();
-				if($created > $content->getDate() && !$forceupdate) {
+				if($created >= $content->getDate() && !$forceupdate) {
 					echo $indent."<span id=\"status_".$document->getID()."\" class=\"indexstatus\" data-docid=\"".$document->getID()."\">document unchanged</span>";
 				} else {
 					$index->delete($hit->id);