From b8d9c20731ae7ffb5538c38f30ca05ad5b00c509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr> Date: Thu, 7 May 2015 11:57:23 +0200 Subject: [PATCH] [Qual] Fixed HTML input form disabled attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value. --- htdocs/adherents/card_subscriptions.php | 4 +- htdocs/admin/boxes.php | 2 +- htdocs/admin/menus.php | 8 +-- htdocs/admin/sms.php | 2 +- htdocs/admin/stock.php | 2 +- htdocs/admin/syslog.php | 4 +- htdocs/admin/tools/dolibarr_export.php | 6 +- htdocs/barcode/codeinit.php | 8 +-- htdocs/cashdesk/tpl/facturation1.tpl.php | 10 +-- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/compta/bank/ligne.php | 8 +-- htdocs/compta/facture.php | 14 ++-- htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/core/class/doleditor.class.php | 2 +- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/class/html.form.class.php | 64 +++++++++---------- htdocs/core/class/html.formactions.class.php | 6 +- htdocs/core/class/html.formadmin.class.php | 4 +- htdocs/core/class/html.formbarcode.class.php | 6 +- htdocs/core/class/html.formcompany.class.php | 8 +-- htdocs/core/class/html.formcontract.class.php | 2 +- htdocs/core/class/html.formfile.class.php | 8 +-- .../class/html.formintervention.class.php | 2 +- htdocs/core/class/html.formother.class.php | 6 +- htdocs/core/class/html.formprojet.class.php | 4 +- htdocs/core/lib/functions.lib.php | 8 +-- htdocs/core/lib/project.lib.php | 8 +-- .../barcode/mod_barcode_product_standard.php | 2 +- .../modules/mailings/framboise.modules.php | 2 +- .../product/mod_codeproduct_elephant.php | 2 +- .../societe/mod_codeclient_elephant.php | 2 +- htdocs/core/tpl/contacts.tpl.php | 2 +- htdocs/ecm/class/htmlecm.form.class.php | 2 +- htdocs/exports/index.php | 2 +- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/fourn/facture/card.php | 8 +-- htdocs/imports/import.php | 2 +- htdocs/install/fileconf.php | 16 ++--- htdocs/opensurvey/card.php | 2 +- .../product/class/html.formproduct.class.php | 2 +- htdocs/product/composition/card.php | 2 +- htdocs/product/stock/replenish.php | 2 +- .../product/stock/tpl/stocktransfer.tpl.php | 4 +- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/tasks/contact.php | 2 +- htdocs/public/demo/index.php | 2 +- htdocs/public/members/new.php | 2 +- htdocs/user/card.php | 4 +- htdocs/user/param_ihm.php | 4 +- 51 files changed, 138 insertions(+), 138 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index a53c2150989..369027b1e14 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -991,7 +991,7 @@ if ($rowid) if (! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) { print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(! empty($invoiceonly)?' checked':''); - //if (empty($object->fk_soc)) print ' disabled="disabled"'; + //if (empty($object->fk_soc)) print ' disabled'; print '> '.$langs->trans("MoreActionInvoiceOnly"); if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; else @@ -1016,7 +1016,7 @@ if ($rowid) if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) { print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(! empty($bankviainvoice)?' checked':''); - //if (empty($object->fk_soc)) print ' disabled="disabled"'; + //if (empty($object->fk_soc)) print ' disabled'; print '> '.$langs->trans("MoreActionBankViaInvoice"); if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; else diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 6ec43d4b7b4..18c63a48798 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -375,7 +375,7 @@ foreach($boxtoadd as $box) print '</table>'."\n"; print '<div class="right">'; -print '<input type="submit" class="button"'.(count($boxtoadd)?'':' disabled="disabled"').' value="'.$langs->trans("Activate").'">'; +print '<input type="submit" class="button"'.(count($boxtoadd)?'':' disabled').' value="'.$langs->trans("Activate").'">'; print '</div>'."\n"; print '</form>'; print "\n".'<!-- End Boxes Available -->'."\n"; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 3bceffeacfc..ad83def9ce8 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -183,10 +183,10 @@ if ($action == 'edit') $var=!$var; print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>'; print '<td>'; - $formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled'); print '</td>'; print '<td>'; - $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled'); print '</td>'; print '</tr>'; @@ -194,10 +194,10 @@ if ($action == 'edit') $var=!$var; print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>'; print '<td>'; - $formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled'); print '</td>'; print '<td>'; - $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled'); print '</td>'; print '</tr>'; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 682b1e456eb..44bab100730 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -204,7 +204,7 @@ if ($action == 'edit') print '</table>'; print '<br><div class="center">'; - print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"'.(!count($listofmethods)?' disabled="disbaled"':'').'>'; + print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"'.(!count($listofmethods)?' disabled':'').'>'; print ' '; print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">'; print '</div>'; diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 49df241e957..0f6560ad055 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -122,7 +122,7 @@ $disabled=''; if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch"); - $disabled=' disabled="disabled"'; + $disabled=' disabled'; print info_admin($langs->trans("WhenProductBatchModuleOnOptionAreForced")); } diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 9ee2898e51d..3eebfebb37b 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -161,7 +161,7 @@ if (! $defaultsyslogfile) $defaultsyslogfile='dolibarr.log'; if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity) { print '<div class="error">'.$langs->trans("ContactSuperAdminForChange").'</div>'; - $option = 'disabled="disabled"'; + $option = 'disabled'; } @@ -192,7 +192,7 @@ foreach ($syslogModules as $moduleName) $var=!$var; print '<tr '.$bc[$var].'>'; print '<td width="140">'; - print '<input '.$bc[$var].' type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled="disabled"' : '').'> '; + print '<input '.$bc[$var].' type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> '; print $module->getName(); print '</td>'; diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 3d281c551c1..7cd98625ac9 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -265,7 +265,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">'; for="checkbox_hexforbinary"> <?php echo $langs->trans("EncodeBinariesInHexa"); ?></label><br> <input type="checkbox" name="charset_utf8" value="yes" - id="checkbox_charset_utf8" checked disabled="disabled" /> <label + id="checkbox_charset_utf8" checked disabled /> <label for="checkbox_charset_utf8"> <?php echo $langs->trans("UTF8"); ?></label><br> </fieldset> @@ -308,7 +308,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">'; id="checkbox_dump_ignore" /> <label for="checkbox_dump_ignore"> <?php echo $langs->trans("IgnoreDuplicateRecords"); ?></label><br> <input type="checkbox" name="nobin_charset_utf8" value="yes" - id="checkbox_charset_utf8" checked disabled="disabled" /> <label + id="checkbox_charset_utf8" checked disabled /> <label for="checkbox_charset_utf8"> <?php echo $langs->trans("UTF8"); ?></label><br> </fieldset> @@ -422,7 +422,7 @@ foreach($compression as $key => $val) } else // Disabled export format { - print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled="disabled">'; + print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>'; print ' <label for="'.$val['id'].'">'.$val['label'].'</label>'; print ' ('.$langs->trans("NotAvailable").')'; } diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php index 071d1f32bda..12b61d80419 100644 --- a/htdocs/barcode/codeinit.php +++ b/htdocs/barcode/codeinit.php @@ -233,8 +233,8 @@ if ($conf->societe->enabled) print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n"; - print '<br><input class="button" type="submit" id="submitformbarcodethirdpartygen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode"))?'':'disabled="checked" ').'value="'.$langs->trans("InitEmptyBarCode",$nbno).'"'; - print ' title="'.dol_escape_htmltag($langs->trans("FeatureNotYetAvailable")).'" disabled="disabled"'; + print '<br><input class="button" type="submit" id="submitformbarcodethirdpartygen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode"))?'':'disabled ').'value="'.$langs->trans("InitEmptyBarCode",$nbno).'"'; + print ' title="'.dol_escape_htmltag($langs->trans("FeatureNotYetAvailable")).'" disabled'; print '>'; print '<br><br><br>'; } @@ -307,9 +307,9 @@ if ($conf->product->enabled || $conf->product->service) print '<br>'; //print '<input type="checkbox" id="erasealreadyset" name="erasealreadyset"> '.$langs->trans("ResetBarcodeForAllRecords").'<br>'; - $moretags1=(($disabled||$disabled1)?' disabled="disabled" title="'.dol_escape_htmltag($titleno).'"':''); + $moretags1=(($disabled||$disabled1)?' disabled title="'.dol_escape_htmltag($titleno).'"':''); print '<input class="button" type="submit" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode",min($maxperinit,$nbno)).'"'.$moretags1.'>'; - $moretags2=(($nbno == $nbtotal)?' disabled="disabled"':''); + $moretags2=(($nbno == $nbtotal)?' disabled':''); print ' '; print '<input class="button" type="submit" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">'; print '<br><br><br>'; diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 338c0f23b16..98300b71e80 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -110,18 +110,18 @@ $langs->load("cashdesk"); </td> <!-- Affichage du stock pour l'article courant --> <td> - <input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" /> + <input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled /> </td> <!-- Show unit price --> <?php // TODO Remove the disabled and use this value when adding product into cart ?> - <td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled="disabled" /></td> + <td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled /></td> <td><?php echo $conf->currency; ?></td> <!-- Choix de la remise --> <td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/> <?php print genkeypad("txtRemise", "frmQte");?> </td> <!-- Affichage du total HT --> - <td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->currency; ?></td> + <td><input class="texte1_off" type="text" name="txtTotal" value="" disabled /></td><td><?php echo $conf->currency; ?></td> <!-- Choix du taux de TVA --> <td class="select_tva"> <?php //var_dump($tab_tva); ?> @@ -157,13 +157,13 @@ $langs->load("cashdesk"); <tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr> <tr> <!-- Affichage du montant du --> - <td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled="disabled" /></td> + <td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td> <!-- Choix du montant encaisse --> <td><input class="texte2" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /> <?php print genkeypad("txtEncaisse", "frmDifference");?> </td> <!-- Affichage du montant rendu --> - <td><input class="texte2_off" type="text" name="txtRendu" value="0" disabled="disabled" /></td> + <td><input class="texte2_off" type="text" name="txtRendu" value="0" disabled /></td> </tr> <tr> </table> diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 5413315a147..e5472727aa2 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -358,7 +358,7 @@ if (! empty($conf->use_javascript_ajax)) $s.='});' . "\n"; $s.='</script>' . "\n"; - $s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled="disabled"> ' . $langs->trans("LocalAgenda").' </div>'; + $s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' </div>'; if (is_array($showextcals) && count($showextcals) > 0) { $s.='<script type="text/javascript">' . "\n"; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 1613e122858..1563174c3a2 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -300,7 +300,7 @@ if ($conf->use_javascript_ajax) $s.='</script>' . "\n"; if (! empty($conf->use_javascript_ajax)) { - $s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled="disabled"> ' . $langs->trans("LocalAgenda").' </div>'; + $s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' </div>'; if (is_array($showextcals) && count($showextcals) > 0) { foreach ($showextcals as $val) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index e1d903fbf2e..4a4b4f6553b 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -501,7 +501,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print '<td colspan="3">'; - print '<input name="label" class="flat" '.($objp->rappro?' disabled="disabled"':'').' value="'; + print '<input name="label" class="flat" '.($objp->rappro?' disabled':'').' value="'; if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { // Label generique car entre parentheses. On l'affiche en le traduisant @@ -535,7 +535,7 @@ if ($result) if ($user->rights->banque->modifier) { print '<td colspan="3">'; - print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled="disabled"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->currency); + print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->currency); print '</td>'; } else @@ -567,12 +567,12 @@ if ($result) print '<td colspan="3">'; if ($objp->rappro) { - print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled="disabled"':'').'>'; + print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled':'').'>'; print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">'; } else { - print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled="disabled"':'').'>'; + print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro?' disabled':'').'>'; } if ($objp->num_releve) print ' (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>'; print '</td><td align="center" rowspan="2" width="20%"><input type="submit" class="button" value="'.$langs->trans("Update").'"></td>'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 525518c5c5d..1cb683123cc 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2132,7 +2132,7 @@ if ($action == 'create') $opt = $form->load_situation_invoices(GETPOST('originid'), $socid); print '<tr height="18"><td valign="middle">'; print '<input type="radio" name="type" value="5"' . (GETPOST('type') == 5 && GETPOST('originid') ? ' checked' : '') . ' '; - if ($opt == '<option value ="0" selected="selected">' . $langs->trans('NoSituations') . '</option>' || (GETPOST('origin') && GETPOST('origin') != 'facture')) print 'disabled="disabled"'; + if ($opt == '<option value ="0" selected="selected">' . $langs->trans('NoSituations') . '</option>' || (GETPOST('origin') && GETPOST('origin') != 'facture')) print 'disabled'; print '>'; print '</td><td valign="middle">'; $text = $langs->trans("InvoiceSituationAsk") . ' '; @@ -2148,7 +2148,7 @@ if ($action == 'create') print '<tr height="18"><td valign="middle">'; print '<input type="radio" name="type" id="radio_replacement" value="1"' . (GETPOST('type') == 1 ? ' checked' : ''); if (! $options) - print ' disabled="disabled"'; + print ' disabled'; print '>'; print '</td><td valign="middle">'; print '<script type="text/javascript" language="javascript"> @@ -2161,7 +2161,7 @@ if ($action == 'create') $text = $langs->trans("InvoiceReplacementAsk") . ' '; $text .= '<select class="flat" name="fac_replacement" id="fac_replacement"'; if (! $options) - $text .= ' disabled="disabled"'; + $text .= ' disabled'; $text .= '>'; if ($options) { $text .= '<option value="-1"> </option>'; @@ -2177,7 +2177,7 @@ if ($action == 'create') else { print '<tr height="18"><td valign="middle">'; - print '<input type="radio" name="type" id="radio_replacement" value="0" disabled="disabled">'; + print '<input type="radio" name="type" id="radio_replacement" value="0" disabled>'; print '</td><td valign="middle">'; $text = $langs->trans("InvoiceReplacement") . ' '; $text.= '('.$langs->trans("YouMustCreateInvoiceFromThird").') '; @@ -2194,7 +2194,7 @@ if ($action == 'create') print '<tr height="18"><td valign="top">'; print '<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : ''); if (! $optionsav) - print ' disabled="disabled"'; + print ' disabled'; print '>'; print '</td><td valign="top">'; // Show credit note options only if we checked credit note @@ -2216,7 +2216,7 @@ if ($action == 'create') // $text.='<input type="text" value="">'; $text .= '<select class="flat" name="fac_avoir" id="fac_avoir"'; if (! $optionsav) - $text .= ' disabled="disabled"'; + $text .= ' disabled'; $text .= '>'; if ($optionsav) { $text .= '<option value="-1"></option>'; @@ -2238,7 +2238,7 @@ if ($action == 'create') else { print '<tr height="18"><td valign="middle">'; - print '<input type="radio" name="type" id="radio_creditnote" value="0" disabled="disabled">'; + print '<input type="radio" name="type" id="radio_creditnote" value="0" disabled>'; print '</td><td valign="middle">'; $text = $langs->trans("InvoiceAvoir") . ' '; $text.= '('.$langs->trans("YouMustCreateInvoiceFromThird").') '; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 6a3bc3ab72d..6c82dcd4d8a 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -367,7 +367,7 @@ if ($action == 'create') print '<tr><td colspan="3" align="left">'; print '<select name="usenewprice" class="flat">'; print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>'; - print '<option value="1" disabled="disabled">'.$langs->trans("AlwaysUseNewPrice").'</option>'; + print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>'; print '</select>'; print '</td></tr>'; } diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 99020fbd292..58865c38540 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -571,7 +571,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } else { - print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled="disabled">'; + print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>'; print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">'; } print "</td>"; diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index f95924929bb..db303ee7d1b 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -159,7 +159,7 @@ class DolEditor if (in_array($this->tool,array('textarea','ckeditor'))) { $found=1; - //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'" cols="'.$this->cols.'"'.($this->readonly?' disabled="disabled"':'').' class="flat">'; + //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'" cols="'.$this->cols.'"'.($this->readonly?' disabled':'').' class="flat">'; $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 2px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">'; $out.= $this->content; $out.= '</textarea>'; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index e23eafc4cf4..765274c6a8d 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1124,7 +1124,7 @@ class ExtraFields if (!empty($value)) { $checked=' checked '; } - $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly="readonly" disabled="disabled">'; + $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly="readonly" disabled>'; } elseif ($type == 'mail') { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 77890fb1baf..3a25023592b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -534,7 +534,7 @@ class Form if (empty($row['favorite']) && $atleastonefavorite) { $atleastonefavorite=0; - $out.= '<option value="" disabled="disabled">----------------------</option>'; + $out.= '<option value="" disabled>----------------------</option>'; } if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) ) { @@ -1048,7 +1048,7 @@ class Form if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue) { $qualifiedlines--; - $disabled=' disabled="disabled"'; + $disabled=' disabled'; } print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>'; @@ -1163,7 +1163,7 @@ class Form if ($selected && $selected == $obj->rowid) { $out.= '<option value="'.$obj->rowid.'"'; - if ($disabled) $out.= ' disabled="disabled"'; + if ($disabled) $out.= ' disabled'; $out.= ' selected="selected">'; $out.= $contactstatic->getFullName($langs); if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')'; @@ -1173,7 +1173,7 @@ class Form else { $out.= '<option value="'.$obj->rowid.'"'; - if ($disabled) $out.= ' disabled="disabled"'; + if ($disabled) $out.= ' disabled'; $out.= '>'; $out.= $contactstatic->getFullName($langs); if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')'; @@ -1196,7 +1196,7 @@ class Form } else { - $out.= '<option value="-1"'.($showempty==2?'':' selected="selected"').' disabled="disabled">'.$langs->trans($socid?"NoContactDefinedForThirdParty":"NoContactDefined").'</option>'; + $out.= '<option value="-1"'.($showempty==2?'':' selected="selected"').' disabled>'.$langs->trans($socid?"NoContactDefinedForThirdParty":"NoContactDefined").'</option>'; } if ($htmlname != 'none' || $options_only) { @@ -1332,7 +1332,7 @@ class Form $nodatarole=($comboenhancement?' data-role="none"':''); } - $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$nodatarole.'>'; + $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$nodatarole.'>'; if ($show_empty) $out.= '<option value="-1"'.((empty($selected) || $selected==-1)?' selected="selected"':'').'> </option>'."\n"; if ($show_every) $out.= '<option value="-2"'.(($selected==-2)?' selected="selected"':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n"; @@ -1352,13 +1352,13 @@ class Form if ((is_object($selected) && $selected->id == $obj->rowid) || (! is_object($selected) && $selected == $obj->rowid)) { $out.= '<option value="'.$obj->rowid.'"'; - if ($disableline) $out.= ' disabled="disabled"'; + if ($disableline) $out.= ' disabled'; $out.= ' selected="selected">'; } else { $out.= '<option value="'.$obj->rowid.'"'; - if ($disableline) $out.= ' disabled="disabled"'; + if ($disableline) $out.= ' disabled'; $out.= '>'; } @@ -1404,7 +1404,7 @@ class Form } else { - $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled="disabled">'; + $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>'; $out.= '<option value="">'.$langs->trans("None").'</option>'; } $out.= '</select>'; @@ -2049,7 +2049,7 @@ class Form $opt = '<option value="'.$objp->idprodfournprice.'"'; if ($selected && $selected == $objp->idprodfournprice) $opt.= ' selected="selected"'; - if (empty($objp->idprodfournprice)) $opt.=' disabled="disabled"'; + if (empty($objp->idprodfournprice)) $opt.=' disabled'; $opt.= '>'; $objRef = $objp->ref; @@ -2987,7 +2987,7 @@ class Form $outarray=array(); if (is_array($cate_arbo)) { - if (! count($cate_arbo)) $output.= '<option value="-1" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>'; + if (! count($cate_arbo)) $output.= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>'; else { $output.= '<option value="-1"> </option>'; @@ -3114,7 +3114,7 @@ class Form $more.='<input type="checkbox" class="flat" id="'.$input['name'].'" name="'.$input['name'].'"'; if (! is_bool($input['value']) && $input['value'] != 'false') $more.=' checked'; if (is_bool($input['value']) && $input['value']) $more.=' checked'; - if (isset($input['disabled'])) $more.=' disabled="disabled"'; + if (isset($input['disabled'])) $more.=' disabled'; $more.=' /></td>'; $more.='<td valign="top" align="left"> </td>'; $more.='</tr>'."\n"; @@ -3128,7 +3128,7 @@ class Form if ($i==0) $more.='<td valign="top">'.$input['label'].'</td>'; else $more.='<td> </td>'; $more.='<td valign="top" width="20"><input type="radio" class="flat" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'; - if ($input['disabled']) $more.=' disabled="disabled"'; + if ($input['disabled']) $more.=' disabled'; $more.=' /></td>'; $more.='<td valign="top" align="left">'; $more.=$selval; @@ -3955,7 +3955,7 @@ class Form $disabled=true; } - if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$title.'>'; + if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$title.'>'; foreach ($this->cache_vatrates as $rate) { @@ -4086,7 +4086,7 @@ class Form { // Zone de saisie manuelle de la date $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" size="9" maxlength="11" value="'.$formated_date.'"'; - $retstring.=($disabled?' disabled="disabled"':''); + $retstring.=($disabled?' disabled':''); $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript $retstring.='>'; @@ -4112,7 +4112,7 @@ class Form else { // Day - $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'day">'; + $retstring.='<select'.($disabled?' disabled':'').' class="flat" name="'.$prefix.'day">'; if ($emptydate || $set_time == -1) { @@ -4126,7 +4126,7 @@ class Form $retstring.="</select>"; - $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'month">'; + $retstring.='<select'.($disabled?' disabled':'').' class="flat" name="'.$prefix.'month">'; if ($emptydate || $set_time == -1) { $retstring.='<option value="0" selected="selected"> </option>'; @@ -4144,11 +4144,11 @@ class Form // Year if ($emptydate || $set_time == -1) { - $retstring.='<input'.($disabled?' disabled="disabled"':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat" type="text" size="3" maxlength="4" name="'.$prefix.'year" value="'.$syear.'">'; + $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat" type="text" size="3" maxlength="4" name="'.$prefix.'year" value="'.$syear.'">'; } else { - $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'year">'; + $retstring.='<select'.($disabled?' disabled':'').' class="flat" name="'.$prefix.'year">'; for ($year = $syear - 5; $year < $syear + 10 ; $year++) { @@ -4164,7 +4164,7 @@ class Form if ($h) { // Show hour - $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat '.($fullday?$fullday.'hour':'').'" name="'.$prefix.'hour">'; + $retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'hour':'').'" name="'.$prefix.'hour">'; if ($emptyhours) $retstring.='<option value="-1"> </option>'; for ($hour = 0; $hour < 24; $hour++) { @@ -4178,7 +4178,7 @@ class Form if ($m) { // Show minutes - $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat '.($fullday?$fullday.'min':'').'" name="'.$prefix.'min">'; + $retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'min':'').'" name="'.$prefix.'min">'; if ($emptyhours) $retstring.='<option value="-1"> </option>'; for ($min = 0; $min < 60 ; $min++) { @@ -4264,7 +4264,7 @@ class Form if ($typehour=='select') { - $retstring.='<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').'>'; + $retstring.='<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled':'').'>'; for ($hour = 0; $hour < 25; $hour++) // For a duration, we allow 24 hours { $retstring.='<option value="'.$hour.'"'; @@ -4278,7 +4278,7 @@ class Form } elseif ($typehour=='text') { - $retstring.='<input type="text" size="2" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">'; + $retstring.='<input type="text" size="2" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">'; } else return 'BadValueForParameterTypeHour'; @@ -4289,7 +4289,7 @@ class Form if ($typehour=='select') { - $retstring.='<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').'>'; + $retstring.='<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled':'').'>'; for ($min = 0; $min <= 55; $min=$min+5) { $retstring.='<option value="'.$min.'"'; @@ -4300,7 +4300,7 @@ class Form } elseif ($typehour=='text') { - $retstring.='<input type="text" size="2" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">'; + $retstring.='<input type="text" size="2" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">'; } $retstring.=' '.$langs->trans('MinuteShort'); $retstring.=" "; @@ -4355,7 +4355,7 @@ class Form </script>'; } - $out.='<select id="'.$htmlname.'" '.($disabled?'disabled="disabled" ':'').'class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" '.($moreparam?$moreparam:'').'>'; + $out.='<select id="'.$htmlname.'" '.($disabled?'disabled ':'').'class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" '.($moreparam?$moreparam:'').'>'; if ($show_empty) { @@ -4411,7 +4411,7 @@ class Form * @param string $morecss Add more css style * @param int $translate Translate and encode value * @param int $width Force width of select box. May be used only when using jquery couch. Example: 250, 95% - * @param string $moreattrib Add more options on select component. Example: 'disabled="disabled"' + * @param string $moreattrib Add more options on select component. Example: 'disabled' * @param string $elemtype Type of element we show ('category', ...) * @return string HTML multiselect string * @see selectarray @@ -4529,7 +4529,7 @@ class Form $arrayselected[] = $c->id; } - return $this->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%', 'disabled="disabled"', 'category'); + return $this->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%', 'disabled', 'category'); } return 'ErrorBadValueForParameterRenderMode'; // Should not happened @@ -4557,7 +4557,7 @@ class Form $no="0"; } - $disabled = ($disabled ? ' disabled="disabled"' : ''); + $disabled = ($disabled ? ' disabled' : ''); $resultyesno = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n"; if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected="selected"':'').'></option>'."\n"; @@ -4851,7 +4851,7 @@ class Form $nodatarole=($comboenhancement?' data-role="none"':''); } - $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$nodatarole.'>'; + $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$nodatarole.'>'; $num = $this->db->num_rows($resql); $i = 0; @@ -4866,7 +4866,7 @@ class Form if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1; $out.= '<option value="'.$obj->rowid.'"'; - if ($disableline) $out.= ' disabled="disabled"'; + if ($disableline) $out.= ' disabled'; if ((is_object($selected) && $selected->id == $obj->rowid) || (! is_object($selected) && $selected == $obj->rowid)) { $out.= ' selected="selected"'; @@ -4886,7 +4886,7 @@ class Form else { if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'></option>'."\n"; - $out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>'; + $out.= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>'; } $out.= '</select>'; } diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 3c16facdd4a..8dda6772510 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -120,7 +120,7 @@ class FormActions { //var_dump($selected); if ($selected == 'done') $selected='100'; - print '<select '.($canedit?'':'disabled="disabled" ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat">'; + print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat">'; if ($showempty) print '<option value=""'.($selected == ''?' selected="selected"':'').'></option>'; foreach($listofstatus as $key => $val) { @@ -135,13 +135,13 @@ class FormActions if (empty($onlyselect)) { - print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled="disabled"').'>'; + print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>'; print '<span class="hideifna">%</span>'; } } else { - print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled="disabled"').'>%'; + print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%'; } } diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 30ecadedb55..06c03a82d68 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -64,7 +64,7 @@ class FormAdmin $out=''; - $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').'>'; + $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>'; if ($showempty) { $out.= '<option value=""'; @@ -184,7 +184,7 @@ class FormAdmin if ($newprefix != $oldprefix) // Add separators { // Affiche titre - print '<option value="-1" disabled="disabled">'; + print '<option value="-1" disabled>'; if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --'; if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --'; if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --'; diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php index 11a59614be0..3db273b8496 100644 --- a/htdocs/core/class/html.formbarcode.class.php +++ b/htdocs/core/class/html.formbarcode.class.php @@ -77,7 +77,7 @@ class FormBarCode if (((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) || (! empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id)) { - $disable = 'disabled="disabled"'; + $disable = 'disabled'; } $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">'; @@ -86,7 +86,7 @@ class FormBarCode $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">'; $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">'; $select_encoder.= '<option value="0"'.($selected==0?' selected="selected"':'').' '.$disable.'>'.$langs->trans('Disable').'</option>'; - $select_encoder.= '<option value="-1" disabled="disabled">--------------------</option>'; + $select_encoder.= '<option value="-1" disabled>--------------------</option>'; foreach($barcodelist as $key => $value) { $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected="selected"':'').'>'.$value.'</option>'; @@ -128,7 +128,7 @@ class FormBarCode else { $langs->load("errors"); - print '<select disabled="disabled" class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">'; + print '<select disabled class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">'; print '<option value="0" selected="selected">'.$langs->trans('ErrorNoActivatedBarcode').'</option>'; } diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index bc63d9c51ac..e5e58d5316d 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -255,7 +255,7 @@ class FormCompany // Affiche la rupture si on est en mode liste multipays if (! $country_codeid && $obj->country_code) { - $out.= '<option value="-1" disabled="disabled">----- '.$obj->country." -----</option>\n"; + $out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n"; $country=$obj->country; } } @@ -330,7 +330,7 @@ class FormCompany // Show break $key=$langs->trans("Country".strtoupper($obj->country_code)); $valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country; - print '<option value="-1" disabled="disabled">----- '.$valuetoshow." -----</option>\n"; + print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n"; $country=$obj->country; } @@ -647,14 +647,14 @@ class FormCompany if ($selected > 0 && $selected == $obj->rowid) { print '<option value="'.$obj->rowid.'"'; - if ($disabled) print ' disabled="disabled"'; + if ($disabled) print ' disabled'; print ' selected="selected">'.dol_trunc($obj->name,24).'</option>'; $firstCompany = $obj->rowid; } else { print '<option value="'.$obj->rowid.'"'; - if ($disabled) print ' disabled="disabled"'; + if ($disabled) print ' disabled'; print '>'.dol_trunc($obj->name,24).'</option>'; } $i ++; diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php index 0eb2d4d4b26..01c6a5bc640 100644 --- a/htdocs/core/class/html.formcontract.class.php +++ b/htdocs/core/class/html.formcontract.class.php @@ -115,7 +115,7 @@ class FormContract else { $resultat='<option value="'.$obj->rowid.'"'; - if ($disabled) $resultat.=' disabled="disabled"'; + if ($disabled) $resultat.=' disabled'; //if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')'; //else $labeltoshow.=' ('.$langs->trans("Private").')'; $resultat.='>'.$labeltoshow; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index a1c04d2cb29..0b00dc265f4 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -115,11 +115,11 @@ class FormFile $out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">'; } $out .= '<input class="flat" type="file" name="userfile" size="'.$maxlength.'"'; - $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="disabled"':''); + $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':''); $out .= '>'; $out .= ' '; $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"'; - $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="disabled"':''); + $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':''); $out .= '>'; if ($addcancel) @@ -183,7 +183,7 @@ class FormFile $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">'; $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">'; $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"'; - $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="disabled"':''); + $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':''); $out .= '>'; $out .= '</td></tr>'; $out .= '</table>'; @@ -527,7 +527,7 @@ class FormFile $out.= '<th align="center" colspan="'.($addcolumforpicto?'2':'1').'" class="formdocbutton liste_titre maxwidthonsmartphone">'; $genbutton = '<input class="button" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"'; $genbutton.= ' type="submit" value="'.$buttonlabel.'"'; - if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled="disabled"'; + if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled'; $genbutton.= '>'; if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') { diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php index 2caeb30a6dc..43bc3c96eb0 100644 --- a/htdocs/core/class/html.formintervention.class.php +++ b/htdocs/core/class/html.formintervention.class.php @@ -116,7 +116,7 @@ class FormIntervention else { $resultat='<option value="'.$obj->rowid.'"'; - if ($disabled) $resultat.=' disabled="disabled"'; + if ($disabled) $resultat.=' disabled'; $resultat.='>'.$labeltoshow; $resultat.='</option>'; } diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 9266b8aa3a6..3e36e374da6 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -278,7 +278,7 @@ class FormOther */ function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100) { - $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled="disabled"':'').'>'; + $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>'; for ($i = $start ; $i <= $end ; $i += $increment) { @@ -519,7 +519,7 @@ class FormOther { if ($lines[$i]->fk_project != $lastprojectid) // Break found on project { - if ($i > 0) print '<option value="0" disabled="disabled">----------</option>'; + if ($i > 0) print '<option value="0" disabled>----------</option>'; print '<option value="'.$lines[$i]->fk_project.'_0"'; if ($selectedproject == $lines[$i]->fk_project) print ' selected="selected"'; print '>'; // Project -> Task @@ -555,7 +555,7 @@ class FormOther print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"'; if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected="selected"'; - if ($disabled) print ' disabled="disabled"'; + if ($disabled) print ' disabled'; print '>'; print $langs->trans("Project").' '.$lines[$i]->projectref; if (empty($lines[$i]->public)) diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 85c9ffbb241..0cc8f94ff5a 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -160,7 +160,7 @@ class FormProjets else { $resultat='<option value="'.$obj->rowid.'"'; - if ($disabled) $resultat.=' disabled="disabled"'; + if ($disabled) $resultat.=' disabled'; //if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')'; //else $labeltoshow.=' ('.$langs->trans("Private").')'; $resultat.='>'; @@ -258,7 +258,7 @@ class FormProjets /*else { $sellist = '<select class="flat" name="elementselect">'; - $sellist.= '<option value="0" disabled="disabled">'.$langs->trans("None").'</option>'; + $sellist.= '<option value="0" disabled>'.$langs->trans("None").'</option>'; $sellist.= '</select>'; }*/ $this->db->free($resql); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index aca2ec3213b..adc5b916f63 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3684,8 +3684,8 @@ function yn($yesno, $case=1, $color=0) { $result=$langs->trans('yes'); if ($case == 1 || $case == 3) $result=$langs->trans("Yes"); - if ($case == 2) $result='<input type="checkbox" value="1" checked disabled="disabled">'; - if ($case == 3) $result='<input type="checkbox" value="1" checked disabled="disabled"> '.$result; + if ($case == 2) $result='<input type="checkbox" value="1" checked disabled>'; + if ($case == 3) $result='<input type="checkbox" value="1" checked disabled> '.$result; $classname='ok'; } @@ -3693,8 +3693,8 @@ function yn($yesno, $case=1, $color=0) { $result=$langs->trans("no"); if ($case == 1 || $case == 3) $result=$langs->trans("No"); - if ($case == 2) $result='<input type="checkbox" value="0" disabled="disabled">'; - if ($case == 3) $result='<input type="checkbox" value="0" disabled="disabled"> '.$result; + if ($case == 2) $result='<input type="checkbox" value="0" disabled>'; + if ($case == 3) $result='<input type="checkbox" value="0" disabled> '.$result; if ($color == 2) $classname='ok'; else $classname='error'; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index af37283d074..ee024c60c2a 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -629,11 +629,11 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin'); $tableCell=''; - $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled="disabled" id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>'; + $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>'; $tableCell.=' + '; //$tableCell.=' '; $tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1); - //$tableCell.=' <input type="submit" class="button"'.($disabledtask?' disabled="disabled"':'').' value="'.$langs->trans("Add").'">'; + //$tableCell.=' <input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">'; print $tableCell; print '</td>'; @@ -795,13 +795,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$ $alreadyspent=''; if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin'); $tableCell ='<td align="center">'; - $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled="disabled" id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>'; + $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>'; //$placeholder=' placeholder="00:00"'; $placeholder=''; //if (! $disabledtask) //{ $tableCell.='+'; - $tableCell.='<input type="text" alt="'.$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']).'" title="'.$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']).'" '.($disabledtask?'disabled="disabled"':$placeholder).' class="center" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2" maxlength="5"'; + $tableCell.='<input type="text" alt="'.$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']).'" title="'.$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']).'" '.($disabledtask?'disabled':$placeholder).' class="center" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2" maxlength="5"'; $tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"'; $tableCell.= 'onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />'; //} diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 0bd7a262a9c..703db258e26 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -72,7 +72,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode $langs->load("products"); - $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled="disabled"' : ''); + $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : ''); $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n"; $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php index e25ffad5f1b..a30a9ba3c17 100644 --- a/htdocs/core/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -198,7 +198,7 @@ class mailing_framboise extends MailingTargets $num = $this->db->num_rows($resql); $s.='<option value="0"> </option>'; - if (! $num) $s.='<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>'; + if (! $num) $s.='<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>'; $i = 0; while ($i < $num) diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 5a041fd31ce..517cd0a7ce9 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -74,7 +74,7 @@ class mod_codeproduct_elephant extends ModeleProductCode $langs->load("products"); - $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled="disabled"' : ''); + $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : ''); $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n"; $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index c24070c2e23..589bf1547c1 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -74,7 +74,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $langs->load("companies"); - $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled="disabled"' : ''); + $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : ''); $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n"; $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 6aaf0f5f28d..867b7cb9ffb 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -107,7 +107,7 @@ $userstatic=new User($db); </div> <div class="tagtd"> </div> <div class="tagtd" align="right"> - <input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled="disabled"'; ?>> + <input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>> </div> </form> diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php index 87b4af190ae..3675e2a24c7 100644 --- a/htdocs/ecm/class/htmlecm.form.class.php +++ b/htdocs/ecm/class/htmlecm.form.class.php @@ -64,7 +64,7 @@ class FormEcm $output = '<select class="flat" name="'.$select_name.'">'; if (is_array($cate_arbo)) { - if (! count($cate_arbo)) $output.= '<option value="-1" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>'; + if (! count($cate_arbo)) $output.= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>'; else { $output.= '<option value="-1"> </option>'; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 1178a20b236..d76c6f506d5 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -103,7 +103,7 @@ if (count($export->array_export_code)) } /* print '<form action="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export"><input type="submit" class="button" value="'.$langs->trans("NewExport").'"'; - print ($user->rights->export->creer?'':' disabled="disabled"'); + print ($user->rights->export->creer?'':' disabled'); print '><div class="center"></div></form>'; */ } diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index b3d1c9b12dd..a678aa343c7 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -568,7 +568,7 @@ if ($id > 0 || ! empty($ref)) //print '<div class="center">'; print '<input type="submit" class="button" value="'.$langs->trans("DispatchVerb").'"'; - if (count($listwarehouses) <= 0) print ' disabled="disabled"'; + if (count($listwarehouses) <= 0) print ' disabled'; print '>'; //print '</div>'; } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index f09af5d7883..8092c1e0f9d 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1382,12 +1382,12 @@ if ($action == 'create') // Replacement print '<tr height="18"><td valign="middle">'; print '<input type="radio" name="type" value="1"'.($_POST['type']==1?' checked':''); - if (! $options) print ' disabled="disabled"'; + if (! $options) print ' disabled'; print '>'; print '</td><td valign="middle">'; $text=$langs->trans("InvoiceReplacementAsk").' '; $text.='<select class="flat" name="fac_replacement"'; - if (! $options) $text.=' disabled="disabled"'; + if (! $options) $text.=' disabled'; $text.='>'; if ($options) { @@ -1406,13 +1406,13 @@ if ($action == 'create') // Credit note print '<tr height="18"><td valign="middle">'; print '<input type="radio" name="type" value="2"'.($_POST['type']==2?' checked':''); - if (! $optionsav) print ' disabled="disabled"'; + if (! $optionsav) print ' disabled'; print '>'; print '</td><td valign="middle">'; $text=$langs->transnoentities("InvoiceAvoirAsk").' '; // $text.='<input type="text" value="">'; $text.='<select class="flat" name="fac_avoir"'; - if (! $optionsav) $text.=' disabled="disabled"'; + if (! $optionsav) $text.=' disabled'; $text.='>'; if ($optionsav) { diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 90eea2765ae..c2dbcae5a37 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1536,7 +1536,7 @@ if ($step == 6 && $datatoimport) print '<tr><td>'; print $langs->trans("Option"); print '</td><td>'; - print '<input type="checkbox" name="excludefirstline" value="1" disabled="disabled"'; + print '<input type="checkbox" name="excludefirstline" value="1" disabled'; print ($excludefirstline?' checked':''); print '>'; print ' '.$langs->trans("DoNotImportFirstLine"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 5a00bb4b6cf..d3d2e5dbadf 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -147,7 +147,7 @@ if (! empty($force_install_message)) ?> <td class="label" valign="top"><?php if ($force_install_noedit) print '<input type="hidden" value="'.$dolibarr_main_document_root.'" name="main_dir">'; - print '<input type="text" size="60" value="'.$dolibarr_main_document_root.'"'.(empty($force_install_noedit)?'':' disabled="disabled"').' name="main_dir'.(empty($force_install_noedit)?'':'_bis').'">'; + print '<input type="text" size="60" value="'.$dolibarr_main_document_root.'"'.(empty($force_install_noedit)?'':' disabled').' name="main_dir'.(empty($force_install_noedit)?'':'_bis').'">'; ?></td> <td class="comment"><?php print $langs->trans("WithNoSlashAtTheEnd")."<br>"; @@ -181,7 +181,7 @@ if (! empty($force_install_message)) ?> <td class="label" valign="top"><?php if ($force_install_noedit) print '<input type="hidden" value="'.$dolibarr_main_data_root.'" name="main_data_dir">'; - print '<input type="text" size="60" value="'.$dolibarr_main_data_root.'"'.(empty($force_install_noedit)?'':' disabled="disabled"').' name="main_data_dir'.(empty($force_install_noedit)?'':'_bis').'">'; + print '<input type="text" size="60" value="'.$dolibarr_main_data_root.'"'.(empty($force_install_noedit)?'':' disabled').' name="main_data_dir'.(empty($force_install_noedit)?'':'_bis').'">'; ?></td> <td class="comment"><?php print $langs->trans("WithNoSlashAtTheEnd")."<br>"; @@ -228,7 +228,7 @@ if (! empty($force_install_message)) </td> <td valign="top" class="label"><?php if ($force_install_noedit) print '<input type="hidden" value="'.$dolibarr_main_url_root.'" name="main_url">'; - print '<input type="text" size="60" value="'.$dolibarr_main_url_root.'"'.(empty($force_install_noedit)?'':' disabled="disabled"').' name="main_url'.(empty($force_install_noedit)?'':'_bis').'">'; + print '<input type="text" size="60" value="'.$dolibarr_main_url_root.'"'.(empty($force_install_noedit)?'':' disabled').' name="main_url'.(empty($force_install_noedit)?'':'_bis').'">'; ?></td> <td class="comment"><?php print $langs->trans("Examples").":<br>"; ?> <ul> @@ -323,8 +323,8 @@ if (! empty($force_install_message)) if ($type=='sqlite') { $testfunction=''; $testclass='PDO'; } if ($type=='sqlite3') { $testfunction=''; $testclass='SQLite3'; } $option.='<option value="'.$type.'"'.($defaultype == $type?' selected="selected"':''); - if ($testfunction && ! function_exists($testfunction)) $option.=' disabled="disabled"'; - if ($testclass && ! class_exists($testclass)) $option.=' disabled="disabled"'; + if ($testfunction && ! function_exists($testfunction)) $option.=' disabled'; + if ($testclass && ! class_exists($testclass)) $option.=' disabled'; $option.='>'; $option.=$type.' '; if ($note) $option.=' '.$note; @@ -340,7 +340,7 @@ if (! empty($force_install_message)) } if ($force_install_noedit && $force_install_type) print '<input id="db_type" type="hidden" value="'.$force_install_type.'" name="db_type">'; - print '<select id="db_type" name="db_type'.(empty($force_install_noedit) || empty($force_install_type)?'':'_bis').'"'.($force_install_noedit && $force_install_type?' disabled="disabled"':'').'>'; + print '<select id="db_type" name="db_type'.(empty($force_install_noedit) || empty($force_install_type)?'':'_bis').'"'.($force_install_noedit && $force_install_type?' disabled':'').'>'; print $option; print '</select>'; @@ -354,7 +354,7 @@ if (! empty($force_install_message)) </b></td> <td valign="top" class="label"><input type="text" name="db_host<?php print ($force_install_noedit==2 && $force_install_dbserver)?'_bis':''; ?>" - <?php if ($force_install_noedit==2 && $force_install_dbserver) print ' disabled="disabled"'; ?> + <?php if ($force_install_noedit==2 && $force_install_dbserver) print ' disabled'; ?> value="<?php print (! empty($dolibarr_main_db_host))?$dolibarr_main_db_host:(empty($force_install_dbserver)?'localhost':$force_install_dbserver); ?>"> <?php if ($force_install_noedit==2 && $force_install_dbserver) print '<input type="hidden" name="db_host" value="'.((! empty($dolibarr_main_db_host))?$dolibarr_main_db_host:$force_install_dbserver).'">'; ?> </td> @@ -367,7 +367,7 @@ if (! empty($force_install_message)) <td valign="top" class="label"><?php echo $langs->trans("Port"); ?></td> <td valign="top" class="label"><input type="text" name="db_port<?php print ($force_install_noedit==2 && $force_install_port)?'_bis':''; ?>" - <?php if ($force_install_noedit==2 && $force_install_port) print ' disabled="disabled"'; ?> + <?php if ($force_install_noedit==2 && $force_install_port) print ' disabled'; ?> value="<?php print (! empty($dolibarr_main_db_port))?$dolibarr_main_db_port:$force_install_port; ?>"> <?php if ($force_install_noedit==2 && $force_install_port) print '<input type="hidden" name="db_port" value="'.((! empty($dolibarr_main_db_port))?$dolibarr_main_db_port:$force_install_port).'">'; ?> </td> diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index ee944c1b5ad..90f029b4d35 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -310,7 +310,7 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current $url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage; -$urllink='<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled="disabled"' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">'; +$urllink='<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">'; print $urllink; if ($action != 'edit') { diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index 4e2da460a74..4380ab97f56 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -121,7 +121,7 @@ class FormProduct $this->loadWarehouses($fk_product); $nbofwarehouses=count($this->cache_warehouses); - $out='<select class="flat"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">'; + $out='<select class="flat"'.($disabled?' disabled':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">'; if ($empty) $out.='<option value="-1">'.($empty_label?$empty_label:' ').'</option>'; foreach($this->cache_warehouses as $id => $arraytypes) { diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 3f16243312c..f1c740523f3 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -559,7 +559,7 @@ if ($id > 0 || ! empty($ref)) { // TODO Hide field and show it when setting a qty print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" checked>'; - //print '<input type="checkbox" disabled="true" name="prod_incdec_'.$i.'" value="1" checked>'; + //print '<input type="checkbox" disabled name="prod_incdec_'.$i.'" value="1" checked>'; } print '</td>'; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 7e0ceeb38e2..08da8fbcf6f 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -542,7 +542,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) if ($stockforcompare >= $objp->desiredstock) { $picto = img_picto('', './img/yes', '', 1); - $disabled = 'disabled="disabled"'; + $disabled = 'disabled'; } else { $picto = img_picto('', './img/no', '', 1); diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index 6325939a01e..556e924b07d 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -71,7 +71,7 @@ { print '<tr>'; print '<td>'.$langs->trans("batch_number").'</td><td colspan="5">'; - print '<input type="text" name="batch_number" size="40"'.($pdluoid > 0 ? ' disabled="true"':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">'; // If form was opened for a specific pdluoid, field is disabled + print '<input type="text" name="batch_number" size="40"'.($pdluoid > 0 ? ' disabled':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">'; // If form was opened for a specific pdluoid, field is disabled print '</td>'; print '</tr><tr>'; print '<td>'.$langs->trans("l_eatby").'</td><td>'; @@ -104,4 +104,4 @@ print '</form>'; ?> -<!-- END PHP STOCKCORRECTION.TPL.PHP --> \ No newline at end of file +<!-- END PHP STOCKCORRECTION.TPL.PHP --> diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 0a6c1ae5d2d..f8f9daf8de9 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -277,7 +277,7 @@ print "</table>"; dol_fiche_end(); print '<div class="center">'; -print '<input type="submit" class="button"'.($disabledtask?' disabled="disabled"':'').' value="'.$langs->trans("Save").'">'; +print '<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Save").'">'; print '</div>'; print '</form>'; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index acfd5d81566..0dbcc007db1 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -378,7 +378,7 @@ if ($id > 0 || ! empty($ref)) $formcompany->selectTypeContact($object, '', 'type','external','rowid'); print '</td>'; print '<td align="right" colspan="3" ><input type="submit" class="button" id="add-customer-contact" value="'.$langs->trans("Add").'"'; - if (! $nbofcontacts) print ' disabled="disabled"'; + if (! $nbofcontacts) print ' disabled'; print '></td>'; print '</tr>'; diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index f8694a6a8fe..956bcac8b75 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -383,7 +383,7 @@ foreach ($demoprofiles as $profilearray) $modulo=($j % $nbcolsmod); if ($modulo == 0) print '<tr>'; print '<td><input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"'; - if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled="disabled"'; + if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled'; if (! in_array($modulekeyname,$alwaysuncheckedmodules) && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked'; print '> '.$val->getName().' '; print '<!-- id='.$val->numero.' -->'; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 8fb06cd783e..2168c295e44 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -583,7 +583,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT) } else { - print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled="disabled" size="6" value="'.$amount.'">'; + print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">'; print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">'; } print ' '.$langs->trans("Currency".$conf->currency); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index a1c371770ad..0320f44916e 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -699,7 +699,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print $form->selectarray('users', $liste, '', 1); } print '</td><td align="center">'; - print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled="disabled"').'>'; + print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled').'>'; print '</td></tr></table>'; print '</form>'; @@ -1351,7 +1351,7 @@ else { print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>'; print '<td colspan="2">'; - if ($object->color) print '<input type="text" disabled="disabled" style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">'; + if ($object->color) print '<input type="text" disabled style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">'; print '</td>'; print "</tr>\n"; } diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 860e74c5567..4f8259bc007 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -179,7 +179,7 @@ if ($action == 'edit') print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print '</td>'; print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":""); - print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo + print empty($dolibarr_main_demo)?'':' disabled'; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").'</td>'; print '<td>'; print $formadmin->select_language((! empty($fuser->conf->MAIN_LANG_DEFAULT)?$fuser->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1,null,0,0,(! empty($dolibarr_main_demo))); @@ -190,7 +190,7 @@ if ($action == 'edit') print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>'; print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>'; print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); - print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo + print empty($dolibarr_main_demo)?'':' disabled'; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").'</td>'; print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:'') . '"></td></tr>'; -- GitLab