From ccabd2b859058a6838126915afb233bd71403bf9 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 2 Aug 2018 14:03:50 +0200 Subject: [PATCH] Uniformize --- htdocs/expedition/card.php | 3 +-- htdocs/expedition/contact.php | 2 +- htdocs/expedition/document.php | 3 +-- htdocs/expedition/index.php | 2 +- htdocs/expedition/list.php | 1 + htdocs/expedition/note.php | 3 +-- htdocs/expedition/shipment.php | 3 +-- htdocs/expedition/stats/index.php | 2 +- htdocs/expedition/stats/month.php | 2 +- htdocs/expensereport/card.php | 5 +++-- htdocs/expensereport/document.php | 2 +- htdocs/expensereport/export_csv.php | 2 +- htdocs/expensereport/index.php | 2 +- htdocs/expensereport/info.php | 2 +- htdocs/expensereport/list.php | 3 +-- htdocs/expensereport/note.php | 2 +- htdocs/expensereport/payment/card.php | 2 +- htdocs/expensereport/payment/info.php | 1 + htdocs/expensereport/payment/payment.php | 1 + htdocs/expensereport/stats/index.php | 3 +-- htdocs/exports/index.php | 3 +-- 21 files changed, 23 insertions(+), 26 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 93b3f3a5f4d..d56134b7726 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2594,7 +2594,6 @@ else if ($id || $ref) include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index 3f557059600..acc2b5e1142 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -268,6 +268,6 @@ if ($id > 0 || ! empty($ref)) } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php index 4f9616df5ed..5d76a5f4918 100644 --- a/htdocs/expedition/document.php +++ b/htdocs/expedition/document.php @@ -185,7 +185,6 @@ else{ exit; } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 042d107b58e..8dde7bf0125 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -291,6 +291,6 @@ else dol_print_error($db); print ''; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 14f9eb41f44..327a9394b77 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -632,5 +632,6 @@ else dol_print_error($db); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php index fafaf10fe1f..f276b2d0cb4 100644 --- a/htdocs/expedition/note.php +++ b/htdocs/expedition/note.php @@ -152,7 +152,6 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index cb058e44598..0d3111d9f12 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -926,7 +926,6 @@ if ($id > 0 || ! empty($ref)) } } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index 651be627b78..a167a447d7d 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -358,6 +358,6 @@ print ''; print '
'; print ''.$langs->trans("StatsOnShipmentsOnlyValidated").''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index b7d217217c2..27b01cc6f55 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/stats/month.php @@ -71,6 +71,6 @@ print $px->show(); print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 141260d36f3..75285bf35cf 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1450,8 +1450,9 @@ else print $langs->trans('NotUserRightToView'); print ''; - llxFooter(); - $db->close(); + // End of page + llxFooter(); + $db->close(); exit; } diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index f0d61d0f80d..0ac498ca775 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -139,6 +139,6 @@ else print $langs->trans("ErrorUnknown"); } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php index 4bc461b4d13..8ea72191b1d 100644 --- a/htdocs/expensereport/export_csv.php +++ b/htdocs/expensereport/export_csv.php @@ -195,6 +195,6 @@ if (isset($_POST['action'])) print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index 0d988e4850d..758dd89afe2 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -231,6 +231,6 @@ else dol_print_error($db); print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php index 6babfcd647c..67f70f3a984 100644 --- a/htdocs/expensereport/info.php +++ b/htdocs/expensereport/info.php @@ -79,6 +79,6 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index d3e5bc6fabd..d328cd21de2 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -861,7 +861,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php index baa0c174fc1..deb38abe8d6 100644 --- a/htdocs/expensereport/note.php +++ b/htdocs/expensereport/note.php @@ -97,6 +97,6 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index 2876d512c52..2c053d5cc35 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -310,6 +310,6 @@ if ($action == '') print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php index 97098ef2340..6c7f8dd99c6 100644 --- a/htdocs/expensereport/payment/info.php +++ b/htdocs/expensereport/payment/info.php @@ -77,5 +77,6 @@ print ''; dol_fiche_end(); +// End of page llxFooter(); $db->close(); diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index 23959c06e67..dc78b933055 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -336,5 +336,6 @@ if ($action == 'create' || empty($action)) print "\n"; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index b4f0327cd39..b97129a5779 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -305,7 +305,6 @@ print '
'; dol_fiche_end(); - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index bccf25f1be8..81027882b6b 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -145,7 +145,6 @@ print ''; //print ''; - +// End of page llxFooter(); - $db->close();