From 7021f4fb018aa647b53c05497cd8e621bb1494d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 3 Sep 2014 16:09:14 +0200
Subject: [PATCH] Fix: Message show when dir is out of sync with database cache
 was wrong.

---
 htdocs/core/ajax/ajaxdirpreview.php       |  2 +-
 htdocs/core/ajax/ajaxdirtree.php          |  3 ++-
 htdocs/core/class/html.formfile.class.php |  2 +-
 htdocs/ecm/class/ecmdirectory.class.php   | 14 +++++++-------
 htdocs/ecm/tpl/enablefiletreeajax.tpl.php |  5 ++++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 63641d00ab8..997e27adb20 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -207,7 +207,6 @@ if ($type == 'directory')
         if ($section === '0')
         {
             $filearray=array();
-            $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         }
         else $filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
 
@@ -216,6 +215,7 @@ if ($type == 'directory')
             $param.='&section='.$section;
             $textifempty = $langs->trans('NoFileFound');
         }
+        else if ($section === '0') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
 
         $formfile->list_of_documents($filearray,'','ecm',$param,1,$relativepath,$user->rights->ecm->upload,1,$textifempty,$maxlengthname,'',$url);
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index b4ceaeaced1..ae70d1a418a 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -145,7 +145,8 @@ if (file_exists($fullpathselecteddir))
     		    {
 					if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 					{
-    		    		$val['fullrelativename']=$file; $val['id']=0;
+    		    		$val['fullrelativename']=$file;
+    		    		$val['id']=0;
     		    		$val['label']=$file;
     		    		$val['description']='';
     		    		$nboffilesinsubdir=$langs->trans("Unknown");
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7ffe021fe92..05a1e40b756 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -759,7 +759,7 @@ class FormFile
 
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-			$var=true;
+			$var=false;
 			foreach($filearray as $key => $file)      // filearray must be only files here
 			{
 				if ($file['name'] != '.'
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 52c698c240f..aae1e275d8f 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -154,7 +154,7 @@ class EcmDirectory // extends CommonObject
 
                 // Call trigger
                 $result=$this->call_trigger('MYECMDIR_CREATE',$user);
-                if ($result < 0) { $error++; }            
+                if ($result < 0) { $error++; }
                 // End call triggers
 
 				if (! $error)
@@ -219,7 +219,7 @@ class EcmDirectory // extends CommonObject
 		{
             // Call trigger
             $result=$this->call_trigger('MYECMDIR_MODIFY',$user);
-            if ($result < 0) { $error++; }            
+            if ($result < 0) { $error++; }
             // End call triggers
 		}
 
@@ -356,10 +356,10 @@ class EcmDirectory // extends CommonObject
             {
             	$this->db->rollback();
             	return -2;
-            }            
+            }
             // End call triggers
 		}
-		
+
 		if ($mode != 'databaseonly')
 		{
 			$file = $conf->ecm->dir_output . "/" . $relativepath;
@@ -511,7 +511,7 @@ class EcmDirectory // extends CommonObject
 
 
 	/**
-	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau
+	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau à partir de la base de donnée
 	 *	Renvoi un tableau de tableau('id','id_mere',...) trie selon arbre et avec:
 	 *				id                  Id de la categorie
 	 *				id_mere             Id de la categorie mere
@@ -693,7 +693,7 @@ class EcmDirectory // extends CommonObject
 			return -1;
 		}
 	}
-	
+
 	/**
      * Call trigger based on this instance
      *
@@ -725,6 +725,6 @@ class EcmDirectory // extends CommonObject
         return $result;
 
     }
-	
+
 
 }
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 301fa5f955b..b348cb03c72 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -42,7 +42,7 @@ $(document).ready(function() {
 		},
 		// Called if we click on a dir (not a file)
 		function(elem) {
-			id=elem.attr('id').substr(12);
+			id=elem.attr('id').substr(12);	// We get id that is 'fmdirlia_id_xxx' (id we want is xxx)
 			jQuery("#formuserfile_section_dir").val(elem.attr('rel'));
    			jQuery("#formuserfile_section_id").val(id);
 			jQuery('#formuserfile').show();
@@ -65,6 +65,9 @@ $(document).ready(function() {
 function loadandshowpreview(filedirname,section)
 {
 	//alert('filedirname='+filedirname);
+	//console.log(filedirname);
+	//console.log(section);
+
 	$('#ecmfileview').empty();
 
 	var url = '<?php echo dol_buildpath('/core/ajax/ajaxdirpreview.php',1); ?>?action=preview&module=ecm&section='+section+'&file='+urlencode(filedirname);