From ff46a0ee3079ae811f6b1d10db3b953ec733b17d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 12:33:01 +0100 Subject: [PATCH 1/8] update with html5 compliant code --- htdocs/admin/agenda_extsites.php | 2 +- htdocs/admin/tools/listevents.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 66f18308931..3fe540a2baf 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -220,7 +220,7 @@ while ($i <= $MAXAGENDA) // Offset TZ print ''; // Color (Possible colors are limited by Google) - print ''; + print ''; //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key)?GETPOST("AGENDA_EXT_COLOR".$key):$conf->global->$color), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset'); print ''; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 4558af0baae..e00e2c6a98e 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -255,7 +255,7 @@ if ($result) //print ''; print ''; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; From 2a9c378c1fecc2232b6194496b39097346d42ede Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 12:35:49 +0100 Subject: [PATCH 2/8] update with html5 compliant code --- htdocs/admin/agenda.php | 4 ++-- htdocs/admin/barcode.php | 4 ++-- htdocs/admin/company.php | 2 +- htdocs/admin/const.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 1c6e5c16fcf..27dad04dc32 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -144,7 +144,7 @@ print ''; print ''; print ''; // Action column -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -179,7 +179,7 @@ if (! empty($triggers)) print ''; print ''.$trigger['code'].''; print ''.$trigger['label'].''; - print ''; + print ''; $key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code']; $value=$conf->global->$key; print ''; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 6cf9c84d265..45b908487a3 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -333,7 +333,7 @@ if (! empty($conf->product->enabled)) print ''; print ''.$langs->trans("SetDefaultBarcodeTypeProducts").''; - print ''; + print ''; print $formbarcode->selectBarcodeType($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE, "PRODUIT_DEFAULT_BARCODE_TYPE", 1); print ''; } @@ -344,7 +344,7 @@ if (! empty($conf->societe->enabled)) print ''; print ''.$langs->trans("SetDefaultBarcodeTypeThirdParties").''; - print ''; + print ''; print $formbarcode->selectBarcodeType($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY, "GENBARCODE_BARCODETYPE_THIRDPARTY", 1); print ''; } diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index c0599a666dc..16b57ab1e74 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -417,7 +417,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''; print ''; print ''; - print ''; diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 12703d5d38a..a5cb2d8b396 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -356,7 +356,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index ab79bfec0fa..844fe093315 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -621,7 +621,7 @@ if ($resql) // There is several pages if ($num > $listlimit) { - print ''; } @@ -657,7 +657,7 @@ if ($resql) } if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print ''; // Action column - print ''; diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index c70d8c08a91..acb4ab2166e 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -79,7 +79,7 @@ print ''; print '
'; print ''; - print ''; + print ''; if (! empty($mysoc->logo_mini)) { print ''.img_delete($langs->trans("Delete")).''; if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index fedccb49642..bc48425017b 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -304,10 +304,10 @@ print ''; if ($conf->use_javascript_ajax) { print '
'; - print '
'; + print '
'; print ''; print '
'; - print '
'; + print '
'; print ''; print '
'; } From 1cda3106b230d8e1a18155ba8e2fcaa591d98a55 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 12:40:50 +0100 Subject: [PATCH 3/8] update with html5 compliant code --- htdocs/admin/dict.php | 2 +- htdocs/admin/emailcollector_list.php | 2 +- htdocs/admin/mails_senderprofile_list.php | 2 +- htdocs/admin/mails_templates.php | 4 ++-- htdocs/admin/resource.php | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 8a52a4346f8..ee3083410dd 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1246,7 +1246,7 @@ if ($id) } if ($id == 4) print '
'; + print ''; if ($filterfound) { $searchpicto=$form->showFilterAndCheckAddButtons(0); diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index f388cea8b55..bb6fa4bdd87 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -385,7 +385,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'; + print '
'; print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), ''); print '
'; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'; print ''; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''; @@ -88,13 +88,13 @@ print ''; print ''; if (empty($conf->use_javascript_ajax)) { - print ''; } else { - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").''.$langs->trans("Value").'
'.$langs->trans("UseSearchToSelectResource").''; + print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print ''; + print ''; $arrval=array( '0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')', From 0cc805370808d5821ea2d6cc09e2c9a9467cbcc5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 12:42:38 +0100 Subject: [PATCH 4/8] update with html5 compliant code --- htdocs/admin/security.php | 2 +- htdocs/admin/syslog.php | 2 +- htdocs/admin/taxes.php | 2 +- htdocs/admin/translation.php | 2 +- htdocs/admin/website.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 7a4581ac8ec..91973ea22c3 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -330,7 +330,7 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso"){ print '
'; print '
'; - print ''; + print '
'; print ''; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 9c857964a3c..e212ee8b949 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -202,7 +202,7 @@ print ''; print '
'; print ''.$langs->trans("Save").''; print '
'; print ''; print ''; -print ''; +print ''; print "\n"; foreach ($syslogModules as $moduleName) diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index b3fd9ef4359..723cf4e33a0 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -147,7 +147,7 @@ else print ''; if (! $conf->use_javascript_ajax) { - print '"; } diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index f857ab7ed11..a791cdde4ed 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -500,7 +500,7 @@ if ($mode == 'searchkey') //} print ''; // Action column - print ''; diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index 3f52896b631..4abcaed9b6a 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -502,7 +502,7 @@ if ($id) fieldListWebsites($fieldlist,$obj,$tabname[$id],'add'); - print ''; } else From 6c6a8db2df33833b82a5490b74cce4291b1f5e45 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 13:29:34 +0100 Subject: [PATCH 5/8] update with html5 compliant code --- htdocs/asset/list.php | 2 +- htdocs/blockedlog/admin/blockedlog.php | 2 +- htdocs/blockedlog/admin/blockedlog_list.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index c6710f290cc..262b203f26e 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -364,7 +364,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php index 8c2835d856c..36ac6615efa 100644 --- a/htdocs/blockedlog/admin/blockedlog.php +++ b/htdocs/blockedlog/admin/blockedlog.php @@ -116,7 +116,7 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) { // Example with a yes / no select print ''; print ''; - print '\n"; @@ -182,7 +182,7 @@ if ($resql) print '"; // Actions - print ''; print '
'.$langs->trans("NbOfUniqueEMails").'
'; //print ''; - print '
'.$langs->trans("Filter").'
'; + print '
'.$langs->trans("Filter").'
'; //print ''; print '
 
'; //print "\n"; @@ -363,7 +363,7 @@ if ($object->fetch($id) >= 0) } print ''; - print '
'; + print '
'; if ($allowaddtarget) { try { @@ -378,7 +378,7 @@ if ($object->fetch($id) >= 0) } print '
'; - print '
'; + print '
'; if ($allowaddtarget) { print ''; @@ -501,11 +501,11 @@ if ($object->fetch($id) >= 0) print ' '; print ''; //Statut - print '
'; // Action column - print ''; @@ -526,7 +526,7 @@ if ($object->fetch($id) >= 0) { print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder); } - print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder); + print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"mc.statut",$param,'','class="right"',$sortfield,$sortorder); print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); print ''; @@ -590,13 +590,13 @@ if ($object->fetch($id) >= 0) if ($obj->statut == 0) { print ''; - print ''; } else { print ''; - print ''; } From 7cf51a5e3534d9527401ea6317e4efe491d8fa0f Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 14:05:55 +0100 Subject: [PATCH 7/8] fix translation --- htdocs/adherents/class/adherent_type.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 263012df782..dd9da927c25 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -164,7 +164,7 @@ class AdherentType extends CommonObject } /** - * Met a jour en base donnees du type + * Updating the type in the database * * @param User $user Object user making change * @param int $notrigger 1=do not execute triggers, 0 otherwise @@ -234,9 +234,9 @@ class AdherentType extends CommonObject } /** - * Fonction qui permet de supprimer le status de l'adherent + * Function to delete the member's status * - * @return int >0 if OK, 0 if not found, < 0 if KO + * @return int > 0 if OK, 0 if not found, < 0 if KO */ function delete() { @@ -267,7 +267,7 @@ class AdherentType extends CommonObject } /** - * Fonction qui permet de recuperer le status de l'adherent + * Function that retrieves the status of the member * * @param int $rowid Id of member type to load * @return int <0 if KO, >0 if OK From c5bbaa4aa3f5f5ad9b4c1b3397492ac2ba8de26b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 15:15:18 +0100 Subject: [PATCH 8/8] fix translation --- htdocs/adherents/class/adherent.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 959dacba2c1..f5cb86304d5 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -2520,7 +2520,7 @@ class Adherent extends CommonObject /** - * Charge les informations d'ordre info dans l'objet adherent + * Load type info information in the member object * * @param int $id Id of member to load * @return void
'.$langs->trans("Type").''.$langs->trans("Value").'
'; + print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print "'; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1); print $searchpicto; print ''; + print ''; if ($action != 'edit') { print ''; @@ -585,7 +585,7 @@ if ($id) if (empty($reshook)) fieldListWebsites($fieldlist,$obj,$tabname[$id],'edit'); - print ' '; + print ' '; print ' '; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).''; + print ''; print '
'; print ''; print ''; diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index c899e9d78c2..e100371e965 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -327,7 +327,7 @@ if (GETPOST('withtab','alpha')) $param.='&withtab='.urlencode(GETPOST('withtab', print ''; -print '
'; +print '
'; print $langs->trans("RestrictYearToExport").': '; $smonth=GETPOST('monthtoexport','int'); // Month @@ -430,7 +430,7 @@ print getTitleFieldOfList($langs->trans('Author'), 0, $_SERVER["PHP_SELF"],'user print getTitleFieldOfList($langs->trans('Action'), 0, $_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList($langs->trans('Ref'), 0, $_SERVER["PHP_SELF"],'ref_object','',$param,'',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder,'')."\n"; -print getTitleFieldOfList($langs->trans('Amount'), 0, $_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder,'')."\n"; +print getTitleFieldOfList($langs->trans('Amount'), 0, $_SERVER["PHP_SELF"],'','',$param,'class="right"',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList($langs->trans('DataOfArchivedEvent'), 0, $_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList($langs->trans('Fingerprint'), 0, $_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList($langs->trans('Status'), 0, $_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder,'')."\n"; From 1501ce2c9f06f389ad7d47af6789e3894b164a33 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 31 Jan 2019 13:34:32 +0100 Subject: [PATCH 6/8] update with html5 compliant code --- htdocs/bookmarks/list.php | 4 ++-- htdocs/categories/index.php | 2 +- htdocs/comm/mailing/cibles.php | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 5cbd07393e3..a721170f628 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -121,7 +121,7 @@ if ($resql) print_liste_field_titre("Target",'','','','','align="center"'); print_liste_field_titre("Owner",$_SERVER["PHP_SELF"],"u.lastname","", $param,'align="center"',$sortfield,$sortorder); print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"b.dateb","", $param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre("Position",$_SERVER["PHP_SELF"],"b.position","", $param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre("Position",$_SERVER["PHP_SELF"],"b.position","", $param,'class="right"',$sortfield,$sortorder); print_liste_field_titre(''); print "
'.$obj->position."'; + print ''; if ($user->rights->bookmark->creer) { print "rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()." "; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 273a23f5b1e..42f136d0aa3 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -169,7 +169,7 @@ foreach($fulltree as $key => $val) 'fk_menu'=>$val['fk_parent'], 'entry'=>''. //''. - ''. + ''. '
color?' style="background: #'.$categstatic->color.';"':' style="background: #aaa"').'>'.$li.''.dolGetFirstLineOfText($desc).''.img_view().''.img_view().'
' ); } diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 0cb414be421..e755bbcf2b6 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -263,7 +263,7 @@ if ($object->fetch($id) >= 0) //print '		'.$langs->trans("NbOfUniqueEMails").''.$langs->trans("Filter").' 
'; + print ''; print $formmailing->selectDestinariesStatus($search_dest_status,'search_dest_status',1); print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1); print $searchpicto; print '
 '.$langs->trans("MailingStatusNotSent"); + print ''.$langs->trans("MailingStatusNotSent"); print ''.$obj->date_envoi.''; + print ''; print $object::libStatutDest($obj->statut, 2, $obj->error_text); print '