From 9cc40fcb215fe22c1997002dc5e07b5ca70364ab Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 28 Jul 2018 17:26:56 +0200
Subject: [PATCH] standardize

---
 htdocs/admin/agenda.php                    |  2 +-
 htdocs/admin/bank.php                      |  2 +-
 htdocs/admin/bank_extrafields.php          |  2 +-
 htdocs/admin/barcode.php                   |  1 +
 htdocs/admin/boxes.php                     |  3 +--
 htdocs/admin/chequereceipts.php            |  2 +-
 htdocs/admin/clicktodial.php               |  2 +-
 htdocs/admin/commande.php                  |  3 +--
 htdocs/admin/company.php                   |  3 +--
 htdocs/admin/compta.php                    |  1 +
 htdocs/admin/confexped.php                 |  1 +
 htdocs/admin/const.php                     |  3 +--
 htdocs/admin/contract.php                  |  3 +--
 htdocs/admin/dav.php                       |  2 +-
 htdocs/admin/defaultvalues.php             |  3 +--
 htdocs/admin/delais.php                    |  1 +
 htdocs/admin/dict.php                      |  2 +-
 htdocs/admin/ecm.php                       |  1 +
 htdocs/admin/events.php                    |  2 +-
 htdocs/admin/expedition.php                |  1 +
 htdocs/admin/expedition_extrafields.php    |  2 +-
 htdocs/admin/expeditiondet_extrafields.php |  2 +-
 htdocs/admin/expensereport.php             |  3 +--
 htdocs/admin/expensereport_extrafields.php |  2 +-
 htdocs/admin/expensereport_ik.php          |  3 ++-
 htdocs/admin/expensereport_rules.php       |  3 ++-
 htdocs/admin/export.php                    | 14 +++++---------
 27 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 6fedfa6d2cb..7f41927b478 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -202,6 +202,6 @@ print "</form>\n";
 
 print "<br>";
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index a4e9e4bb210..1e9acde2665 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -432,6 +432,6 @@ print "</tr>\n";
 print '</table>';
 dol_fiche_end();
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 99b8d09f277..3b95c158f27 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_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/admin/barcode.php b/htdocs/admin/barcode.php
index a7a863c4725..4e0c683a73f 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -405,5 +405,6 @@ if ($conf->produit->enabled)
 
 print "<br>";
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 04fd76e96fc..9f3453f7587 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -488,7 +488,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
 print '</form>';
 print "\n".'<!-- End Other Const -->'."\n";
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index df628ecc87f..82b0ed3848c 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -280,6 +280,6 @@ dol_fiche_end();
 
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index c2cfaf9f72a..34a641137dc 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -140,6 +140,6 @@ if (! empty($conf->global->CLICKTODIAL_URL))
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index cee12e4b08e..64df9194197 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -679,7 +679,6 @@ print "</td></tr>\n";
 
 print '</table>';
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 949038b4413..4a006c56268 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -1153,7 +1153,6 @@ else
 	print '</div>';
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 8e17541bfef..214c30dc544 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -164,5 +164,6 @@ print "</table>\n";
 print '<br><br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index e4691a42e78..9e6745e6c29 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -147,5 +147,6 @@ print '</table>';
 
 print '</div>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 9dd68c16326..be5f785f9e4 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -314,7 +314,6 @@ if ($conf->use_javascript_ajax)
 
 print "</form>\n";
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 74f7acb04f3..60be9e062ba 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -509,7 +509,6 @@ print '</form>';
 
 dol_fiche_end();
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index ea4bbf97af0..e882a56e2b8 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -143,6 +143,6 @@ $message.=img_picto('','object_globe.png').' '.$langs->trans("WebDavServer",'Web
 $message.='<br>';
 print $message;
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 84271cff38f..984ddfbefd7 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -412,7 +412,6 @@ dol_fiche_end();
 
 print "</form>\n";
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index ae3c43c5b24..14dfb9922f6 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -415,5 +415,6 @@ if($action == 'edit') {
 
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 32995bce38f..0c25f3a5bd8 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1735,7 +1735,7 @@ else
 
 print '<br>';
 
-
+// End of page
 llxFooter();
 $db->close();
 
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index dc2f3e489f7..3126f432938 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -109,5 +109,6 @@ print '</td></tr>';
 
 print '</table>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 1d1ec548853..606d3a5f201 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -114,6 +114,6 @@ print "</div>";
 
 print "</form>\n";
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index eb18f904229..c851010635e 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -507,5 +507,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index 12365f1801d..b7c8ddffa71 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -119,6 +119,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/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index 89b270d10fc..cc5a9bddfa5 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -120,6 +120,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/admin/expensereport.php b/htdocs/admin/expensereport.php
index 1002b146113..78287f71eab 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -513,7 +513,6 @@ print '</form>';
 
 dol_fiche_end();
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 99d1bd0e8da..3fedf935405 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -115,6 +115,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/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index db7100d5928..d3937a98ba7 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -179,6 +179,7 @@ echo '</table>';
 echo '</form>';
 
 dol_fiche_end();
-llxFooter();
 
+// End of page
+llxFooter();
 $db->close();
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index b1d65b8635b..d49d25b76b6 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -354,6 +354,7 @@ echo '<script type="text/javascript"> $(function() {
 }); </script>';
 
 dol_fiche_end();
-llxFooter();
 
+// End of page
+llxFooter();
 $db->close();
diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index b6f12a723ff..292c3604799 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2015	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2018	Philippe Grand			<philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,9 +32,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'exports'));
-
-$langs->load('other');
+$langs->loadLangs(array('admin', 'exports', 'other'));
 
 if (! $user->admin)
 	accessforbidden();
@@ -73,7 +71,7 @@ dol_fiche_head(
 
 // Setup page goes here
 $form=new Form($db);
-$var=false;
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("ExportModel").'</td>'."\n";
@@ -82,8 +80,7 @@ print '<td align="center" width="100"></td>'."\n";
 
 
 // Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("set_EXPORTS_SHARE_MODELS").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">';
@@ -94,9 +91,8 @@ echo ajax_constantonoff('EXPORTS_SHARE_MODELS');
 print '</form>';
 print '</td></tr>';
 
-
 print '</table>';
 
+// End of page
 llxFooter();
-
 $db->close();