From a8307a32fdbf6b681cc05a5340c06317518b4b8e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 May 2012 10:08:11 +0200
Subject: [PATCH] New: Switch ecm module to use ajax by default.

---
 htdocs/core/ajax/ajaxdirpreview.php       |  2 +-
 htdocs/core/class/html.formfile.class.php |  2 +-
 htdocs/ecm/index.php                      | 13 +++++--------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 2cbfd14bb99..3304e85b637 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -255,7 +255,7 @@ if ($type == 'directory')
 
 }
 
-if ((! isset($mode) || $mode != 'noajax') && ! empty($conf->global->MAIN_ECM_TRY_JS))
+if ((! isset($mode) || $mode != 'noajax') && empty($conf->global->MAIN_ECM_DISABLE_JS))
 {
     // Enable jquery handlers on new generated HTML objects
     print "\n".'<script type="text/javascript">'."\n";
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 34ecea9488b..f144047f937 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -608,7 +608,7 @@ class FormFile
                 // Delete or view link
                 print '<td align="right">';
                 if ($useinecm)     print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view().'</a> &nbsp; ';
-                if ($permtodelete) print '<a href="'.(($useinecm && ! empty($conf->global->MAIN_ECM_TRY_JS))?'#':$url.'?id='.$object->id.'&action=delete&urlfile='.urlencode($file['name']).$param).'" class="deletefilelink" rel="'.urlencode($file['name']).'">'.img_delete().'</a>';
+                if ($permtodelete) print '<a href="'.(($useinecm && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':$url.'?id='.$object->id.'&action=delete&urlfile='.urlencode($file['name']).$param).'" class="deletefilelink" rel="'.urlencode($file['name']).'">'.img_delete().'</a>';
                 else print '&nbsp;';
                 print "</td>";
                 print "</tr>\n";
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 84553edcc38..86bb3a0a270 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -303,7 +303,7 @@ if ($action == 'refreshmanual')
 //print "xx".$_SESSION["dol_screenheight"];
 $maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500)?($_SESSION["dol_screenheight"]-166):660;
 $morejs=array();
-if (! empty($conf->global->MAIN_ECM_TRY_JS)) $morejs=array("/filemanager/includes/jqueryFileTree/jqueryFileTree.js");    // TODO Move lib into includes
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs=array("/filemanager/includes/jqueryFileTree/jqueryFileTree.js");    // TODO Move lib into includes
 $moreheadcss="
 <!-- dol_screenheight=".$_SESSION["dol_screenheight"]." -->
 <style type=\"text/css\">
@@ -586,7 +586,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 	print '</td>';
 	print '</tr>';
 
-    if (! empty($conf->global->MAIN_ECM_TRY_JS))
+    if (empty($conf->global->MAIN_ECM_DISABLE_JS))
     {
         print '<tr><td colspan="6" style="padding-left: 20px">';
 
@@ -851,11 +851,8 @@ else
 // Start right panel
 
 
-//if (empty($conf->global->MAIN_ECM_TRY_JS))
-//{
-    $mode='noajax';
-    include_once(DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php');
-//}
+$mode='noajax';
+include_once(DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php');
 
 
 // End right panel
@@ -877,7 +874,7 @@ else
 
 
 // To attach new file
-if (! empty($conf->global->MAIN_ECM_TRY_JS) || ! empty($section))
+if (empty($conf->global->MAIN_ECM_DISABLE_JS) || ! empty($section))
 {
     $formfile=new FormFile($db);
 	$formfile->form_attach_new_file(DOL_URL_ROOT.'/ecm/index.php', 'none', 0, ($section?$section:-1), $user->rights->ecm->upload, 48);