From 1e45e64a9a111ed80ab392ea426e35f5a3705402 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 20:35:42 +0100
Subject: [PATCH] Files sent from ECM module are also indexed in database.

---
 htdocs/core/lib/files.lib.php | 7 ++++++-
 htdocs/ecm/index.php          | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 78686656ff8..c5016d9150a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1178,12 +1178,14 @@ function dol_init_file_process($pathtoscan='', $trackid='')
  * @param	string	$savingdocmask			Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
  * @param	string	$link					Link to add (to add a link instead of a file)
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
- * @return	void
+ * @return	int                             <=0 if KO, >0 if OK
  */
 function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='')
 {
 	global $db,$user,$conf,$langs;
 
+	$res = 0;
+	
 	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
@@ -1278,6 +1280,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					    }
 					}
 
+					$res = 1;
 					setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 				}
 				else
@@ -1320,6 +1323,8 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
+	
+	return $res;
 }
 
 
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 971d20ae2b2..1b2a57c714d 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -106,11 +106,16 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		}
-
 	}
 
 	if (! $error)
 	{
+	    $res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', '', '');
+	    if ($res > 0)
+	    {
+	       $result=$ecmdir->changeNbOfFiles('+');
+	    }
+	    /*
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
@@ -139,7 +144,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
-		}
+		}*/
 	}
 }