From f1f64db4dc2a69392333a57a133c29e62083fa23 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 13 Aug 2018 10:20:21 +0200
Subject: [PATCH 1/2] standardize code

---
 htdocs/fourn/card.php                    | 2 +-
 htdocs/fourn/contact.php                 | 3 +--
 htdocs/fourn/index.php                   | 2 +-
 htdocs/fourn/paiement/card.php           | 2 +-
 htdocs/fourn/paiement/info.php           | 2 +-
 htdocs/fourn/product/list.php            | 1 +
 htdocs/fourn/recap-fourn.php             | 1 +
 htdocs/ftp/admin/ftpclient.php           | 2 +-
 htdocs/ftp/index.php                     | 3 +--
 htdocs/holiday/define_holiday.php        | 2 +-
 htdocs/holiday/document.php              | 3 +--
 htdocs/holiday/list.php                  | 2 +-
 htdocs/holiday/month_report.php          | 4 ++--
 htdocs/holiday/view_log.php              | 2 +-
 htdocs/hrm/admin/admin_establishment.php | 1 +
 htdocs/hrm/admin/admin_hrm.php           | 1 +
 htdocs/hrm/establishment/card.php        | 1 +
 htdocs/hrm/establishment/info.php        | 1 +
 htdocs/hrm/index.php                     | 4 +---
 19 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 906dbda4f6e..2fe58419b28 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -882,6 +882,6 @@ else
 	dol_print_error($db);
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index a334442e9ab..a6adb0bad27 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -130,7 +130,6 @@ else
     dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 033bcc63a2a..0a3ceec93a1 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -313,6 +313,6 @@ if (count($companystatic->SupplierCategories))
 //print "</td></tr></table>\n";
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index daa452d0c29..0392bf3b8bd 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -407,6 +407,6 @@ else
 
 dol_fiche_end();
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index eafc4f2decc..83794c8fb58 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -57,6 +57,6 @@ print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 47bc949a758..9927b6b2b5d 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -308,5 +308,6 @@ else
 	dol_print_error($db);
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index e680c18074e..1ff9f486510 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -191,5 +191,6 @@ else
     dol_print_error($db);
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index ee7acc9070d..1e9a6227825 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -309,6 +309,6 @@ else
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index de8489ebb55..7c9527f3a9a 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -685,9 +685,8 @@ if ($conn_id)
     }
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
 
 
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 380f609ec6d..c0bfff15507 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -374,6 +374,6 @@ else
 
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index cec638a769b..c452ac27ff0 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -295,7 +295,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 86ca95580b1..fcd5cc9d8b0 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -630,8 +630,8 @@ print '</form>';
 	print '</div>';
 }*/
 
+// End of page
 llxFooter();
-
 $db->close();
 
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 0faa2b56585..5bb3bcaeca8 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -194,6 +194,6 @@ else
 print '</table>';
 print '</div>';
 
-// Fin de page
-$db->close();
+// End of page
 llxFooter();
+$db->close();
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index c36ccd1f4d7..c9cc2e6c16f 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -138,6 +138,6 @@ print '</tbody>'."\n";
 print '</table>'."\n";
 print '</div>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index f52cb1afc61..f7ebef5e623 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -145,5 +145,6 @@ print '<div class="tabsAction">';
 print '<a class="butAction" href="../establishment/card.php?action=create">'.$langs->trans("NewEstablishment").'</a>';
 print '</div>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index ac47eec6292..c61480347bb 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -108,5 +108,6 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index c95e886e792..56a6c20176a 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -408,5 +408,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     print '</div>';
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 6cd44861ad5..35e4f483e3d 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -53,5 +53,6 @@ if ($id)
     print '</div>';
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index b49dfd92998..26ed9f82682 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -397,8 +397,6 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 
 print '</div></div></div>';
 
-
-
+// End of page
 llxFooter();
-
 $db->close();

From e9adc9fc8e7894ca27fd62703b48ffd16a6ec474 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 13 Aug 2018 11:25:48 +0200
Subject: [PATCH 2/2] Standardize code

---
 htdocs/imports/import.php                | 3 +--
 htdocs/imports/index.php                 | 3 +--
 htdocs/livraison/card.php                | 2 +-
 htdocs/loan/card.php                     | 2 +-
 htdocs/loan/createschedule.php           | 1 +
 htdocs/loan/document.php                 | 3 +--
 htdocs/loan/index.php                    | 2 +-
 htdocs/loan/info.php                     | 1 +
 htdocs/loan/note.php                     | 1 +
 htdocs/loan/payment/card.php             | 4 +---
 htdocs/margin/admin/margin.php           | 1 +
 htdocs/margin/agentMargins.php           | 1 +
 htdocs/margin/checkMargins.php           | 1 +
 htdocs/margin/customerMargins.php        | 1 +
 htdocs/margin/productMargins.php         | 1 +
 htdocs/margin/tabs/productMargins.php    | 1 +
 htdocs/margin/tabs/thirdpartyMargins.php | 1 +
 17 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 73c3d071110..6660156e59e 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1915,9 +1915,8 @@ if ($step == 6 && $datatoimport)
 
 print '<br>';
 
-
+// End of page
 llxFooter();
-
 $db->close();
 
 
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index cd67a90e4dd..b1852a3de4f 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -134,7 +134,6 @@ print '</table>';
 
 //print '</div></div></div>';
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index b33b9b4fb7a..003d6450de7 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -781,6 +781,6 @@ else
 	}
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 79569f62df3..42b604f03d5 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -805,6 +805,6 @@ if ($id > 0)
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
index e895edeec62..08ca019f00e 100644
--- a/htdocs/loan/createschedule.php
+++ b/htdocs/loan/createschedule.php
@@ -210,6 +210,7 @@ print '</br>';
 print '<div align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'"></div>';
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
 
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index b90144ea8f8..2c762b624d2 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -163,7 +163,6 @@ else
     print $langs->trans("ErrorUnknown");
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index 426a4f66491..5b81ebbb023 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -202,6 +202,6 @@ else
 	dol_print_error($db);
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index d5b6e673f7c..3a092e4cb84 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -113,5 +113,6 @@ print '</td></tr></table>';
 
 print '</div>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index f38ed50e431..2ed8e82f20b 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -129,6 +129,7 @@ if ($id > 0)
     dol_fiche_end();
 }
 
+// End of page
 llxFooter();
 $db->close();
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index e19e33bc31e..919139bd6e3 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -292,8 +292,6 @@ if (empty($action) && ! empty($user->rights->loan->delete))
 
 print '</div>';
 
-
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index ced69451d9d..4ccdcc4542a 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -278,5 +278,6 @@ dol_fiche_end();
 
 print '<br>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 8c62b4dd6fe..dc546a7f9b4 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -268,6 +268,7 @@ $(document).ready(function() {
 });
 </script>'."\n";
 
+// End of page
 llxFooter();
 $db->close();
 
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 0612c143497..7160a13ed59 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -321,5 +321,6 @@ print '</form>';
 
 $db->free($result);
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 45b604d1919..7b33517556e 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -383,5 +383,6 @@ $(document).ready(function() {
 </script>
 ';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index d827f5d985e..55fef4e5c35 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -367,5 +367,6 @@ $(document).ready(function() {
 </script>
 ';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 94eff1911e7..b4c1ac0cdd0 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -273,5 +273,6 @@ print '
     </script>
 ';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index eb61e4ec41f..2ecd6088abf 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -282,5 +282,6 @@ print '
     </script>
 ';
 
+// End of page
 llxFooter();
 $db->close();