diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index de8fd9a8cd6..0ac79bcc3aa 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -481,11 +481,11 @@ if ($resql) // Action print '
| '; - print ''.img_delete().''; + print ''.img_delete().''; print ' | '; print ''."\n"; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 5a525cbe9ad..4aacdb3cfc2 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -299,7 +299,7 @@ if ($result) { print ''; } else { - print ''.img_delete().''; + print ''.img_delete().''; } print "\n"; diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 453f10bf837..17fa15af382 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -378,9 +378,9 @@ if ($result) print ''; if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) { - print ''.img_edit().''; + print ''.img_edit().''; print ' '; - print ''.img_delete().''; + print ''.img_delete().''; } else { print ''; print ''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index b6d5df3644a..1ac1e0f4ad4 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1671,14 +1671,14 @@ if ($id) print " | "; // Modify link - if ($canbemodified) print ''.img_edit().' | '; + if ($canbemodified) print ''.img_edit().' | '; else print ''; // Delete link if ($iserasable) { print ' | '; - if ($user->admin) print ''.img_delete().''; + if ($user->admin) print ''.img_delete().''; //else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin print ' | '; } else print ''; diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 1420cc0263e..eb9ffb52831 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -540,7 +540,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ''; print ' | '.$rulefilter['rulevalue'].' | '; print ''; - print ' id.'&action=deletefilter&filterid='.$rulefilter['id'].'&token='.urlencode(newToken()).'">'.img_delete().''; + print ' id.'&action=deletefilter&token='.urlencode(newToken()).'&filterid='.$rulefilter['id'].'">'.img_delete().''; print ' | '; print ''; } @@ -632,7 +632,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Delete print ''; print 'id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().''; - print ' id.'&action=deleteoperation&operationid='.$ruleaction['id'].'&token='.urlencode(newToken()).'">'.img_delete().''; + print ' id.'&action=deleteoperation&token='.newToken().'&operationid='.$ruleaction['id'].'">'.img_delete().''; print ' | '; print ''; $i++; diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php index 3ff8ad0c4ce..f55e78d4105 100644 --- a/htdocs/admin/expensereport_ik.php +++ b/htdocs/admin/expensereport_ik.php @@ -166,8 +166,8 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) echo ''; echo ''; } else { - echo ''.img_edit().''; - if (!empty($range->ik->id)) echo ''.img_delete().''; + echo ''.img_edit().''; + if (!empty($range->ik->id)) echo ''.img_delete().''; // TODO add delete link } } diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index 6d08355b815..e0012139154 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.php @@ -305,8 +305,8 @@ foreach ($rules as $rule) echo ''; if ($object->id != $rule->id) { - echo ''.img_edit().' '; - echo ''.img_delete().''; + echo ''.img_edit().' '; + echo ''.img_delete().''; } else { echo ' '; echo ''.$langs->trans('Cancel').''; diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 9a1a696e034..16ae12ffcc5 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -587,7 +587,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) if ($sortorder) $url .= '&page='.urlencode($sortorder); print ''.img_edit().''; //print ' '; - print ''.img_delete().' '; + print ''.img_delete().' '; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected = 0; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 610dd9c1ef2..7c79505158a 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -889,10 +889,10 @@ if ($resql) // Modify link / Delete link print ' | '; - if ($canbemodified) print ''.img_edit().''; + if ($canbemodified) print ''.img_edit().''; if ($iserasable) { - print ''.img_delete().''; + print ''.img_delete().''; //else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin } print ' | '; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 101e57970c0..b7b0060c778 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -320,20 +320,20 @@ if ($conf->use_javascript_ajax) $titre = $langs->trans($menu['titre']); $entry = '
| '; - $entry .= ' '.$titre.''; + $entry .= ' '.$titre.''; $entry .= ' | '; - $entry .= ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' '; - $entry .= ''.img_edit_add('default').' '; - $entry .= ''.img_delete('default').' '; + $entry .= ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' '; + $entry .= ''.img_edit_add('default').' '; + $entry .= ''.img_delete('default').' '; $entry .= ' '; - $entry .= ''.img_picto("Up", "1uparrow").''.img_picto("Down", "1downarrow").''; + $entry .= ''.img_picto("Up", "1uparrow").''.img_picto("Down", "1downarrow").''; $entry .= ' |
| '.($s ? $s.' ' : '')." ".$langs->trans('Language_'.$key).": ".'id.'&action=delete&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').' | |
| '.($s ? $s.' ' : '')." ".$langs->trans('Language_'.$key).": ".'id.'&action=delete&token='.newToken().'&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').' | |
| '.$langs->trans('Label').' | '.$object->multilangs[$key]["label"].' |
| '.$langs->trans('Description').' | '.$object->multilangs[$key]["description"].' | ".$objp->label." | "; print ''; - print 'rowid.'&action=edit">'.img_edit().''; - print 'rowid.'&action=delete">'.img_delete().''; + print 'rowid.'&action=edit&token='.newToken().'">'.img_edit().''; + print 'rowid.'&action=delete&token='.newToken().'">'.img_delete().''; print ' | '; } print ""; diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 20eab8b349e..371dbaa65e2 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -550,7 +550,7 @@ if ($id) if ($alreadyaccounted) { print ''; } else { - print ''; + print ''; } } else { print ''; diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 682981852d8..5b8b98135a1 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -521,7 +521,7 @@ if ($action == 'create') if ($user->rights->deplacement->supprimer) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } else { print ''.$langs->trans('Delete').''; } diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 634a4a0e452..7b0d7fcf869 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3935,7 +3935,7 @@ if ($action == 'create') } } - if ($action == 'deletepaiement') + if ($action == 'deletepayment') { $payment_id = GETPOST('paiement_id'); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 'no', 1); @@ -4743,7 +4743,7 @@ if ($action == 'create') print ''; if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) { - print 'id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">'; + print 'id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">'; print img_delete(); print ''; } @@ -5286,7 +5286,7 @@ if ($action == 'create') { print ''.$langs->trans('Delete').''; } else { - print 'id.'&action=delete">'.$langs->trans('Delete').''; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''; } } else { print ''.$langs->trans('Delete').''; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 721c0b857ab..f69517c1037 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -752,7 +752,7 @@ if ($object->id > 0) print ' | '.$langs->trans("OrderWaiting").' | '; print ''; - print ''; + print ''; print img_delete(); print ' | '; diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index cd7bbfd11c2..6353d394f20 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -280,7 +280,7 @@ if ($id) print "'; print ''.img_edit().''; // id= is included into $param if ($permissiontodelete) { - print ' '.img_delete().''; // id= is included into $param + print ' '.img_delete().''; // id= is included into $param } else { print ' '; } diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index 4b707f0772f..0312aa061f8 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -140,7 +140,7 @@ class printing_printgcp extends PrintingDriver 'info'=>$access, 'type'=>'info', 'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), - 'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '') + 'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '') ); if ($token_ok) { $expiredat = ''; @@ -166,7 +166,7 @@ class printing_printgcp extends PrintingDriver /* if ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)) { $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink'); - $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete'); + $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete'); } else { $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink'); }*/ diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index 8b92f4e183c..fb542f9037e 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -112,8 +112,8 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel } print ' | '; } - print ''.img_edit().''; - print ' '.img_delete().' | '."\n"; + print ''.img_edit().''; + print ' '.img_delete().' | '."\n"; print ""; } } else { diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php index 02a32110779..edb675e45d6 100644 --- a/htdocs/core/tpl/bloc_comment.tpl.php +++ b/htdocs/core/tpl/bloc_comment.tpl.php @@ -125,12 +125,12 @@ if (!empty($object->comments)) } else { if ($fk_user == $user->id || $user->admin == 1) { - print ''; + print ''; print img_picto('', 'edit.png'); print ''; } if (($first && $fk_user == $user->id) || $user->admin == 1) { - print ''; + print ''; print img_picto('', 'delete.png'); print ''; } diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 7665c4e2211..1cb8b813001 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -298,9 +298,9 @@ foreach ($list as $entry) if ($permission) { $href = $_SERVER["PHP_SELF"]; - $href .= "?id=".$object->id; - $href .= "&action=deletecontact"; - $href .= "&lineid=".$entry->id; + $href .= '?id='.$object->id; + $href .= '&action=deletecontact&token='.newToken(); + $href .= '&lineid='.$entry->id; print "";
print "";
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index ed54b4a2d00..9bc8447a796 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -73,11 +73,11 @@ if ((array) $linked_resources && count($linked_resources) > 0)
print '';
print ' ';
- print '';
+ print '';
print img_edit();
print '';
print ' ';
- print '';
+ print '';
print img_picto($langs->trans("Unlink"), 'unlink');
print '';
print ' ';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 80c3602f5d9..df529b598ec 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -726,7 +726,7 @@ if (($action == "create") || ($action == "edit"))
if (!$user->rights->cron->delete) {
print ''.$langs->trans("Delete").'';
} else {
- print ''.$langs->trans("Delete").'';
+ print ''.$langs->trans("Delete").'';
}
print '';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a41608e7e25..927c1d1014f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -536,12 +536,12 @@ if ($num > 0)
$backtourl = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : ''));
if ($user->rights->cron->create)
{
- print 'rowid."&action=edit".($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
+ print 'rowid.'&action=edit&token='.newToken().($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
print "&backtourl=".$backtourl."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'), 'edit')." ";
}
if ($user->rights->cron->delete)
{
- print 'rowid."&action=delete".($page ? '&page='.$page : '').($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
+ print 'rowid.'&action=delete&token='.newToken().($page ? '&page='.$page : '').($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
print "\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'), 'delete', '', false, 0, 0, '', 'marginleftonly')." ";
} else {
print "trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'), 'delete', '', false, 0, 0, '', 'marginleftonly')." ";
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 42e45c2cba0..95bebb3ef8d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -817,7 +817,7 @@ if (!empty($id) && $action != 'edit')
{
if ($object->statut == -1 || $object->statut == 0)
{
- print '";
+ print '";
} else {
print '";
}
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 4e4ce818556..26f540969ee 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -268,7 +268,7 @@ if (empty($action))
{
if (!$disable_delete)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
} else {
print ''.$langs->trans('Delete').'';
}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index b4e3c76aef1..a84beb605cb 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -292,7 +292,7 @@ if (empty($action) || $action == 'delete_section')
print '';
if ($user->rights->ecm->setup)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
} else {
print ''.$langs->trans('Delete').'';
}
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 27d08e9119f..be481aa09bd 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -457,7 +457,7 @@ if ($action != 'edit' && $action != 'delete')
//{
if ($permtoadd)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
} else {
print ''.$langs->trans('Delete').'';
}
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 48c15f92aa2..40068e2e0a3 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -405,7 +405,7 @@ if ($action != 'edit')
/*
if ($user->rights->ecm->setup)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
}
else
{
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 7d4a455d58b..86ec2ee5c38 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2360,7 +2360,7 @@ if ($action == 'create')
print 'id.'&action=editline&lineid='.$lines[$i]->id.'">'.img_edit().'';
print ' | ';
print ''; - print 'id.'&action=deleteline&lineid='.$lines[$i]->id.'">'.img_delete().''; + print 'id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().''; print ' | '; // Display lines extrafields @@ -2499,7 +2499,7 @@ if ($action == 'create') // Delete if ($user->rights->expedition->supprimer) { - print 'id.'&action=delete">'.$langs->trans("Delete").''; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").''; } } diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index addb13da745..34c33f5aaab 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2199,10 +2199,10 @@ if ($action == 'create') { print ''; - print 'id.'&action=editline&rowid='.$line->rowid.'">'; + print 'id.'&action=editline&token='.newToken().'&rowid='.$line->rowid.'">'; print img_edit(); print ' '; - print 'id.'&action=delete_line&rowid='.$line->rowid.'">'; + print 'id.'&action=delete_line&token='.newToken().'&rowid='.$line->rowid.'">'; print img_delete(); print ''; diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index fd1453b8ae5..9bc50341973 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -293,7 +293,7 @@ if ($action == '') { if (!$disable_delete) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } else { print ''.$langs->trans('Delete').''; } diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index a33437166ea..89ae2103476 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -845,7 +845,7 @@ class Export } // suppression de l'export print ' | ';
- print 'rowid.'">';
+ print 'rowid.'">';
print img_delete();
print '';
print "";
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index d297313675e..b8ff3714596 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -714,14 +714,14 @@ if ($action == 'create') {
if ($user->rights->ficheinter->creer) {
print ' ';
- print '';
print $langs->trans("CreateFichInter").' ';
}
if ($user->rights->ficheinter->supprimer) {
print '';
- print '';
+ print '';
print $langs->trans('Delete').' ';
}
print '';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 4034abad733..b6d7ab39336 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1697,7 +1697,7 @@ if ($action == 'create')
// Delete
if (($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
{
- print 'id.'&action=delete"';
+ print '';
}
}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 4a26d3b4cb6..419d5c7a559 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2559,7 +2559,7 @@ if ($action == 'create')
// Delete
if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate)))
{
- print 'id.'&action=delete">'.$langs->trans("Delete").'';
+ print 'id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'';
}
}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 9470e408b70..b0f178c6fc4 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2345,7 +2345,7 @@ if ($action == 'create')
{
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
}
- if ($action == 'deletepaiement')
+ if ($action == 'deletepayment')
{
$payment_id = GETPOST('paiement_id');
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 0, 1);
@@ -2789,7 +2789,7 @@ if ($action == 'create')
print ' ';
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index bc9f1048b4b..aafc36ca256 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -178,8 +178,8 @@ if ($action != 'create_updater' && $action != 'edit_updater')
print '';
if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
{
- print 'id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">';
+ print 'id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">';
print img_delete();
print '';
}
@@ -3178,7 +3178,7 @@ if ($action == 'create')
{
print '';
} else {
- print '';
+ print '';
}
}
print '';
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 9a7af329f50..ffe4c95bf51 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -345,7 +345,7 @@ if ($result > 0)
{
if ($allow_delete)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
} else {
print ''.$langs->trans('Delete').'';
}
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index cd76f74b278..7c0eab0f352 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -598,19 +598,19 @@ if (!function_exists('ftp_connect'))
print ' | ';
if ($is_directory)
{
- if ($file != '..') print ''.img_delete().'';
+ if ($file != '..') print ''.img_delete().'';
else print ' ';
} elseif ($is_link)
{
$newfile = $file;
$newfile = preg_replace('/ ->.*/', '', $newfile);
- print ''.img_delete().'';
+ print ''.img_delete().'';
} else {
- print ''.img_picto('', 'file').'';
+ print ''.img_picto('', 'file').'';
print ' ';
print '';
print ' ';
- print ''.img_delete().'';
+ print ''.img_delete().'';
print '';
print '';
}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 3bacf8d6d6a..d9bbe6607bf 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1470,7 +1470,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
}
if ($candelete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED)) // If draft or canceled or refused
{
- print 'id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'';
+ print 'id.'&action=delete&token='.newToken().'" class="butActionDelete">'.$langs->trans("DeleteCP").'';
}
print '';
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 0b000f879c2..1f43878babf 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -426,7 +426,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print ' | ';
print ''.$langs->trans('Modify').'';
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
print ' ';
}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 8dee2ed0538..71fad9dee9b 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -639,7 +639,7 @@ if ($step == 3 && $datatoimport)
// Affiche date fichier
print ''.dol_print_date(dol_filemtime($dir.'/'.$file), 'dayhour').' | ';
// Del button
- print ''.img_delete().' | ';
// Action button
print '';
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index e6f9e612a59..cf370fbdca0 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
TicketDictCategory=Ticket - Groupes
TicketDictSeverity=Ticket - Severities
TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
+TicketTypeShortCOM=Commercial question
TicketTypeShortHELP=Request for functionnal help
TicketTypeShortISSUE=Issue, bug or problem
TicketTypeShortREQUEST=Change or enhancement request
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 80594338ba1..2a1646a5d80 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -658,9 +658,9 @@ if ($action == 'create') // Create. Seems to no be used
{
if ($conf->expedition_bon->enabled)
{
- print ''.$langs->trans("Delete").'';
+ print ''.$langs->trans("Delete").'';
} else {
- print ''.$langs->trans("Delete").'';
+ print ''.$langs->trans("Delete").'';
}
}
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 157bdbd53b8..1c4116b34c2 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -752,13 +752,13 @@ if ($id > 0)
// Classify 'paid'
if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->rights->loan->write)
{
- print '';
+ print '';
}
// Delete
if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->delete)
{
- print '';
+ print '';
}
print "";
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 9b4da35e5d1..51aa3f85a92 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -281,7 +281,7 @@ if (empty($action) && !empty($user->rights->loan->delete))
{
if (!$disable_delete)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
} else {
print ''.$langs->trans('Delete').'';
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6cdf59a078a..69f985db0b9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -373,7 +373,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
|| defined('CSRFCHECK_WITH_TOKEN')) // Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
{
// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
- if ($_SERVER['REQUEST_METHOD'] == 'POST' || ((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) || in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof')))
+ if ($_SERVER['REQUEST_METHOD'] == 'POST' || ((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) || in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment')))
{
if (!GETPOSTISSET('token')) {
dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index fd9fe7fa798..49d097ffc8a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2713,7 +2713,7 @@ if ($module == 'initmodule')
print ' | ';
if ($propname != 'rowid')
{
- print ''.img_delete().'';
+ print ''.img_delete().'';
}
print ' | ';
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index d97bc8f7f35..49841fe24b9 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -521,7 +521,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Delete (need delete permission, or if draft, just need create/modify permission)
if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
{
- print 'id.'&action=delete">'.$langs->trans('Delete').''."\n";
+ print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''."\n";
} else {
print ''.$langs->trans('Delete').''."\n";
}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 49b29b7048b..add7de31b56 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -656,7 +656,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Delete (need delete permission, or if draft, just need create/modify permission)
if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
{
- print 'id.'&action=delete">'.$langs->trans('Delete').''."\n";
+ print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''."\n";
} else {
print ''.$langs->trans('Delete').''."\n";
}
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 2d714deeb2c..f5fa5a5ab78 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -371,7 +371,7 @@ if ($action != 'edit' && $user->rights->opensurvey->write) {
}
//Delete button
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
}
print ' | '.$entry->code.' | '; print ''.$entry->description.' | '; print ''.price($entry->value).' | '; - print 'id.'">'.img_edit().' '; - print 'id.'">'.img_delete().' | '; + print 'id.'">'.img_edit().' '; + print 'id.'">'.img_delete().' | '; print ''; } } else { @@ -270,7 +270,7 @@ if ($action != 'create_variable' && $action != 'edit_variable') print ''.$entry->update_interval.' | '; print ''.$entry->getLastUpdated().' | '; print 'id.'">'.img_edit().' '; - print 'id.'">'.img_delete().' | '; + print 'id.'">'.img_delete().''; print ''; } } else { @@ -284,7 +284,7 @@ if ($action != 'create_variable' && $action != 'edit_variable') { //Action Buttons print ''; - print ''.img_delete().''; + print ''.img_delete().''; print ' | '; print ''; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index c73e43dc6f0..847292fa367 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -913,7 +913,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_ if (($user->rights->produit->creer || $user->rights->service->creer)) { print 'id.'&action=edit_price_by_qty&rowid='.$prices["rowid"].'">'; print img_edit().''; - print 'id.'&action=delete_price_by_qty&rowid='.$prices["rowid"].'">'; + print 'id.'&action=delete_price_by_qty&token='.newToken().'&rowid='.$prices["rowid"].'">'; print img_delete().''; } else { print ' '; @@ -1064,7 +1064,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_ { print 'id.'&action=edit_price_by_qty&rowid='.$prices["rowid"].'">'; print img_edit().''; - print 'id.'&action=delete_price_by_qty&rowid='.$prices["rowid"].'">'; + print 'id.'&action=delete_price_by_qty&token='.newToken().'&rowid='.$prices["rowid"].'">'; print img_delete().''; } else { print ' '; @@ -1591,7 +1591,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul print ''; if ($candelete) { - print 'id.'&lineid='.$objp->rowid.'">'; + print 'id.'&lineid='.$objp->rowid.'">'; print img_delete(); print ''; } else print ' '; // Can not delete last price (it's current price) @@ -2148,7 +2148,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print img_edit('default', 0, 'style="vertical-align: middle;"'); print ''; print ' '; - print 'id.'&lineid='.$line->id.'">'; + print 'id.'&lineid='.$line->id.'">'; print img_delete('default', 'style="vertical-align: middle;"'); print ''; print ' | '; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 11aa5e860ae..81ae26390c9 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -485,13 +485,19 @@ if ($action == 'create') { if (empty($action)) { - if ($user->rights->stock->creer) - print "id."\">".$langs->trans("Modify").""; - else print "".$langs->trans("Modify").""; + if ($user->rights->stock->creer) { + print ''.$langs->trans("Modify").''; + } + else { + print ''.$langs->trans("Modify").''; + } - if ($user->rights->stock->supprimer) - print "id."\">".$langs->trans("Delete").""; - else print "".$langs->trans("Delete").""; + if ($user->rights->stock->supprimer) { + print ''.$langs->trans("Delete").''; + } + else { + print ''.$langs->trans("Delete").''; + } } } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 54d57bf5d75..64c23814ec2 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -1006,7 +1006,7 @@ if (!$variants) { print ''.$line['seuil_stock_alerte'].' | '; print ''.$line['desiredstock'].' | '; if (!empty($user->rights->produit->creer)) { - print ''.img_delete().' | '; + print ''.img_delete().' | '; } print ''; } diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index bdc68f5c3e5..dbedba85d99 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -371,7 +371,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if ($user->rights->stock->supprimer) { - print ''."\n"; + print ''."\n"; } */ } diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 502a15cd04e..c6a5d15a0b0 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -236,7 +236,7 @@ if ($action == 'edit') foreach ($object->multilangs as $key => $value) { $s = picto_from_langcode($key); - print "
| '; - print 'id.'&action=editline&lineid='.$lines[$i]->id.'">'.img_edit().''; + print 'id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().''; print ' | '; print ''; - print 'id.'&action=deleteline&lineid='.$lines[$i]->id.'">'.img_delete().''; + print 'id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().''; print ' | '; // Display lines extrafields @@ -2035,7 +2035,7 @@ if ($action == 'create') if ($user->rights->reception->supprimer) { - print 'id.'&action=delete">'.$langs->trans("Delete").''; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").''; } } diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php index 5e790c0b993..e25de998a36 100644 --- a/htdocs/recruitment/recruitmentcandidature_card.php +++ b/htdocs/recruitment/recruitmentcandidature_card.php @@ -543,7 +543,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Delete (need delete permission, or if draft, just need create/modify permission) if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) { - print 'id.'&action=delete">'.$langs->trans('Delete').''."\n"; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''."\n"; } else { print ''.$langs->trans('Delete').''."\n"; } diff --git a/htdocs/recruitment/recruitmentjobposition_candidature.php b/htdocs/recruitment/recruitmentjobposition_candidature.php index 219bb3469f6..a945df25bfc 100644 --- a/htdocs/recruitment/recruitmentjobposition_candidature.php +++ b/htdocs/recruitment/recruitmentjobposition_candidature.php @@ -520,7 +520,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Delete (need delete permission, or if draft, just need create/modify permission) if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) { - print 'id.'&action=delete">'.$langs->trans('Delete').''."\n"; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''."\n"; } else { print ''.$langs->trans('Delete').''."\n"; } diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php index ee09413905d..d4a115962f2 100644 --- a/htdocs/recruitment/recruitmentjobposition_card.php +++ b/htdocs/recruitment/recruitmentjobposition_card.php @@ -544,7 +544,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Delete (need delete permission, or if draft, just need create/modify permission) if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) { - print 'id.'&action=delete">'.$langs->trans('Delete').''."\n"; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''."\n"; } else { print ''.$langs->trans('Delete').''."\n"; } diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index b1fec3058c0..e170b038e7a 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -369,7 +369,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) if ($user->rights->resource->delete) { print ''; - print ''; + print ''; print img_edit(); print ''; print ' '; - print ''; + print ''; print img_delete('', 'class="marginleftonly"'); print ''; print ' | '; diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 6a696aa4132..ec1184a77e6 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -484,7 +484,7 @@ if ($id) { if (!empty($user->rights->salaries->delete)) { - print ''; + print ''; } else { print ''; } diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index d7f06763034..6591e38e1cb 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -246,7 +246,7 @@ for ($i = 1; $i <= 4; $i++) { use_javascript_ajax) { ?> trans('Delete'); ?> - control->tpl['id'].'&action=delete&canvas='.$canvas; ?>">trans('Delete'); ?> + control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.$canvas; ?>">trans('Delete'); ?>'.img_delete().' | '; + print ''.img_delete().' | '; print ''; $i++; } diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index ed835dfd9a4..6adf32dd392 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -1094,11 +1094,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print ''.$langs->trans("CreateCardOnStripe").''; } - print ''; + print ''; print img_picto($langs->trans("Modify"), 'edit'); print ''; print ' '; - print ''; // source='.$companypaymentmodetemp->stripe_card_ref.'& + print ''; // source='.$companypaymentmodetemp->stripe_card_ref.'& print img_picto($langs->trans("Delete"), 'delete'); print ''; } @@ -1248,7 +1248,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print ''; if ($user->rights->societe->creer) { - print ''; + print ''; print img_picto($langs->trans("Delete"), 'delete'); print ''; } @@ -1492,7 +1492,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print img_picto($langs->trans("Modify"), 'edit'); print ''; - print 'id.'&id='.$rib->id.'&action=delete">'; + print 'id.'&id='.$rib->id.'&action=delete&token='.newToken().'">'; print img_picto($langs->trans("Delete"), 'delete'); print ''; } diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 8fb17a59e3f..4a709fb9009 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -593,7 +593,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print img_edit('default', 0, 'style="vertical-align: middle;"'); print ''; print ' '; - print 'id.'&lineid='.$line->id.'">'; + print 'id.'&lineid='.$line->id.'">'; print img_delete('default', 'style="vertical-align: middle;"'); print ''; print ' | '; diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 1e884629791..1190b29aa3c 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1902,7 +1902,7 @@ if ($action == 'create') // Delete if (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete) { - print ''."\n"; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 96b9d55af6a..f989e231f60 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1898,7 +1898,7 @@ if ($action == 'create' || $action == 'adduserldap') { if ($user->admin || !$object->admin) // If user edited is admin, delete is possible on for an admin { - print ''; + print ''; } else { print ''; } diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index febdf3373fe..e8ffbd7c1f7 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -385,12 +385,12 @@ else { if ($caneditperms) { - print ''.$langs->trans("Modify").''; + print ''.$langs->trans("Modify").''; } if ($candisableperms) { - print ''.$langs->trans("DeleteGroup").''; + print ''.$langs->trans("DeleteGroup").''; } print "\n"; diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index bc07dc0270d..ca90e7f60e9 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -313,7 +313,7 @@ if ($result > 0) if ($obj->type == 'email') print $langs->trans("Email"); if ($obj->type == 'sms') print $langs->trans("SMS"); print ''; - print ''.img_delete().' | '; + print ''.img_delete().' | '; print ''; $i++; } diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index 13b7408fc93..c1bbc6fe6e2 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -219,8 +219,8 @@ if ($action == 'edit') { @@ -263,7 +263,7 @@ if ($action == 'edit') {value) ?> | - + | '.$prodstatic->getLibStatut(2, 1).''; print ''; print 'id.'">'.img_edit().''; - print 'id.'">'.img_delete().''; + print 'id.'">'.img_delete().''; print ' | '; print ''; if ($productCombinations || $massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index 971533bdd25..7973553f6d0 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -126,7 +126,7 @@ foreach ($variants as $key => $attribute) { print ' | '.$attribute->countChildProducts().' | '; print ''; print ''.img_edit().''; - print 'id.'&action=delete">'.img_delete().''; + print 'id.'&action=delete&token='.newToken().'">'.img_delete().''; print ' | '; print ''; if ($key > 0) { diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php index c1057935e31..403128a0f8b 100644 --- a/htdocs/website/websiteaccount_card.php +++ b/htdocs/website/websiteaccount_card.php @@ -331,7 +331,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if ($user->rights->website->delete) { - print ''."\n"; + print ''."\n"; } } print ''."\n"; diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php index efb02395e7b..721b40ebfd9 100644 --- a/htdocs/zapier/hook_card.php +++ b/htdocs/zapier/hook_card.php @@ -353,7 +353,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea */ if ($user->rights->mymodule->delete) { - print 'id.'&action=delete">'.$langs->trans('Delete').''."\n"; + print 'id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').''."\n"; } else { print ''.$langs->trans('Delete').''."\n"; } |