From 948647f3f98a2baf19bdcdf97511fd376cd7b3d4 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 4 Aug 2018 14:17:51 +0200 Subject: [PATCH 1/7] comment translation --- htdocs/adherents/document.php | 2 +- htdocs/asset/document.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/propal/document.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/compta/bank/document.php | 2 +- htdocs/compta/bank/various_payment/document.php | 2 +- htdocs/compta/deplacement/document.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/salaries/document.php | 2 +- htdocs/compta/sociales/document.php | 2 +- htdocs/compta/tva/document.php | 2 +- htdocs/contact/document.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/don/document.php | 2 +- htdocs/expedition/document.php | 2 +- htdocs/expensereport/document.php | 2 +- htdocs/fichinter/document.php | 2 +- htdocs/fourn/commande/document.php | 2 +- htdocs/fourn/facture/document.php | 2 +- htdocs/holiday/document.php | 2 +- htdocs/loan/document.php | 2 +- htdocs/modulebuilder/template/myobject_document.php | 2 +- htdocs/product/document.php | 2 +- htdocs/product/stock/productlot_document.php | 2 +- htdocs/resource/document.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/supplier_proposal/document.php | 2 +- htdocs/ticket/document.php | 2 +- htdocs/user/document.php | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 4c91efc265cda..46b2b827d736b 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -91,7 +91,7 @@ if ($result > 0) { - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index 6427befd03e4f..92efa8918ee6e 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -100,7 +100,7 @@ dol_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 7fc12129cc51e..a5998e220f7fc 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -239,7 +239,7 @@ print ''; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 2f16cd54864df..cbdfd44383c61 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -94,7 +94,7 @@ $head = propal_prepare_head($object); dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index e7d0514a022b4..fc8192f7edba1 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -97,7 +97,7 @@ $head = commande_prepare_head($object); dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index d41bbd77bbe4c..f908b68b35cf8 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -105,7 +105,7 @@ dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account'); - // Construit liste des fichiers + // Build file list $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1); diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php index e11a608c7d0b3..faa9a8ed19976 100644 --- a/htdocs/compta/bank/various_payment/document.php +++ b/htdocs/compta/bank/various_payment/document.php @@ -124,7 +124,7 @@ print '
'; print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php index c2b3595b476d6..e34a2aedb217e 100644 --- a/htdocs/compta/deplacement/document.php +++ b/htdocs/compta/deplacement/document.php @@ -91,7 +91,7 @@ dol_fiche_head($head, 'documents', $langs->trans("TripCard"), 0, 'trip'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 1fd8c40bf1f6f..0ce8ad7eb92b9 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -104,7 +104,7 @@ $totalpaye = $object->getSommePaiement(); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php index 99c34f6081594..b40fef80a515d 100644 --- a/htdocs/compta/salaries/document.php +++ b/htdocs/compta/salaries/document.php @@ -90,7 +90,7 @@ dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 5f3fc5aa4ebbf..6c2bbd22a83ea 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -136,7 +136,7 @@ print '
'; print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php index b83cad80bdd29..790058c20a9e9 100644 --- a/htdocs/compta/tva/document.php +++ b/htdocs/compta/tva/document.php @@ -122,7 +122,7 @@ print '
'; print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 1a60ddaaccb74..07795da30d055 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -97,7 +97,7 @@ dol_fiche_head($head, 'documents', $title, -1, 'contact'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 20a70830952f4..4b7a9b4faf515 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -103,7 +103,7 @@ dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/don/document.php b/htdocs/don/document.php index 020272d5baeec..7459bf824534d 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -107,7 +107,7 @@ dol_fiche_head($head, 'documents', $langs->trans("Donation"), -1, 'generic'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php index 5d76a5f491899..2be84cf26b789 100644 --- a/htdocs/expedition/document.php +++ b/htdocs/expedition/document.php @@ -96,7 +96,7 @@ dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file){ diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index 0ac498ca77504..16db531102845 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -103,7 +103,7 @@ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 6e84f457eb196..d52ed81da4809 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -94,7 +94,7 @@ dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index 59358279e3181..19a084cde8617 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -107,7 +107,7 @@ dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index 1f0c9f8673954..9c111ebe77398 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -145,7 +145,7 @@ print '
'; print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php index 9d5618f3a2aff..cec638a769be3 100644 --- a/htdocs/holiday/document.php +++ b/htdocs/holiday/document.php @@ -99,7 +99,7 @@ dol_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1,'holiday'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index f9d17c563fa21..b90144ea8f880 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -134,7 +134,7 @@ print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php index f005fbf835487..9dd021326b065 100644 --- a/htdocs/modulebuilder/template/myobject_document.php +++ b/htdocs/modulebuilder/template/myobject_document.php @@ -113,7 +113,7 @@ dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 83d59a26a909d..4f6ec9cf40337 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -197,7 +197,7 @@ print $hookmanager->resPrint; if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php index f79a0d74d98e6..6a3925c4a5582 100644 --- a/htdocs/product/stock/productlot_document.php +++ b/htdocs/product/stock/productlot_document.php @@ -122,7 +122,7 @@ print $hookmanager->resPrint; if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index edaf52baba362..eaee074189bee 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -91,7 +91,7 @@ dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), -1, 'resource'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index e393fa64a2c1c..edceeb255c171 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -105,7 +105,7 @@ dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 12de448829ebd..99125e25b2695 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -87,7 +87,7 @@ $head = supplier_proposal_prepare_head($object); dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php index e31cd98912d6d..7189cc1321cac 100644 --- a/htdocs/ticket/document.php +++ b/htdocs/ticket/document.php @@ -138,7 +138,7 @@ dol_fiche_end(); - // Construit liste des fichiers + // Build file list $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1); $totalsize = 0; foreach ($filearray as $key => $file) { diff --git a/htdocs/user/document.php b/htdocs/user/document.php index a917a972ddc86..8f1d634431fea 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -141,7 +141,7 @@ print '
'; print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) From 59cd0a5e5ea39706bd20dc455e543da2bef0cf0b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 4 Aug 2018 15:58:05 +0200 Subject: [PATCH 2/7] 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 2843289c557a4..902ea6882a642 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -675,8 +675,8 @@ //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 9f4319099574f..48e2b4091d6a5 100644 --- a/htdocs/user/admin/group_extrafields.php +++ b/htdocs/user/admin/group_extrafields.php @@ -114,6 +114,6 @@ 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 ff07845f92dea..81dc7c290c103 100644 --- a/htdocs/user/admin/user_extrafields.php +++ b/htdocs/user/admin/user_extrafields.php @@ -113,6 +113,6 @@ 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 1764ab5baf4bf..3146f1095b045 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -218,7 +218,6 @@ print "\n"; - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 7f11911a46b00..136384877fbfa 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -559,6 +559,6 @@ if ($id && $action == 'create' && $user->rights->user->user->creer) print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 8fd979015bf67..6c57af79de227 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2538,5 +2538,6 @@ function(token) { print ''; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index a4c4e90f99dbd..bfab243bbaf8f 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -216,7 +216,6 @@ } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/document.php b/htdocs/user/document.php index 8f1d634431fea..6b22a303f96bd 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -178,6 +178,6 @@ accessforbidden('',0,0); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 47a5a5df9eb4b..44eef8dfc1fe7 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -586,5 +586,6 @@ } } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index bb9d05d59f147..5bc6130a2b6a0 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -212,5 +212,6 @@ print '
'; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index 946ba132af8d8..745f90020557a 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -227,6 +227,6 @@ 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 0d019b1226c94..4b4b181cdc889 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -349,5 +349,6 @@ dol_fiche_end(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index 0b1842dabded6..a33049ffbad68 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -204,6 +204,6 @@ function init_myfunc() '; */ +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 6ace60c2fcaf0..f9ccd9aa7ca5e 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -286,6 +286,6 @@ //print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/info.php b/htdocs/user/info.php index 19ecf15eb6500..8fba36a3e8a09 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -93,6 +93,6 @@ dol_fiche_end(); - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 4f9eac61d9f8a..4a4ffeb875d07 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -218,5 +218,6 @@ print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/list.php b/htdocs/user/list.php index a1f0cdd547193..f610d6b720e6e 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -628,5 +628,6 @@ $db->free($result); +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 5b787ded7b012..5e1c33cb57d1e 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -158,6 +158,6 @@ print "\n"; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index e8914298ac326..7e04adab9a7cb 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -507,7 +507,6 @@ } 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 1bf0dbbe7858d..5c2869847c6b2 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -374,5 +374,6 @@ function init_myfunc() print ''; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 30b988d3b2268..e6487cba47ce4 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -400,6 +400,6 @@ dol_fiche_end(); +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php index 57db7c49f20b1..c21049a5c7695 100644 --- a/htdocs/variants/admin/admin.php +++ b/htdocs/variants/admin/admin.php @@ -71,7 +71,7 @@ print '
'; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index 3addef7ddf984..3f298ae93e63c 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -299,5 +299,6 @@ close(); +$db->close();; diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index b741fef40bb6d..636824d198050 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -773,7 +773,6 @@ // not found } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php index c4d775f3d50b9..c3fbc39b82cc5 100644 --- a/htdocs/variants/create.php +++ b/htdocs/variants/create.php @@ -97,5 +97,6 @@ print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php index f0dd8e9cb743c..74da8a8043e1d 100644 --- a/htdocs/variants/create_val.php +++ b/htdocs/variants/create_val.php @@ -144,5 +144,6 @@ print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index af859175946c0..6debdb737d04d 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -151,4 +151,6 @@ function( intIndex ) { close(); \ No newline at end of file diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php index e0e549cf2a759..5c49e457c4f4f 100644 --- a/htdocs/webservices/admin/index.php +++ b/htdocs/webservices/admin/index.php @@ -156,6 +156,6 @@ function(token) { print ''; } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/website/index.php b/htdocs/website/index.php index ff33c44763d70..ceb6f5480d92c 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2439,8 +2439,6 @@ } } - - +// End of page llxFooter(); - $db->close(); From de5281e587182a700f5e1b8eb786091b4882ab3b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 5 Aug 2018 10:56:39 +0200 Subject: [PATCH 3/7] standerdize --- htdocs/stripe/admin/stripe.php | 2 +- htdocs/stripe/charge.php | 1 + htdocs/stripe/transaction.php | 1 + .../supplier_proposal/admin/supplier_proposal_extrafields.php | 2 +- .../admin/supplier_proposaldet_extrafields.php | 2 +- htdocs/supplier_proposal/contact.php | 2 +- htdocs/supplier_proposal/document.php | 1 + htdocs/supplier_proposal/index.php | 2 +- htdocs/supplier_proposal/info.php | 1 + htdocs/supplier_proposal/note.php | 2 +- htdocs/ticket/document.php | 1 + 11 files changed, 11 insertions(+), 6 deletions(-) diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 964280055c24b..e142ca524b41c 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -354,7 +354,7 @@ print ''; } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 1464c9c2e6b0f..2f3d184fdb97e 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -207,5 +207,6 @@ } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index fc7ffa828e04e..5b9282a6e799a 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -203,5 +203,6 @@ print ''; } else {} +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php index 545d953e753ba..24ae20848f124 100644 --- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php @@ -143,6 +143,6 @@ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php index 1f5b95825580a..7d153a78cdc3f 100644 --- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php @@ -145,6 +145,6 @@ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php index fdf51406e8e82..7be0dcbc78a94 100644 --- a/htdocs/supplier_proposal/contact.php +++ b/htdocs/supplier_proposal/contact.php @@ -202,6 +202,6 @@ } } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 99125e25b2695..cf50024629091 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -170,5 +170,6 @@ print $langs->trans("ErrorUnknown"); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 0e1b51480c1eb..cec80662c4155 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -375,6 +375,6 @@ print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php index 3f83b4dca88b7..95a753272be91 100644 --- a/htdocs/supplier_proposal/info.php +++ b/htdocs/supplier_proposal/info.php @@ -123,5 +123,6 @@ dol_fiche_end(); +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php index ba54859a20719..ff531b05d8348 100644 --- a/htdocs/supplier_proposal/note.php +++ b/htdocs/supplier_proposal/note.php @@ -143,6 +143,6 @@ } } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php index 7189cc1321cac..d1d80387f6e04 100644 --- a/htdocs/ticket/document.php +++ b/htdocs/ticket/document.php @@ -158,5 +158,6 @@ accessforbidden('', 0, 0); } +// End of page llxFooter(); $db->close(); From 4e3898d357c78586e39692ef3f34cfc96f93e87b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 5 Aug 2018 17:21:59 +0200 Subject: [PATCH 4/7] standardize --- htdocs/societe/admin/contact_extrafields.php | 2 +- htdocs/societe/admin/societe.php | 3 +-- htdocs/societe/admin/societe_extrafields.php | 2 +- htdocs/societe/agenda.php | 3 +-- htdocs/societe/card.php | 1 - htdocs/societe/checkvat/checkVatPopup.php | 4 ++-- htdocs/societe/consumption.php | 2 +- htdocs/societe/contact.php | 2 -- htdocs/societe/document.php | 2 +- htdocs/societe/index.php | 2 +- htdocs/societe/list.php | 1 + htdocs/societe/note.php | 1 + htdocs/societe/notify/card.php | 3 +-- htdocs/societe/notify/index.php | 2 +- htdocs/societe/paymentmodes.php | 3 +-- htdocs/societe/price.php | 2 +- htdocs/societe/project.php | 3 +-- htdocs/societe/societecontact.php | 1 + htdocs/societe/website.php | 4 +--- 19 files changed, 18 insertions(+), 25 deletions(-) diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php index 6a359232a167a..34bdb68883525 100644 --- a/htdocs/societe/admin/contact_extrafields.php +++ b/htdocs/societe/admin/contact_extrafields.php @@ -113,6 +113,6 @@ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index ecbefe2cb1db0..a833363aff1e0 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -835,7 +835,6 @@ dol_fiche_end(); - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 11131eb25af60..39f3ab5386675 100644 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -114,6 +114,6 @@ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index ebd35a6575cc5..ffcd894e84a9c 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -190,7 +190,6 @@ } } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 419c007906abc..5343c5509a143 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2650,7 +2650,6 @@ } } - // End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index e15c0864574e2..1222689358f18 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -174,6 +174,6 @@ print nl2br($messagetoshow); } - +// End of page llxFooter(); -$db->close(); +$db->close();; diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 947c35a2d5c37..c46f046f4838c 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -650,6 +650,6 @@ print ""; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php index 37fb07eb6526c..24ec002645525 100644 --- a/htdocs/societe/contact.php +++ b/htdocs/societe/contact.php @@ -171,8 +171,6 @@ } } - - // End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index edceeb255c171..25478e133af41 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -169,6 +169,6 @@ accessforbidden('',0,0); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 1bed6e635a08b..b7ce405b43343 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -365,6 +365,6 @@ //print ''; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index d0e7fd1906247..a8ae45b317c78 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1301,5 +1301,6 @@ print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php index e31a07e8e65f9..169d2b687e95c 100644 --- a/htdocs/societe/note.php +++ b/htdocs/societe/note.php @@ -129,6 +129,7 @@ print $langs->trans("ErrorRecordNotFound"); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index cd8212ae3275e..fb4b51f17c80a 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -532,7 +532,6 @@ } else dol_print_error('','RecordNotFound'); - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 3326e431178bb..9980cf19a2a5e 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -105,6 +105,6 @@ dol_print_error($db); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index 89aad30e2f5da..d099cfcc10358 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -1610,7 +1610,6 @@ print ''; } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index e35cf186ae3f4..45d7f9ad0202b 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -615,6 +615,6 @@ } } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php index 08e2f593acb71..dd06346ca33c4 100644 --- a/htdocs/societe/project.php +++ b/htdocs/societe/project.php @@ -147,7 +147,6 @@ $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index dfe78041f8a6e..a2f09f9b77d9b 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -343,5 +343,6 @@ } } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index d00b3144185dc..760bfef4d27d2 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -549,8 +549,6 @@ print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty); } - - +// End of page llxFooter(); - $db->close(); From 094fc6b69934f56edf5ef2db274d4ae954a8d550 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 6 Aug 2018 11:53:33 +0200 Subject: [PATCH 5/7] Standardize --- htdocs/public/onlinesign/newonlinesign.php | 1 + htdocs/public/payment/newpayment.php | 5 +++-- htdocs/resource/contact.php | 2 +- htdocs/resource/document.php | 3 +-- htdocs/resource/list.php | 1 + htdocs/resource/note.php | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 6c9b4b154bfd3..7571f466c461d 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -147,6 +147,7 @@ { $langs->load("errors"); dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref)); + // End of page llxFooter(); $db->close(); exit; diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index a189781c8c1d8..91a62ea347c29 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -617,8 +617,9 @@ { $langs->load("errors"); dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref)); - llxFooter(); - $db->close(); + // End of page + llxFooter(); + $db->close();; exit; } diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php index e350c746c12d2..a90d68ff94cc5 100644 --- a/htdocs/resource/contact.php +++ b/htdocs/resource/contact.php @@ -162,6 +162,6 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index eaee074189bee..6a32ba9f645b9 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -142,7 +142,6 @@ print $langs->trans("ErrorUnknown"); } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 8ef3168ee96c6..7ca7ed2129573 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -289,5 +289,6 @@ print ''; print "\n"; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php index 9116cdd038743..f811d0e07eddd 100644 --- a/htdocs/resource/note.php +++ b/htdocs/resource/note.php @@ -100,5 +100,6 @@ dol_fiche_end(); } +// End of page llxFooter(); $db->close(); From 42fe2b78de9c3b6ca2b4ed55ef02728e77284d9c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 7 Aug 2018 10:44:26 +0200 Subject: [PATCH 6/7] clean and update code --- htdocs/admin/mails.php | 4 ++-- htdocs/core/tpl/objectline_view.tpl.php | 4 ++-- htdocs/variants/list.php | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index e4f6ffc397a77..4ad7a74bcb9a4 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -366,7 +366,7 @@ function initfields() { $mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:''); - print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''; // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { @@ -386,7 +386,7 @@ function initfields() { $mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:''); - print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''; // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index b36159f9340a3..dbedf2be1ce64 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -66,7 +66,7 @@ ?> - > + > global->MAIN_VIEW_LINE_NUMBER)) { ?> @@ -321,7 +321,7 @@ //Line extrafield if (!empty($extrafieldsline)) { - print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcdd[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1); + print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1); } ?> diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index 6debdb737d04d..f9420919e9150 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -50,7 +50,6 @@ $langs->load('products'); -$var = false; $title = $langs->trans($langs->trans('ProductAttributes')); $variants = $object->fetchAll(); @@ -122,7 +121,7 @@ function( intIndex ) { $attribute): ?> - > + ref) ?> label) ?> countChildValues() ?> @@ -143,7 +142,6 @@ function( intIndex ) { From 68de0ba93b0a0efc86640c7d08540b7dfe7bd014 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 7 Aug 2018 10:56:59 +0200 Subject: [PATCH 7/7] clean and update code --- htdocs/comm/mailing/cibles.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 6caa262500e00..7b01c1c5a22bf 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -303,8 +303,6 @@ // Sort $modulenames sort($modulenames); - $var = true; - // Loop on each submodule foreach($modulenames as $modulename) { @@ -330,16 +328,14 @@ // Si le module mailing est qualifie if ($qualified) { - $var = ! $var; - if ($allowaddtarget) { - print '
'; + print ''; print ''; } else { - print '
'; + print '
'; } print '
';