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

Work on #18448

Browse Source
This commit is contained in:
Laurent Destailleur 2021-09-02 21:35:36 +02:00
parent 3598816763
commit 77e9f15360
20 changed files with 570 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/bank.php
View File

@ -499,7 +499,7 @@ print "</tr>\n";
print '</table>'; print '</table>';
print dol_get_fiche_end(); print dol_get_fiche_end();
$form->buttonsSaveCancel("Save", ''); print $form->buttonsSaveCancel("Save", '');
print "</form>\n"; print "</form>\n";

17
htdocs/asset/card.php
View File

@ -81,6 +81,8 @@ $permissionnote = $user->rights->asset->write; // Used by the include of actions
$permissiondellink = $user->rights->asset->write; // Used by the include of actions_dellink.inc.php $permissiondellink = $user->rights->asset->write; // Used by the include of actions_dellink.inc.php
$upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1]; $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1];
$error = 0;
/* /*
* Actions * Actions
@ -93,12 +95,17 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$error = 0; $backurlforlist = DOL_URL_ROOT.'/asset/list.php';
$backurlforlist = dol_buildpath('/asset/list.php', 1); if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
// Actions cancel, add, update or delete if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php'; $backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/compta/bank/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';

7
htdocs/asset/type.php
View File

@ -90,6 +90,7 @@ $hookmanager->initHooks(array('assettypecard', 'globalcard'));
$permissiontoadd = $user->rights->asset->setup_advance; $permissiontoadd = $user->rights->asset->setup_advance;
/* /*
* Actions * Actions
*/ */
@ -396,7 +397,7 @@ if ($action == 'create') {
print dol_get_fiche_end(); print dol_get_fiche_end();
$form->buttonsSaveCancel("Add"); print $form->buttonsSaveCancel("Add");
print "</form>\n"; print "</form>\n";
} }
@ -502,12 +503,12 @@ if ($rowid > 0) {
// Edit // Edit
if ($user->rights->asset->write) { if ($user->rights->asset->write) {
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.((int) $object->id).'">'.$langs->trans("Modify").'</a></div>';
} }
// Delete // Delete
if ($user->rights->asset->write) { if ($user->rights->asset->write) {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.((int) $object->id).'">'.$langs->trans("DeleteType").'</a></div>';
} }
print "</div>"; print "</div>";

17
htdocs/comm/propal/card.php
View File

@ -147,8 +147,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/comm/propal/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/comm/propal/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }

17
htdocs/commande/card.php
View File

@ -138,8 +138,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/commande/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/commande/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }

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

@ -78,7 +78,26 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/compta/bank/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/compta/bank/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
}
$action = ''; $action = '';
} }

17
htdocs/compta/facture/card.php
View File

@ -172,8 +172,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/compta/facture/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/compta/facture/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }

23
htdocs/contrat/card.php
View File

@ -110,6 +110,29 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/contrat/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/contrat/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
}
$action = '';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once

14
htdocs/core/class/html.formticket.class.php
View File

@ -274,12 +274,16 @@ class FormTicket
// Categories // Categories
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
if (count($cate_arbo)) {
// Categories // Categories
print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0); print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print "</td></tr>"; print "</td></tr>";
} }
}
// Attached files // Attached files
if (!empty($this->withfile)) { if (!empty($this->withfile)) {
@ -467,13 +471,19 @@ class FormTicket
print dol_get_fiche_end(); print dol_get_fiche_end();
} }
print '<br><div class="center">'; print '<br>';
print $form->buttonsSaveCancel((($this->withthreadid > 0) ? "SendResponse" : "CreateTicket"), ($this->withcancel ? "Cancel" : ""));
/*
print '<div class="center">';
print '<input type="submit" class="button" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "CreateTicket")).'" />'; print '<input type="submit" class="button" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "CreateTicket")).'" />';
if ($this->withcancel) { if ($this->withcancel) {
print " &nbsp; &nbsp; &nbsp;"; print " &nbsp; &nbsp; &nbsp;";
print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
} }
print '</div>'; print '</div>';
*/
print '<input type="hidden" name="page_y">'."\n"; print '<input type="hidden" name="page_y">'."\n";

25
htdocs/don/card.php
View File

@ -84,6 +84,30 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
} }
if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/don/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/don/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
}
$action = '';
}
// Action reopen object // Action reopen object
if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) { if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
$object->fetch($id); $object->fetch($id);
@ -337,6 +361,7 @@ if ($action == 'builddoc')
} }
} }
*/ */
}
/* /*

17
htdocs/expensereport/card.php
View File

@ -138,8 +138,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/expensereport/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/expensereport/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }

18
htdocs/fichinter/card.php
View File

@ -113,8 +113,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/fichinter/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/fichinter/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }
@ -995,6 +1010,7 @@ if ($action == 'create') {
} else { } else {
print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">'; print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="create">'; // We go back to create action
print dol_get_fiche_head(''); print dol_get_fiche_head('');

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

@ -168,6 +168,17 @@ if (empty($reshook)) {
} }
} }
if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
}
$action = '';
}
include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once

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

@ -140,8 +140,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/fourn/facture/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/fourn/facture/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }

35
htdocs/holiday/card.php
View File

@ -124,8 +124,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/holiday/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/holiday/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }
@ -915,9 +930,11 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd'); $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
print '<script type="text/javascript"> print '<script type="text/javascript">
function valider() $( document ).ready(function() {
{ $("input.button-save").click("submit", function(e) {
console.log("Call valider()");
if (document.demandeCP.date_debut_.value != "") if (document.demandeCP.date_debut_.value != "")
{ {
if(document.demandeCP.date_fin_.value != "") if(document.demandeCP.date_fin_.value != "")
@ -941,11 +958,13 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'"); alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'");
return false; return false;
} }
} });
});
</script>'."\n"; </script>'."\n";
// Formulaire de demande // Formulaire de demande
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n"; print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="demandeCP">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'" />'."\n"; print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
print '<input type="hidden" name="action" value="add" />'."\n"; print '<input type="hidden" name="action" value="add" />'."\n";
@ -1084,11 +1103,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
print dol_get_fiche_end(); print dol_get_fiche_end();
print '<div class="center">'; print $form->buttonsSaveCancel("SendRequestCP");
print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
print '&nbsp; &nbsp; ';
print '<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)">';
print '</div>';
print '</from>'."\n"; print '</from>'."\n";
} }

21
htdocs/projet/card.php
View File

@ -103,6 +103,8 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/projet/list.php';
// Cancel // Cancel
if ($cancel) { if ($cancel) {
if (GETPOST("comefromclone") == 1) { if (GETPOST("comefromclone") == 1) {
@ -115,11 +117,26 @@ if (empty($reshook)) {
setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors'); setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
} }
} }
if ($backtopage) { }
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/projet/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }
$action = ''; $action = '';
} }

6
htdocs/public/ticket/create_ticket.php
View File

@ -93,7 +93,7 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
} }
// Add file in email form // Add file in email form
if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) { if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('save', 'alpha')) {
////$res = $object->fetch('','',GETPOST('track_id')); ////$res = $object->fetch('','',GETPOST('track_id'));
////if($res > 0) ////if($res > 0)
////{ ////{
@ -112,7 +112,7 @@ if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha'))
} }
// Remove file // Remove file
if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) { if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alpha')) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Set tmp directory // Set tmp directory
@ -124,7 +124,7 @@ if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha
$action = 'create_ticket'; $action = 'create_ticket';
} }
if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) { if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
$error = 0; $error = 0;
$origin_email = GETPOST('email', 'alpha'); $origin_email = GETPOST('email', 'alpha');
if (empty($origin_email)) { if (empty($origin_email)) {

18
htdocs/supplier_proposal/card.php
View File

@ -60,6 +60,7 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
$socid = GETPOST('socid', 'int'); $socid = GETPOST('socid', 'int');
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel');
$origin = GETPOST('origin', 'alpha'); $origin = GETPOST('origin', 'alpha');
$originid = GETPOST('originid', 'int'); $originid = GETPOST('originid', 'int');
$confirm = GETPOST('confirm', 'alpha'); $confirm = GETPOST('confirm', 'alpha');
@ -132,8 +133,23 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/supplier_proposal/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }

40
htdocs/ticket/card.php
View File

@ -144,17 +144,31 @@ if (empty($reshook)) {
$search_agenda_label = ''; $search_agenda_label = '';
} }
$backurlforlist = DOL_URL_ROOT.'/ticket/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/ticket/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) { if ($cancel) {
if (!empty($backtopage)) { if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }
$action = 'view'; $action = 'view';
} }
// Action to add an action (not a message) // Action to add an action (not a message)
if (GETPOST('add', 'alpha') && !empty($user->rights->ticket->write)) { if (GETPOST('save', 'alpha') && !empty($user->rights->ticket->write)) {
$error = 0; $error = 0;
if (!GETPOST("subject", 'alphanohtml')) { if (!GETPOST("subject", 'alphanohtml')) {
@ -276,9 +290,13 @@ if (empty($reshook)) {
$db->commit(); $db->commit();
if (!empty($backtopage)) { if (!empty($backtopage)) {
if (empty($id)) {
$url = $backtopage; $url = $backtopage;
} else { } else {
$url = 'card.php?track_id='.$object->track_id; $url = 'card.php?track_id='.urlencode($object->track_id);
}
} else {
$url = 'card.php?track_id='.urlencode($object->track_id);
} }
header("Location: ".$url); header("Location: ".$url);
@ -342,9 +360,13 @@ if (empty($reshook)) {
$action = 'edit'; $action = 'edit';
} else { } else {
if (!empty($backtopage)) { if (!empty($backtopage)) {
if (empty($id)) {
$url = $backtopage; $url = $backtopage;
} else { } else {
$url = 'card.php?track_id='.$object->track_id; $url = 'card.php?track_id='.urlencode($object->track_id);
}
} else {
$url = 'card.php?track_id='.urlencode($object->track_id);
} }
header('Location: '.$url); header('Location: '.$url);
@ -427,9 +449,13 @@ if (empty($reshook)) {
if ($ret > 0) { if ($ret > 0) {
if (!empty($backtopage)) { if (!empty($backtopage)) {
if (empty($id)) {
$url = $backtopage; $url = $backtopage;
} else { } else {
$url = 'card.php?action=view&track_id='.$object->track_id; $url = 'card.php?track_id='.urlencode($object->track_id);
}
} else {
$url = 'card.php?action=view&track_id='.urlencode($object->track_id);
} }
header("Location: ".$url); header("Location: ".$url);
@ -707,6 +733,8 @@ if ($action == 'create' || $action == 'presend') {
$formticket->withextrafields = 1; $formticket->withextrafields = 1;
$formticket->param = array('origin' => GETPOST('origin'), 'originid' => GETPOST('originid')); $formticket->param = array('origin' => GETPOST('origin'), 'originid' => GETPOST('originid'));
$formticket->withcancel = 1;
$formticket->showForm(1, 'create', 0); $formticket->showForm(1, 'create', 0);
/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) { /*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
$formticket = new FormTicket($db); $formticket = new FormTicket($db);

23
htdocs/user/card.php
View File

@ -138,6 +138,29 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/user/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/user/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);
exit;
} elseif (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
}
$action = '';
}
if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser) { if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser) {
if ($id != $user->id) { // A user can't disable itself if ($id != $user->id) { // A user can't disable itself
$object->fetch($id); $object->fetch($id);