From 59cd0a5e5ea39706bd20dc455e543da2bef0cf0b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 4 Aug 2018 15:58:05 +0200
Subject: [PATCH] uniformize

---
 htdocs/index.php                        | 2 +-
 htdocs/user/admin/group_extrafields.php | 2 +-
 htdocs/user/admin/user_extrafields.php  | 2 +-
 htdocs/user/agenda_extsites.php         | 3 +--
 htdocs/user/bank.php                    | 2 +-
 htdocs/user/card.php                    | 1 +
 htdocs/user/clicktodial.php             | 3 +--
 htdocs/user/document.php                | 2 +-
 htdocs/user/group/card.php              | 1 +
 htdocs/user/group/ldap.php              | 1 +
 htdocs/user/group/list.php              | 2 +-
 htdocs/user/group/perms.php             | 1 +
 htdocs/user/hierarchy.php               | 2 +-
 htdocs/user/home.php                    | 2 +-
 htdocs/user/info.php                    | 2 +-
 htdocs/user/ldap.php                    | 1 +
 htdocs/user/list.php                    | 1 +
 htdocs/user/note.php                    | 2 +-
 htdocs/user/notify/card.php             | 3 +--
 htdocs/user/param_ihm.php               | 1 +
 htdocs/user/perms.php                   | 2 +-
 htdocs/variants/admin/admin.php         | 2 +-
 htdocs/variants/card.php                | 3 ++-
 htdocs/variants/combinations.php        | 3 +--
 htdocs/variants/create.php              | 1 +
 htdocs/variants/create_val.php          | 1 +
 htdocs/variants/list.php                | 4 +++-
 htdocs/webservices/admin/index.php      | 2 +-
 htdocs/website/index.php                | 4 +---
 29 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 2843289c557..902ea6882a6 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -675,8 +675,8 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 
 //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();
 
+// End of page
 llxFooter();
-
 $db->close();
 
 
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 9f431909957..48e2b4091d6 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index ff07845f92d..81dc7c290c1 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 1764ab5baf4..3146f1095b0 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -218,7 +218,6 @@ print "</div>";
 
 print "</form>\n";
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 7f11911a46b..136384877fb 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -559,6 +559,6 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>
 
 if ($id && $action == 'create' && $user->rights->user->user->creer) print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8fd979015bf..6c57af79de2 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2538,5 +2538,6 @@ if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
 	print '</script>';
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index a4c4e90f99d..bfab243bbaf 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -216,7 +216,6 @@ if ($id > 0)
 
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 8f1d634431f..6b22a303f96 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -178,6 +178,6 @@ else
 	accessforbidden('',0,0);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 47a5a5df9eb..44eef8dfc1f 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -586,5 +586,6 @@ else
     }
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index bb9d05d59f1..5bc6130a2b6 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -212,5 +212,6 @@ else
 
 print '</table>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 946ba132af8..745f9002055 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -227,6 +227,6 @@ else
     dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 0d019b1226c..4b4b181cdc8 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -349,5 +349,6 @@ if ($object->id > 0)
     dol_fiche_end();
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 0b1842dabde..a33049ffbad 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -204,6 +204,6 @@ jQuery(document).ready(function() {
 </script>';
 */
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 6ace60c2fca..f9ccd9aa7ca 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -286,6 +286,6 @@ if ($canreadperms)
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 19ecf15eb65..8fba36a3e8a 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -93,6 +93,6 @@ print '</div>';
 
 dol_fiche_end();
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 4f9eac61d9f..4a4ffeb875d 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -218,5 +218,6 @@ else
 
 print '</table>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index a1f0cdd5471..f610d6b720e 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -628,5 +628,6 @@ print "</form>\n";
 
 $db->free($result);
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 5b787ded7b0..5e1c33cb57d 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -158,6 +158,6 @@ if ($id)
 	print "</form>\n";
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e8914298ac3..7e04adab9a7 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -507,7 +507,6 @@ if ($result > 0)
 }
 else dol_print_error('','RecordNotFound');
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 1bf0dbbe785..5c2869847c6 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -374,5 +374,6 @@ if ($action == 'edit')
     print '</form>';
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 30b988d3b22..e6487cba47c 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -400,6 +400,6 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 dol_fiche_end();
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index 57db7c49f20..c21049a5c76 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -71,7 +71,7 @@ print '</table>';
 print '<br><div style="text-align: center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
 
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 3addef7ddf9..3f298ae93e6 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -299,5 +299,6 @@ if ($action == 'edit') { ?>
 	<?php
 }
 
+// End of page
 llxFooter();
-$db->close();
+$db->close();;
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index b741fef40bb..636824d1980 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -773,7 +773,6 @@ if (! empty($id) || ! empty($ref))
 	// not found
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index c4d775f3d50..c3fbc39b82c 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -97,5 +97,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index f0dd8e9cb74..74da8a8043e 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -144,5 +144,6 @@ print '</div>';
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index af859175946..6debdb737d0 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -151,4 +151,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 
 <?php
 
-llxFooter();
\ No newline at end of file
+// End of page
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index e0e549cf2a7..5c49e457c4f 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -156,6 +156,6 @@ if (! empty($conf->use_javascript_ajax))
 	print '</script>';
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ff33c44763d..ceb6f5480d9 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2439,8 +2439,6 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 	}
 }
 
-
-
+// End of page
 llxFooter();
-
 $db->close();