From 0ada82baa0d79f1d4262e08c9dd3f6dcd6bb1983 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Feb 2017 01:00:44 +0100 Subject: [PATCH] Remove useless line that show "root" in EDM module. --- htdocs/ecm/index.php | 36 ++++-------------------------------- htdocs/ecm/index_auto.php | 7 ++++--- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 1b2a57c714da3..5ca14fe5dff68 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -115,36 +115,6 @@ { $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']); - if (is_numeric($resupload) && $resupload > 0) - { - $result=$ecmdir->changeNbOfFiles('+'); - } - else - { - $langs->load("errors"); - if ($resupload < 0) // Unknown error - { - setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors'); - } - else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus - { - setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors'); - } - else // Known error - { - setEventMessages($langs->trans($resupload), null, 'errors'); - } - } - } - else - { - $langs->load("errors"); - setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors'); - }*/ } } @@ -462,6 +432,7 @@ // Root of manual section + /* print ''; print ''; print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"'); @@ -474,10 +445,11 @@ print ' '; print ''; print ''; - + */ + if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) { - print ''; + print ''; // Show filemanager tree print '
'; diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 9208ec46644d2..23a96e4367b37 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -449,7 +449,7 @@ $htmltooltip=$langs->trans("ECMAreaDesc2"); // Root title line (Automatic section) - print ''; + /*print ''; print ''; print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"'); $txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsAuto").')'; @@ -461,11 +461,12 @@ print ' '; print ''; print ''; - + */ + $sectionauto=dol_sort_array($sectionauto,'label','ASC',true,false); print ''; - print ''; + print ''; print '