lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-28 12:42:44 +01:00
parent dbc5f5742f
commit 208306cb71
11 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/cartes/carte.php
View File

@ -307,7 +307,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
} }
asort($arrayoflabels); asort($arrayoflabels);
print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ?GETPOST('model') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1); print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ?GETPOST('model') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
print '<br>'.$langs->trans("Login").': <input size="10" type="text" name="foruserlogin" value="'.GETPOST('foruserlogin').'">'; print '<br>'.$langs->trans("Login").': <input class="with100" type="text" name="foruserlogin" value="'.GETPOST('foruserlogin').'">';
print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">'; print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
print '</form>'; print '</form>';

23
htdocs/compta/bank/card.php
View File

@ -515,6 +515,7 @@ if ($action == 'create') {
// Show fields of bank account // Show fields of bank account
$sizecss = ''; $sizecss = '';
foreach ($object->getFieldsToShow() as $val) { foreach ($object->getFieldsToShow() as $val) {
$content = '';
if ($val == 'BankCode') { if ($val == 'BankCode') {
$name = 'code_banque'; $name = 'code_banque';
$sizecss = 'minwidth100'; $sizecss = 'minwidth100';
@ -534,7 +535,7 @@ if ($action == 'create') {
} }
print '<td>'.$langs->trans($val).'</td>'; print '<td>'.$langs->trans($val).'</td>';
print '<td><input type="text" class="flat '.$sizecss.'" name="'.$name.'" value="'.(GETPOST($name) ?GETPOST($name, 'alpha') : $content).'"></td>'; print '<td><input type="text" class="flat '.$sizecss.'" name="'.$name.'" value="'.(GETPOSTISSET($name) ? GETPOST($name, 'alpha') : $content).'"></td>';
print '</tr>'; print '</tr>';
} }
$ibankey = FormBank::getIBANLabel($object); $ibankey = FormBank::getIBANLabel($object);
@ -545,10 +546,10 @@ if ($action == 'create') {
// IBAN // IBAN
print '<tr><td>'.$langs->trans($ibankey).'</td>'; print '<tr><td>'.$langs->trans($ibankey).'</td>';
print '<td><input maxlength="34" type="text" class="flat minwidth300" name="iban" value="'.(GETPOST('iban') ?GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>'; print '<td><input maxlength="34" type="text" class="flat minwidth300" name="iban" value="'.(GETPOSTISSET('iban') ?GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>';
print '<tr><td>'.$langs->trans($bickey).'</td>'; print '<tr><td>'.$langs->trans($bickey).'</td>';
print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOST('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>'; print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOSTISSET('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
if (isModEnabled('paymentbybanktransfer')) { if (isModEnabled('paymentbybanktransfer')) {
print '<tr><td>'.$langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation").'</td>'; print '<tr><td>'.$langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation").'</td>';
@ -559,7 +560,7 @@ if ($action == 'create') {
print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>'; print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">'; print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
print (GETPOST('domiciliation') ?GETPOST('domiciliation') : $object->domiciliation); print (GETPOSTISSET('domiciliation') ?GETPOST('domiciliation') : $object->domiciliation);
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>'; print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
@ -730,6 +731,7 @@ if ($action == 'create') {
// Show fields of bank account // Show fields of bank account
foreach ($object->getFieldsToShow() as $val) { foreach ($object->getFieldsToShow() as $val) {
$content = '';
if ($val == 'BankCode') { if ($val == 'BankCode') {
$content = $object->code_banque; $content = $object->code_banque;
} elseif ($val == 'DeskCode') { } elseif ($val == 'DeskCode') {
@ -1034,31 +1036,32 @@ if ($action == 'create') {
// If bank account // If bank account
print '<tr class="liste_titre_add"><td class="titlefieldcreate">'.$langs->trans("BankName").'</td>'; print '<tr class="liste_titre_add"><td class="titlefieldcreate">'.$langs->trans("BankName").'</td>';
print '<td><input size="30" type="text" class="flat" name="bank" value="'.$object->bank.'"></td>'; print '<td><input type="text" class="flat width300" name="bank" value="'.$object->bank.'"></td>';
print '</tr>'; print '</tr>';
// Show fields of bank account // Show fields of bank account
foreach ($object->getFieldsToShow() as $val) { foreach ($object->getFieldsToShow() as $val) {
$content = '';
if ($val == 'BankCode') { if ($val == 'BankCode') {
$name = 'code_banque'; $name = 'code_banque';
$size = 8; $css = 'with100';
$content = $object->code_banque; $content = $object->code_banque;
} elseif ($val == 'DeskCode') { } elseif ($val == 'DeskCode') {
$name = 'code_guichet'; $name = 'code_guichet';
$size = 8; $css = 'with100';
$content = $object->code_guichet; $content = $object->code_guichet;
} elseif ($val == 'BankAccountNumber') { } elseif ($val == 'BankAccountNumber') {
$name = 'number'; $name = 'number';
$size = 18; $css = 'with200';
$content = $object->number; $content = $object->number;
} elseif ($val == 'BankAccountNumberKey') { } elseif ($val == 'BankAccountNumberKey') {
$name = 'cle_rib'; $name = 'cle_rib';
$size = 3; $css = 'with50';
$content = $object->cle_rib; $content = $object->cle_rib;
} }
print '<tr><td>'.$langs->trans($val).'</td>'; print '<tr><td>'.$langs->trans($val).'</td>';
print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>'; print '<td><input type="text" class="flat '.$css.'" name="'.$name.'" value="'.dol_escape_htmltag($content).'"></td>';
print '</tr>'; print '</tr>';
} }

6
htdocs/compta/paiement/card.php
View File

@ -415,8 +415,6 @@ if ($resql) {
$i = 0; $i = 0;
$total = 0; $total = 0;
$moreforfilter = '';
print '<br>'; print '<br>';
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
@ -511,9 +509,9 @@ if ($resql) {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '') { if ($user->socid == 0 && $object->statut == 0 && $action == '') {
if ($user->rights->facture->paiement) { if ($user->rights->facture->paiement) {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&facid='.$objp->facid.'&action=valide&token='.newToken().'">'.$langs->trans('Valid').'</a>'; print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=valide&token='.newToken().'">'.$langs->trans('Valid').'</a>';
} }
} }
} }

9
htdocs/compta/paiement/cheque/card.php
View File

@ -485,13 +485,6 @@ if ($action == 'new') {
if (count($lines[$bid])) { if (count($lines[$bid])) {
foreach ($lines[$bid] as $lid => $value) { foreach ($lines[$bid] as $lid => $value) {
//$account_id = $bid; FIXME not used
// FIXME $accounts[$bid] is a label !
/*if (! isset($accounts[$bid]))
$accounts[$bid]=0;
$accounts[$bid] += 1;*/
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.dol_print_date($value["date"], 'day').'</td>'; print '<td>'.dol_print_date($value["date"], 'day').'</td>';
print '<td>'.$value["numero"]."</td>\n"; print '<td>'.$value["numero"]."</td>\n";
@ -525,8 +518,6 @@ if ($action == 'new') {
print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">'; print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
$i++;
} }
} }
print "</table>"; print "</table>";

2
htdocs/contrat/card.php
View File

@ -2025,7 +2025,7 @@ if ($action == 'create') {
print '</td></tr>'; print '</td></tr>';
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>'; print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input class="quatrevingtpercent" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>';
print '<td class="nohover right">'; print '<td class="nohover right">';
print '<input type="submit" class="button" name="close" value="'.$langs->trans("Disable").'"> &nbsp; '; print '<input type="submit" class="button" name="close" value="'.$langs->trans("Disable").'"> &nbsp; ';
print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';

2
htdocs/core/class/html.formsms.class.php
View File

@ -250,7 +250,7 @@ function limitChars(textarea, limit, infodiv)
if ($this->withtoreadonly) { if ($this->withtoreadonly) {
print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : ""; print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
} else { } else {
print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">"; print '<input size="16" id="sendto" name="sendto" value="'.dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "+").'">';
if (!empty($this->withtosocid) && $this->withtosocid > 0) { if (!empty($this->withtosocid) && $this->withtosocid > 0) {
$liste = array(); $liste = array();
foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value) { foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value) {

10
htdocs/fourn/commande/card.php
View File

@ -2654,7 +2654,8 @@ if ($action == 'create') {
$formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1); $formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>'; print '<tr><td>'.$langs->trans("Comment").'</td><td><input class="quatrevingtpercent" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
print '<tr><td class="center" colspan="2">'; print '<tr><td class="center" colspan="2">';
print '<input type="submit" name="makeorder" class="button" value="'.$langs->trans("ToOrder").'">'; print '<input type="submit" name="makeorder" class="button" value="'.$langs->trans("ToOrder").'">';
print ' &nbsp; &nbsp; '; print ' &nbsp; &nbsp; ';
@ -2720,7 +2721,7 @@ if ($action == 'create') {
print $form->selectarray("type", $liv); print $form->selectarray("type", $liv);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>'; print '<tr><td>'.$langs->trans("Comment").'</td><td><input class="quatrevingtpercent" type="text" name="comment"></td></tr>';
print '<tr><td class="center" colspan="2">'; print '<tr><td class="center" colspan="2">';
print '<input type="submit" name="receive" class="button" value="'.$langs->trans("Receive").'">'; print '<input type="submit" name="receive" class="button" value="'.$langs->trans("Receive").'">';
print ' &nbsp; &nbsp; '; print ' &nbsp; &nbsp; ';
@ -2784,13 +2785,12 @@ if ($action == 'create') {
print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>"; print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
} else { } else {
$textinput_size = "50";
// Webservice url // Webservice url
print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>'; print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
//Remote User //Remote User
print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>'; print '<tr><td>'.$langs->trans("User").'</td><td><input class="width100" type="text" name="ws_user"></td></tr>';
//Remote Password //Remote Password
print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>'; print '<tr><td>'.$langs->trans("Password").'</td><td><input class="width100" type="text" name="ws_password"></td></tr>';
//Submit button //Submit button
print '<tr><td class="center" colspan="2">'; print '<tr><td class="center" colspan="2">';
print '<input type="submit" class="button" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">'; print '<input type="submit" class="button" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';

2
htdocs/fourn/facture/card.php
View File

@ -2649,6 +2649,7 @@ if ($action == 'create') {
$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT'); $resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
// Multicurrency // Multicurrency
$multicurrency_resteapayer = 0;
if (isModEnabled("multicurrency")) { if (isModEnabled("multicurrency")) {
$multicurrency_totalpaid = $object->getSommePaiement(1); $multicurrency_totalpaid = $object->getSommePaiement(1);
$multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1); $multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
@ -2694,6 +2695,7 @@ if ($action == 'create') {
// Confirmation de la conversion de l'avoir en reduc // Confirmation de la conversion de l'avoir en reduc
if ($action == 'converttoreduc') { if ($action == 'converttoreduc') {
$type_fac = '';
if ($object->type == FactureFournisseur::TYPE_STANDARD) { if ($object->type == FactureFournisseur::TYPE_STANDARD) {
$type_fac = 'ExcessPaid'; $type_fac = 'ExcessPaid';
} elseif ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) { } elseif ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {

2
htdocs/printing/admin/printing.php
View File

@ -161,7 +161,7 @@ if ($mode == 'setup' && $user->admin) {
case "password": case "password":
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td'.($key['required'] ? ' class=required' : '').'>'.$langs->trans($key['varname']).'</td>'; print '<td'.($key['required'] ? ' class=required' : '').'>'.$langs->trans($key['varname']).'</td>';
print '<td><input size="32" type="'.(empty($key['type']) ? 'text' : $key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"'; print '<td><input class="width100" type="'.(empty($key['type']) ? 'text' : $key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"';
print isset($key['moreattributes']) ? ' '.$key['moreattributes'] : ''; print isset($key['moreattributes']) ? ' '.$key['moreattributes'] : '';
print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>'; print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>';
print '<td>&nbsp;'.($key['example'] != '' ? $langs->trans("Example").' : '.$key['example'] : '').'</td>'; print '<td>&nbsp;'.($key['example'] != '' ? $langs->trans("Example").' : '.$key['example'] : '').'</td>';

2
htdocs/product/card.php
View File

@ -2382,7 +2382,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="setbarcode">'; print '<input type="hidden" name="action" value="setbarcode">';
print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">'; print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">';
print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">'; print '<input class="width300" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
print '&nbsp;<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">'; print '&nbsp;<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
print '</form>'; print '</form>';
} else { } else {

2
htdocs/stripe/admin/stripe.php
View File

@ -525,7 +525,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { // TODO Not used by current code
print '<tr class="oddeven"><td>'; print '<tr class="oddeven"><td>';
print $langs->trans("CSSUrlForPaymentForm").'</td><td>'; print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">'; print '<input class="width500" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': http://mysite/mycss.css</span>'; print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': http://mysite/mycss.css</span>';
print '</td></tr>'; print '</td></tr>';