diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 496afbf8568..d89e94861c0 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -36,14 +36,15 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (!$user->rights->ecm->setup) accessforbidden();
+if (!$user->rights->ecm->setup) {
+	accessforbidden();
+}
 
 // Get parameters
 $socid = GETPOST("socid", "int");
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -52,22 +53,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $section = GETPOST("section", 'alpha');
-if (!$section)
-{
+if (!$section) {
 	dol_print_error('', 'Error, section parameter missing');
 	exit;
 }
 $urlfile = GETPOST("urlfile");
-if (!$urlfile)
-{
+if (!$urlfile) {
 	dol_print_error('', "ErrorParamNotDefined");
 	exit;
 }
@@ -75,8 +80,7 @@ if (!$urlfile)
 // Load ecm object
 $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
-if (!$result > 0)
-{
+if (!$result > 0) {
 	dol_print_error($db, $ecmdir->error);
 	exit;
 }
@@ -85,13 +89,9 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
 $fullpath = $conf->ecm->dir_output.'/'.$relativepath.$urlfile;
 
-$file = new stdClass();
-$file->section_id = $ecmdir->id;
-$file->label = $urlfile;
-
 $relativetodocument = 'ecm/'.$relativepath; // $relativepath is relative to ECM dir, we need relative to document
-$filepath = $relativepath.$file->label;
-$filepathtodocument = $relativetodocument.$file->label;
+$filepath = $relativepath.$urlfile;
+$filepathtodocument = $relativetodocument.$urlfile;
 
 // Try to load object from index
 $object = new ECMFiles($db);
@@ -100,8 +100,7 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 $result = $object->fetch(0, '', $filepathtodocument);
-if ($result < 0)
-{
+if ($result < 0) {
 	dol_print_error($db, $object->error, $object->errors);
 	exit;
 }
@@ -112,11 +111,9 @@ if ($result < 0)
  * Actions
  */
 
-if ($cancel)
-{
+if ($cancel) {
 	$action = '';
-	if ($backtopage)
-	{
+	if ($backtopage) {
 		header("Location: ".$backtopage);
 		exit;
 	} else {
@@ -126,8 +123,7 @@ if ($cancel)
 }
 
 // Rename file
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$error = 0;
 
 	$oldlabel = GETPOST('urlfile', 'alpha');
@@ -154,11 +150,9 @@ if ($action == 'update')
 	// Now we update index of file
 	$db->begin();
 	//print $oldfile.' - '.$newfile;
-	if ($newlabel != $oldlabel)
-	{
+	if ($newlabel != $oldlabel) {
 		$result = dol_move($oldfile, $newfileformove); // This include update of database
-		if (!$result)
-		{
+		if (!$result) {
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
 			$error++;
@@ -166,27 +160,25 @@ if ($action == 'update')
 
 		// Reload object after the move
 		$result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 			exit;
 		}
 	}
 
-	if (!$error)
-	{
-		if ($shareenabled)
-		{
+	if (!$error) {
+		if ($shareenabled) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$object->share = getRandomPassword(true);
 		} else {
 			$object->share = '';
 		}
 
-		if ($object->id > 0)
-		{
+		if ($object->id > 0) {
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 			if (!$error) {
 				// Actions on extra fields
 				$result = $object->insertExtraFields();
@@ -197,8 +189,7 @@ if ($action == 'update')
 			}
 			// Call update to set the share key
 			$result = $object->update($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		} else {
@@ -212,15 +203,13 @@ if ($action == 'update')
 			$object->description = ''; // indexed content
 			$object->keyword = ''; // keyword content
 			$result = $object->create($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 
 		$urlfile = $newlabel;
@@ -246,10 +235,11 @@ $form = new Form($db);
 
 llxHeader();
 
-$head = ecm_file_prepare_head($file);
+$object->section_id = $ecmdir->id;
+$object->label = $urlfile;
+$head = ecm_file_prepare_head($object);
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="section" value="'.$section.'">';
@@ -267,12 +257,10 @@ $tmpecmdir = new EcmDirectory($db); // Need to create a new one
 $tmpecmdir->fetch($ecmdir->id);
 $result = 1;
 $i = 0;
-while ($tmpecmdir && $result > 0)
-{
+while ($tmpecmdir && $result > 0) {
 	$tmpecmdir->ref = $tmpecmdir->label;
 	$s = $tmpecmdir->getNomUrl(1).$s;
-	if ($tmpecmdir->fk_parent)
-	{
+	if ($tmpecmdir->fk_parent) {
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 	} else {
@@ -284,8 +272,11 @@ while ($tmpecmdir && $result > 0)
 $urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
 
 $s = img_picto('', 'object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s.' -> ';
-if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
-else $s .= $urlfiletoshow;
+if ($action == 'edit') {
+	$s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
+} else {
+	$s .= $urlfiletoshow;
+}
 
 $linkback = '';
 if ($backtopage) {
@@ -317,8 +308,7 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("HashOfFileContent").'</td><td>';
 $object = new EcmFiles($db);
 $object->fetch(0, '', $filepathtodocument);
-if (!empty($object->label))
-{
+if (!empty($object->label)) {
 	print $object->label;
 } else {
 	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
@@ -335,45 +325,63 @@ print '<tr><td>'.$langs->trans("DirectDownloadInternalLink").'</td><td>';
 $modulepart = 'ecm';
 $forcedownload = 1;
 $rellink = '/document.php?modulepart='.$modulepart;
-if ($forcedownload) $rellink .= '&attachment=1';
-if (!empty($object->entity)) $rellink .= '&entity='.$object->entity;
+if ($forcedownload) {
+	$rellink .= '&attachment=1';
+}
+if (!empty($object->entity)) {
+	$rellink .= '&entity='.$object->entity;
+}
 $rellink .= '&file='.urlencode($filepath);
 $fulllink = $urlwithroot.$rellink;
 print img_picto('', 'globe').' ';
-if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
-else print $fulllink;
-if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here.
+if ($action != 'edit') {
+	print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
+} else {
+	print $fulllink;
+}
+if ($action != 'edit') {
+	print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here.
+}
 print '</td></tr>';
 
 // Link for direct external download
 print '<tr><td>';
-if ($action != 'edit') print $langs->trans("DirectDownloadLink");
-else print $langs->trans("FileSharedViaALink");
+if ($action != 'edit') {
+	print $langs->trans("DirectDownloadLink");
+} else {
+	print $langs->trans("FileSharedViaALink");
+}
 print '</td><td>';
-if (!empty($object->share))
-{
-	if ($action != 'edit')
-	{
+if (!empty($object->share)) {
+	if ($action != 'edit') {
 		$forcedownload = 0;
 
 		$paramlink = '';
-		if (!empty($object->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$object->share; // Hash for public share
-		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		if (!empty($object->share)) {
+			$paramlink .= ($paramlink ? '&' : '').'hashp='.$object->share; // Hash for public share
+		}
+		if ($forcedownload) {
+			$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		}
 
 		$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		//if (! empty($object->ref))       $fulllink.='&hashn='.$object->ref;		// Hash of file path
 		//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
 
 		print img_picto('', 'globe').' ';
-		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-		else print $fulllink;
-		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
+		if ($action != 'edit') {
+			print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+		} else {
+			print $fulllink;
+		}
+		if ($action != 'edit') {
+			print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
+		}
 	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 } else {
-	if ($action != 'edit')
-	{
+	if ($action != 'edit') {
 		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
@@ -390,8 +398,7 @@ print ajax_autoselect('downloadlink');
 
 print dol_get_fiche_end();
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<div class="center">';
 	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; ';
@@ -403,18 +410,15 @@ if ($action == 'edit')
 
 
 // Confirmation de la suppression d'une ligne categorie
-if ($action == 'delete_file')
-{
+if ($action == 'delete_file') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
 }
 
-if ($action != 'edit')
-{
+if ($action != 'edit') {
 	// Actions buttons
 	print '<div class="tabsAction">';
 
-	if ($user->rights->ecm->setup)
-	{
+	if ($user->rights->ecm->setup) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
 	}
 	/*
@@ -426,7 +430,7 @@ if ($action != 'edit')
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
-    */
+	*/
 	print '</div>';
 }