| '.$langs->trans("TotalSizeOfAttachedFiles").' | ';
@@ -321,12 +368,12 @@ if ($action != 'edit' && $action != 'delete')
if ($user->rights->ecm->setup)
{
- print ''.$langs->trans('Edit').'';
+ print ''.$langs->trans('Edit').'';
}
if ($user->rights->ecm->setup)
{
- print ''.$langs->trans('ECMAddSection').'';
+ print ''.$langs->trans('ECMAddSection').'';
}
else
{
@@ -337,7 +384,7 @@ if ($action != 'edit' && $action != 'delete')
{
if ($user->rights->ecm->setup)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
}
else
{
@@ -354,25 +401,24 @@ if ($action != 'edit' && $action != 'delete')
// Confirm remove file
if ($action == 'delete')
{
- print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$_REQUEST["section"].'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
-
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST("section",'alpha').'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
}
// Confirm remove file
if ($action == 'delete_dir')
{
$relativepathwithoutslash=preg_replace('/[\/]$/','',$relativepath);
- print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$_REQUEST["section"], $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$relativepathwithoutslash), 'confirm_deletedir', '', 1, 1);
-
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST('section','alpha').($module?'&module='.$module:''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$relativepathwithoutslash), 'confirm_deletedir', '', 1, 1);
}
-$formfile=new FormFile($db);
/*
+$formfile=new FormFile($db);
+
// Display upload form
if ($user->rights->ecm->upload)
{
- $formfile->form_attach_new_file(DOL_URL_ROOT.'/ecm/docmine.php','',0,$section);
+ $formfile->form_attach_new_file(DOL_URL_ROOT.'/ecm/dir_card.php','',0,$section);
}
// List of document
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
deleted file mode 100644
index addf559e01c..00000000000
--- a/htdocs/ecm/docother.php
+++ /dev/null
@@ -1,171 +0,0 @@
-
- */
-
-/**
- * \file htdocs/ecm/docother.php
- * \ingroup ecm
- * \brief Main ecm page
- * \author Laurent Destailleur
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-// Load traductions files
-$langs->load("ecm");
-$langs->load("companies");
-$langs->load("other");
-
-// Get parameters
-$socid = GETPOST("socid","int");
-
-// Security check
-if ($user->societe_id > 0)
-{
- $action = '';
- $socid = $user->societe_id;
-}
-
-$section=$_GET["section"];
-if (! $section) $section='misc';
-$upload_dir = $conf->ecm->dir_output.'/'.$section;
-
-
-
-/*******************************************************************
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- ********************************************************************/
-
-// Envoie fichier
-if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
-{
- 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
- {
- // Echec transfert (fichier depassant la limite ?)
- $langs->load("errors");
- $mesg = ' '.$langs->trans("ErrorFailToCreateDir",$upload_dir).' ';
- }
-}
-
-// Suppression fichier
-if ($_POST['action'] == 'confirm_deletefile' && $_POST['confirm'] == 'yes')
-{
- $langs->load("other");
- $file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
- $ret=dol_delete_file($file);
- if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
- else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-}
-
-
-
-
-
-/*******************************************************************
- * PAGE
- *
- * Put here all code to do according to value of "action" parameter
- ********************************************************************/
-
-llxHeader();
-
-$form=new Form($db);
-
-print load_fiche_titre($langs->trans("ECMAutoOrg"));
-
-//$head = societe_prepare_head($societe);
-
-
-
-/*
- * Confirmation of deleting a product line
- */
-if ($_GET['action'] == 'delete_file')
-{
- print $form->formconfirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
-
-}
-
-// Construct files list
-clearstatcache();
-$totalsize=0;
-$filearray=array();
-$errorlevel=error_reporting();
-error_reporting(0);
-$handle=opendir($upload_dir);
-error_reporting($errorlevel);
-if (is_resource($handle))
-{
- $i=0;
- while (($file = readdir($handle))!==false)
- {
- if (!is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
- {
- $filearray[$i]->name=$file;
- $filearray[$i]->size=dol_filesize($upload_dir."/".$file);
- $filearray[$i]->date=dol_filemtime($upload_dir."/".$file);
- $totalsize+=$filearray[$i]->size;
- $i++;
- }
- }
- closedir($handle);
-}
-else
-{
- // print ''.$langs->trans("ErrorCanNotReadDir",$upload_dir).' ';
-}
-
-
-/*
-
-print '';
-
-// Nbre fichiers
-print '| '.$langs->trans("NbOfAttachedFiles").' | '.count($filearray).' | ';
-
-//Total taille
-print '| '.$langs->trans("TotalSizeOfAttachedFiles").' | '.$totalsize.' '.$langs->trans("bytes").' | ';
-
-print ' ';
-
-print '';
-
-*/
-
-
-if ($mesg) { print $mesg."
"; }
-
-
-print $langs->trans("FeatureNotYetAvailable");
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/file_card.php
similarity index 90%
rename from htdocs/ecm/docfile.php
rename to htdocs/ecm/file_card.php
index 5a14b95291f..8c62cbe18f2 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/file_card.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/ecm/docfile.php
+ * \file htdocs/ecm/file_card.php
* \ingroup ecm
* \brief Card of a file for ECM module
*/
@@ -123,7 +123,7 @@ if ($cancel)
}
else
{
- header("Location: ".DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($urlfile).'§ion='.urlencode($section));
+ header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'§ion='.urlencode($section).($module?'&module='.urlencode($module):''));
exit;
}
}
@@ -216,7 +216,7 @@ if ($action == 'update')
$db->commit();
$urlfile=$newlabel;
- header("Location: ".DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($urlfile).'§ion='.urlencode($section));
+ header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'§ion='.urlencode($section));
exit;
}
else
@@ -242,7 +242,8 @@ if ($action == 'edit')
print ' |
';
+ print '';
+ print '