';
print '
'; + $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'
'; - $id = $object->create($user); - if ($id <= 0) { - $error++; - $errors = ($object->error ? array($object->error) : $object->errors); - array_push($object->errors, $object->error ? array($object->error) : $object->errors); - $action = 'create_ticket'; - } + $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; + $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', ''.$object->track_id.'').'
'; + $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'
'; - if (!$error && $id > 0) { - if ($usertoassign > 0) { - $object->add_contact($usertoassign, "SUPPORTCLI", 'external', 0); - } - } + $message .= $infos_new_ticket; + $message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name)); - if (!$error) { - $object->db->commit(); - $action = "infos_success"; - } else { - $object->db->rollback(); - setEventMessages($object->error, $object->errors, 'errors'); - $action = 'create_ticket'; - } + $sendto = GETPOST('email', 'alpha'); - if (!$error) { - $res = $object->fetch($id); - if ($res) { - // Create form object - include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $formmail = new FormMail($db); - - // Init to avoid errors - $filepath = array(); - $filename = array(); - $mimetype = array(); - - $attachedfiles = $formmail->get_attached_files(); - $filepath = $attachedfiles['paths']; - $filename = $attachedfiles['names']; - $mimetype = $attachedfiles['mimes']; - - // Send email to customer - - $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id); - $message = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'
'; - $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'
'; - - $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; - $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', ''.$object->track_id.'').'
'; - $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'
'; - - $message .= $infos_new_ticket; - $message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name)); - - $sendto = GETPOST('email', 'alpha'); - - $from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>'; - $replyto = $from; - $sendtocc = ''; - $deliveryreceipt = 0; - - if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) { - $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO; - $conf->global->MAIN_MAIL_AUTOCOPY_TO = ''; - } - include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket'); - if ($mailfile->error || $mailfile->errors) { - setEventMessages($mailfile->error, $mailfile->errors, 'errors'); - } else { - $result = $mailfile->sendfile(); - } - if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) { - $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO; - } - - // Send email to TICKET_NOTIFICATION_EMAIL_TO - $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO; - if ($sendto) { - $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id); - $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'
'; - $message_admin .= '
'; + $message_admin .= '
';
} else {
- print '';
+ if (!empty($mysoc->url)) {
+ print '';
+ }
print '
';
+ if (!empty($mysoc->url)) {
+ print '';
+ }
print '
';
if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
print '';
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 33b3b8bdccd..585d157981b 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -22,9 +22,10 @@
* \brief Display public form to add new ticket
*/
+/* We need object $user->default_values
if (!defined('NOREQUIREUSER')) {
define('NOREQUIREUSER', '1');
-}
+}*/
if (!defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', '1');
}
@@ -37,9 +38,6 @@ if (!defined('NOREQUIREHTML')) {
if (!defined('NOLOGIN')) {
define("NOLOGIN", 1); // This means this output page does not require to be logged.
}
-if (!defined('NOCSRFCHECK')) {
- define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-}
if (!defined('NOIPCHECK')) {
define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
}
@@ -73,6 +71,9 @@ $id = GETPOST('id', 'int');
$msg_id = GETPOST('msg_id', 'int');
$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
+$backtopage = '';
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('publicnewticketcard', 'globalcard'));
@@ -105,298 +106,265 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
// Add file in email form
-if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('save', 'alpha')) {
- ////$res = $object->fetch('','',GETPOST('track_id'));
- ////if($res > 0)
- ////{
- include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+if (empty($reshook)) {
+ if ($cancel) {
+ $backtopage = DOL_URL_ROOT.'/public/ticket/index.php';
- // Set tmp directory TODO Use a dedicated directory for temp mails files
- $vardir = $conf->ticket->dir_output;
- $upload_dir_tmp = $vardir.'/temp/'.session_id();
- if (!dol_is_dir($upload_dir_tmp)) {
- dol_mkdir($upload_dir_tmp);
+ header("Location: ".$backtopage);
+ exit;
}
- dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, '', 0);
- $action = 'create_ticket';
- ////}
-}
+ if (GETPOST('addfile', 'alpha') && !GETPOST('save', 'alpha')) {
+ ////$res = $object->fetch('','',GETPOST('track_id'));
+ ////if($res > 0)
+ ////{
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-// Remove file
-if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alpha')) {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ // Set tmp directory TODO Use a dedicated directory for temp mails files
+ $vardir = $conf->ticket->dir_output;
+ $upload_dir_tmp = $vardir.'/temp/'.session_id();
+ if (!dol_is_dir($upload_dir_tmp)) {
+ dol_mkdir($upload_dir_tmp);
+ }
- // Set tmp directory
- $vardir = $conf->ticket->dir_output.'/';
- $upload_dir_tmp = $vardir.'/temp/'.session_id();
+ dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, '', 0);
+ $action = 'create_ticket';
+ ////}
+ }
- // TODO Delete only files that was uploaded from email form
- dol_remove_file_process(GETPOST('removedfile'), 0, 0);
- $action = 'create_ticket';
-}
+ // Remove file
+ if (GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alpha')) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
- $error = 0;
- $origin_email = GETPOST('email', 'alpha');
- if (empty($origin_email)) {
- $error++;
- array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
- $action = '';
- } else {
- // Search company saved with email
- $searched_companies = $object->searchSocidByEmail($origin_email, '0');
+ // Set tmp directory
+ $vardir = $conf->ticket->dir_output.'/';
+ $upload_dir_tmp = $vardir.'/temp/'.session_id();
- // Chercher un contact existant avec cette adresse email
- // Le premier contact trouvé est utilisé pour déterminer le contact suivi
- $contacts = $object->searchContactByEmail($origin_email);
+ // TODO Delete only files that was uploaded from email form
+ dol_remove_file_process(GETPOST('removedfile'), 0, 0);
+ $action = 'create_ticket';
+ }
- // Option to require email exists to create ticket
- if (!empty($conf->global->TICKET_EMAIL_MUST_EXISTS) && !$contacts[0]->socid) {
+ if ($action == 'create_ticket' && GETPOST('save', 'alpha')) {
+ $error = 0;
+ $origin_email = GETPOST('email', 'alpha');
+ if (empty($origin_email)) {
$error++;
- array_push($object->errors, $langs->trans("ErrorEmailMustExistToCreateTicket"));
+ array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
$action = '';
- }
- }
+ } else {
+ // Search company saved with email
+ $searched_companies = $object->searchSocidByEmail($origin_email, '0');
- $contact_lastname = '';
- $contact_firstname = '';
- $company_name = '';
- $contact_phone = '';
- if ($with_contact) {
- // set linked contact to add in form
- if (is_array($contacts) && count($contacts) == 1) {
- $with_contact = current($contacts);
- }
+ // Chercher un contact existant avec cette adresse email
+ // Le premier contact trouvé est utilisé pour déterminer le contact suivi
+ $contacts = $object->searchContactByEmail($origin_email);
- // check mandatory fields on contact
- $contact_lastname = trim(GETPOST('contact_lastname', 'alphanohtml'));
- $contact_firstname = trim(GETPOST('contact_firstname', 'alphanohtml'));
- $company_name = trim(GETPOST('company_name', 'alphanohtml'));
- $contact_phone = trim(GETPOST('contact_phone', 'alphanohtml'));
- if (!($with_contact->id > 0)) {
- // check lastname
- if (empty($contact_lastname)) {
+ // Option to require email exists to create ticket
+ if (!empty($conf->global->TICKET_EMAIL_MUST_EXISTS) && !$contacts[0]->socid) {
$error++;
- array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Lastname')));
- $action = '';
- }
- // check firstname
- if (empty($contact_firstname)) {
- $error++;
- array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Firstname')));
+ array_push($object->errors, $langs->trans("ErrorEmailMustExistToCreateTicket"));
$action = '';
}
}
- }
- if (!GETPOST("subject", "restricthtml")) {
- $error++;
- array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
- $action = '';
- }
- if (!GETPOST("message", "restricthtml")) {
- $error++;
- array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")));
- $action = '';
- }
+ $contact_lastname = '';
+ $contact_firstname = '';
+ $company_name = '';
+ $contact_phone = '';
+ if ($with_contact) {
+ // set linked contact to add in form
+ if (is_array($contacts) && count($contacts) == 1) {
+ $with_contact = current($contacts);
+ }
- // Check email address
- if (!empty($origin_email) && !isValidEmail($origin_email)) {
- $error++;
- array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("email")));
- $action = '';
- }
+ // check mandatory fields on contact
+ $contact_lastname = trim(GETPOST('contact_lastname', 'alphanohtml'));
+ $contact_firstname = trim(GETPOST('contact_firstname', 'alphanohtml'));
+ $company_name = trim(GETPOST('company_name', 'alphanohtml'));
+ $contact_phone = trim(GETPOST('contact_phone', 'alphanohtml'));
+ if (!($with_contact->id > 0)) {
+ // check lastname
+ if (empty($contact_lastname)) {
+ $error++;
+ array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Lastname')));
+ $action = '';
+ }
+ // check firstname
+ if (empty($contact_firstname)) {
+ $error++;
+ array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Firstname')));
+ $action = '';
+ }
+ }
+ }
- // Check Captcha code if is enabled
- if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) || !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
- $sessionkey = 'dol_antispam_value';
- $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
- if (!$ok) {
+ if (!GETPOST("subject", "restricthtml")) {
$error++;
- array_push($object->errors, $langs->trans("ErrorBadValueForCode"));
+ array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
$action = '';
}
- }
-
- if (!$error) {
- $object->db->begin();
-
- $object->track_id = generate_random_id(16);
-
- $object->subject = GETPOST("subject", "restricthtml");
- $object->message = GETPOST("message", "restricthtml");
- $object->origin_email = $origin_email;
-
- $object->type_code = GETPOST("type_code", 'aZ09');
- $object->category_code = GETPOST("category_code", 'aZ09');
- $object->severity_code = GETPOST("severity_code", 'aZ09');
-
- if (!is_object($user)) {
- $user = new User($db);
+ if (!GETPOST("message", "restricthtml")) {
+ $error++;
+ array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")));
+ $action = '';
}
- // create third-party with contact
- $usertoassign = 0;
- if ($with_contact && !($with_contact->id > 0)) {
- $company = new Societe($db);
- if (!empty($company_name)) {
- $company->name = $company_name;
- } else {
- $company->particulier = 1;
- $company->name = dolGetFirstLastname($contact_firstname, $contact_lastname);
- }
- $result = $company->create($user);
- if ($result < 0) {
+ // Check email address
+ if (!empty($origin_email) && !isValidEmail($origin_email)) {
+ $error++;
+ array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("email")));
+ $action = '';
+ }
+
+ // Check Captcha code if is enabled
+ if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) || !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
+ $sessionkey = 'dol_antispam_value';
+ $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
+ if (!$ok) {
$error++;
- $errors = ($company->error ? array($company->error) : $company->errors);
- array_push($object->errors, $errors);
+ array_push($object->errors, $langs->trans("ErrorBadValueForCode"));
+ $action = '';
+ }
+ }
+
+ if (!$error) {
+ $object->db->begin();
+
+ $object->track_id = generate_random_id(16);
+
+ $object->subject = GETPOST("subject", "restricthtml");
+ $object->message = GETPOST("message", "restricthtml");
+ $object->origin_email = $origin_email;
+
+ $object->type_code = GETPOST("type_code", 'aZ09');
+ $object->category_code = GETPOST("category_code", 'aZ09');
+ $object->severity_code = GETPOST("severity_code", 'aZ09');
+
+ if (!is_object($user)) {
+ $user = new User($db);
+ }
+
+ // create third-party with contact
+ $usertoassign = 0;
+ if ($with_contact && !($with_contact->id > 0)) {
+ $company = new Societe($db);
+ if (!empty($company_name)) {
+ $company->name = $company_name;
+ } else {
+ $company->particulier = 1;
+ $company->name = dolGetFirstLastname($contact_firstname, $contact_lastname);
+ }
+ $result = $company->create($user);
+ if ($result < 0) {
+ $error++;
+ $errors = ($company->error ? array($company->error) : $company->errors);
+ array_push($object->errors, $errors);
+ $action = 'create_ticket';
+ }
+
+ // create contact and link to this new company
+ if (!$error) {
+ $with_contact->email = $origin_email;
+ $with_contact->lastname = $contact_lastname;
+ $with_contact->firstname = $contact_firstname;
+ $with_contact->socid = $company->id;
+ $with_contact->phone_pro = $contact_phone;
+ $result = $with_contact->create($user);
+ if ($result < 0) {
+ $error++;
+ $errors = ($with_contact->error ? array($with_contact->error) : $with_contact->errors);
+ array_push($object->errors, $errors);
+ $action = 'create_ticket';
+ } else {
+ $contacts = array($with_contact);
+ }
+ }
+ }
+
+ if (is_array($searched_companies)) {
+ $object->fk_soc = $searched_companies[0]->id;
+ }
+
+ if (is_array($contacts) and count($contacts) > 0) {
+ $object->fk_soc = $contacts[0]->socid;
+ $usertoassign = $contacts[0]->id;
+ }
+
+ $ret = $extrafields->setOptionalsFromPost(null, $object);
+
+ // Generate new ref
+ $object->ref = $object->getDefaultRef();
+
+ $object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
+
+ $id = $object->create($user);
+ if ($id <= 0) {
+ $error++;
+ $errors = ($object->error ? array($object->error) : $object->errors);
+ array_push($object->errors, $object->error ? array($object->error) : $object->errors);
$action = 'create_ticket';
}
- // create contact and link to this new company
+ if (!$error && $id > 0) {
+ if ($usertoassign > 0) {
+ $object->add_contact($usertoassign, "SUPPORTCLI", 'external', 0);
+ }
+ }
+
if (!$error) {
- $with_contact->email = $origin_email;
- $with_contact->lastname = $contact_lastname;
- $with_contact->firstname = $contact_firstname;
- $with_contact->socid = $company->id;
- $with_contact->phone_pro = $contact_phone;
- $result = $with_contact->create($user);
- if ($result < 0) {
- $error++;
- $errors = ($with_contact->error ? array($with_contact->error) : $with_contact->errors);
- array_push($object->errors, $errors);
- $action = 'create_ticket';
- } else {
- $contacts = array($with_contact);
- }
+ $object->db->commit();
+ $action = "infos_success";
+ } else {
+ $object->db->rollback();
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action = 'create_ticket';
}
- }
- if (is_array($searched_companies)) {
- $object->fk_soc = $searched_companies[0]->id;
- }
+ if (!$error) {
+ $res = $object->fetch($id);
+ if ($res) {
+ // Create form object
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ $formmail = new FormMail($db);
- if (is_array($contacts) and count($contacts) > 0) {
- $object->fk_soc = $contacts[0]->socid;
- $usertoassign = $contacts[0]->id;
- }
+ // Init to avoid errors
+ $filepath = array();
+ $filename = array();
+ $mimetype = array();
- $ret = $extrafields->setOptionalsFromPost(null, $object);
+ $attachedfiles = $formmail->get_attached_files();
+ $filepath = $attachedfiles['paths'];
+ $filename = $attachedfiles['names'];
+ $mimetype = $attachedfiles['mimes'];
- // Generate new ref
- $object->ref = $object->getDefaultRef();
+ // Send email to customer
- $object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
+ $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
+ $message = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'
'; + $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'
'; - $id = $object->create($user); - if ($id <= 0) { - $error++; - $errors = ($object->error ? array($object->error) : $object->errors); - array_push($object->errors, $object->error ? array($object->error) : $object->errors); - $action = 'create_ticket'; - } + $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; + $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', ''.$object->track_id.'').'
'; + $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'
'; - if (!$error && $id > 0) { - if ($usertoassign > 0) { - $object->add_contact($usertoassign, "SUPPORTCLI", 'external', 0); - } - } + $message .= $infos_new_ticket; + $message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name)); - if (!$error) { - $object->db->commit(); - $action = "infos_success"; - } else { - $object->db->rollback(); - setEventMessages($object->error, $object->errors, 'errors'); - $action = 'create_ticket'; - } + $sendto = GETPOST('email', 'alpha'); - if (!$error) { - $res = $object->fetch($id); - if ($res) { - // Create form object - include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $formmail = new FormMail($db); - - // Init to avoid errors - $filepath = array(); - $filename = array(); - $mimetype = array(); - - $attachedfiles = $formmail->get_attached_files(); - $filepath = $attachedfiles['paths']; - $filename = $attachedfiles['names']; - $mimetype = $attachedfiles['mimes']; - - // Send email to customer - - $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id); - $message = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'
'; - $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'
'; - - $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; - $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', ''.$object->track_id.'').'
'; - $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'
'; - - $message .= $infos_new_ticket; - $message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name)); - - $sendto = GETPOST('email', 'alpha'); - - $from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>'; - $replyto = $from; - $sendtocc = ''; - $deliveryreceipt = 0; - - if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) { - $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO; - $conf->global->MAIN_MAIL_AUTOCOPY_TO = ''; - } - include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket'); - if ($mailfile->error || $mailfile->errors) { - setEventMessages($mailfile->error, $mailfile->errors, 'errors'); - } else { - $result = $mailfile->sendfile(); - } - if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) { - $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO; - } - - // Send email to TICKET_NOTIFICATION_EMAIL_TO - $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO; - if ($sendto) { - $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id); - $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'
'; - $message_admin .= '
- '.$langs->trans('Title').' : '.$object->subject.' '; - $message_admin .= '
- '.$langs->trans('Type').' : '.$object->type_label.' '; - $message_admin .= '
- '.$langs->trans('Category').' : '.$object->category_label.' '; - $message_admin .= '
- '.$langs->trans('Severity').' : '.$object->severity_label.' '; - $message_admin .= '
- '.$langs->trans('From').' : '.$object->origin_email.' '; - // Extrafields - $extrafields->fetch_name_optionals_label($object->table_element); - if (is_array($object->array_options) && count($object->array_options) > 0) { - foreach ($object->array_options as $key => $value) { - $key = substr($key, 8); // remove "options_" - $message_admin .= '
- '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).' '; - } - } - $message_admin .= '
'.$langs->trans('Message').' :
'.$object->message.'
'.$langs->trans('SeeThisTicketIntomanagementInterface').'
'; - - $from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>'; + $from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>'; $replyto = $from; + $sendtocc = ''; + $deliveryreceipt = 0; if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) { $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO; $conf->global->MAIN_MAIL_AUTOCOPY_TO = ''; } include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket'); + $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket'); if ($mailfile->error || $mailfile->errors) { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); } else { @@ -405,36 +373,78 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) { if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) { $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO; } + + // Send email to TICKET_NOTIFICATION_EMAIL_TO + $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO; + if ($sendto) { + $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id); + $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).''; + $message_admin .= '
- '.$langs->trans('Title').' : '.$object->subject.' '; + $message_admin .= '
- '.$langs->trans('Type').' : '.$object->type_label.' '; + $message_admin .= '
- '.$langs->trans('Category').' : '.$object->category_label.' '; + $message_admin .= '
- '.$langs->trans('Severity').' : '.$object->severity_label.' '; + $message_admin .= '
- '.$langs->trans('From').' : '.$object->origin_email.' '; + // Extrafields + $extrafields->fetch_name_optionals_label($object->table_element); + if (is_array($object->array_options) && count($object->array_options) > 0) { + foreach ($object->array_options as $key => $value) { + $key = substr($key, 8); // remove "options_" + $message_admin .= '
- '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).' '; + } + } + $message_admin .= '
'.$langs->trans('Message').' :
'.$object->message.'
'.$langs->trans('TicketPublicInfoCreateTicket').'
';
+ //print ''.$langs->trans('TicketPublicInfoCreateTicket').'
';
$formticket->showForm(0, 'edit', 1, $with_contact);
}
}
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 4ea314c8149..1b149059a4b 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -22,9 +22,6 @@
* \brief Public page to add and manage ticket
*/
-if (!defined('NOCSRFCHECK')) {
- define('NOCSRFCHECK', '1');
-}
if (!defined('NOREQUIREMENU')) {
define('NOREQUIREMENU', '1');
}
@@ -82,11 +79,12 @@ $arrayofcss = array('/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
print '';
-print '
'; print '
';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index ec7698ceb00..7af60f50e83 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -21,10 +21,6 @@
* \brief Public file to list tickets
*/
-if (!defined('NOCSRFCHECK')) {
- define('NOCSRFCHECK', '1');
-}
-// Do not check anti CSRF attack test
if (!defined('NOREQUIREMENU')) {
define('NOREQUIREMENU', '1');
}
@@ -60,8 +56,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
$langs->loadLangs(array("companies", "other", "ticket"));
// Get parameters
-$track_id = GETPOST('track_id', 'alpha');
$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
+$track_id = GETPOST('track_id', 'alpha');
$email = strtolower(GETPOST('email', 'alpha'));
if (GETPOST('btn_view_ticket_list')) {
@@ -90,6 +88,13 @@ if (empty($conf->ticket->enabled)) {
* Actions
*/
+if ($cancel) {
+ $backtopage = DOL_URL_ROOT.'/public/ticket/index.php';
+
+ header("Location: ".$backtopage);
+ exit;
+}
+
if ($action == "view_ticketlist") {
$error = 0;
$display_ticket_list = false;
@@ -185,9 +190,10 @@ $arrayofcss = array('/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
-print ''.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).'
'; +print ''.(!empty($conf->global->TICKET_PUBLIC_TEXT_HOME) ? $conf->global->TICKET_PUBLIC_TEXT_HOME : ''.$langs->trans("TicketPublicDesc")).'
'; +print ''; print '
';
-print '
'.dol_escape_htmltag($langs->trans("CreateTicket")).'';
-print '
'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'';
-print '
'.dol_escape_htmltag($langs->trans("CreateTicket")).'';
+print '
'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'';
+print '
';
print ''.dol_escape_htmltag($langs->trans("CreateTicket")).'
'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'
'.img_picto('', 'ticket', 'class="fa-15x"').'
'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'
';
+print ''.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'
'.dol_escape_htmltag($langs->trans("CreateTicket")).'
'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'
'.img_picto('', 'ticket', 'class="fa-15"').'
'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'
';
print '';
print ''.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'
';
if ($action == "view_ticketlist") {
+ print '
";
+}
// End of page
htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix, $object);
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 50885cfc822..de76e2f9904 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -22,10 +22,6 @@
* \brief Public file to show one ticket
*/
-if (!defined('NOCSRFCHECK')) {
- define('NOCSRFCHECK', '1');
-}
-// Do not check anti CSRF attack test
if (!defined('NOREQUIREMENU')) {
define('NOREQUIREMENU', '1');
}
@@ -61,9 +57,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
$langs->loadLangs(array("companies", "other", "ticket"));
// Get parameters
-$track_id = GETPOST('track_id', 'alpha');
-$cancel = GETPOST('cancel', 'alpha');
$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
+$track_id = GETPOST('track_id', 'alpha');
$email = GETPOST('email', 'email');
if (GETPOST('btn_view_ticket')) {
@@ -85,6 +82,8 @@ if (empty($conf->ticket->enabled)) {
*/
if ($cancel) {
+ $backtopage = DOL_URL_ROOT.'/public/ticket/index.php';
+
if (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
@@ -406,6 +405,8 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
print '';
+
print '
'; if ($display_ticket_list) { // Filters @@ -348,25 +354,25 @@ if ($action == "view_ticketlist") { } } $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid=t.fk_user_create"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid=t.fk_user_assign"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id=t.rowid"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople=sp.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code = t.type_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code = t.category_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code = t.severity_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid = t.fk_user_create"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid = t.fk_user_assign"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact = tc.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople = sp.rowid"; if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)"; } $sql .= " WHERE t.entity IN (".getEntity('ticket').")"; $sql .= " AND ((tc.source = 'external'"; $sql .= " AND tc.element='".$db->escape($object->element)."'"; - $sql .= " AND tc.active=1)"; - $sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'"; - $sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'"; - $sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."'))"; + $sql .= " AND tc.active=1"; + $sql .= " AND sp.email='".$db->escape($_SESSION['email_customer'])."')"; // email found into an external contact + $sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'"; // or email of the linked company + $sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."')"; // or email of the requester // Manage filter if (!empty($filter)) { foreach ($filter as $key => $value) { @@ -704,12 +710,18 @@ if ($action == "view_ticketlist") { } '; } + } else { + dol_print_error($db); } } else { print '
';
} else {
- print ''; if ($display_ticket_list) { // Filters @@ -348,25 +354,25 @@ if ($action == "view_ticketlist") { } } $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid=t.fk_user_create"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid=t.fk_user_assign"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id=t.rowid"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople=sp.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code = t.type_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code = t.category_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code = t.severity_code"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid = t.fk_user_create"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid = t.fk_user_assign"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact = tc.rowid"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople = sp.rowid"; if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)"; } $sql .= " WHERE t.entity IN (".getEntity('ticket').")"; $sql .= " AND ((tc.source = 'external'"; $sql .= " AND tc.element='".$db->escape($object->element)."'"; - $sql .= " AND tc.active=1)"; - $sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'"; - $sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'"; - $sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."'))"; + $sql .= " AND tc.active=1"; + $sql .= " AND sp.email='".$db->escape($_SESSION['email_customer'])."')"; // email found into an external contact + $sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'"; // or email of the linked company + $sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."')"; // or email of the requester // Manage filter if (!empty($filter)) { foreach ($filter as $key => $value) { @@ -704,12 +710,18 @@ if ($action == "view_ticketlist") { } '; } + } else { + dol_print_error($db); } } else { print '
Not Allowed
'.$langs->trans('Back').'
';
}
+
+ print ''.$langs->trans('Back').'
'.$langs->trans("TicketPublicMsgViewLogIn").'
'; + print '';
+
+ print '
'; print '
";
+ print "'.$langs->trans("TicketPublicMsgViewLogIn").'
'; print ''; print '
';
@@ -728,13 +740,15 @@ if ($action == "view_ticketlist") {
print '
\n";
-}
-print "'; print ''; + print ' '; + print ''; print "
\n"; print "\n"; print "'; print ''; + print ' '; + print ''; print "
\n"; print "\n"; diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php index ada1ae23a12..395ab219056 100644 --- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php +++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php @@ -18,10 +18,6 @@ /* font-size: ; */ } -.fa-15x { - font-size: 1.5em; -} - div.mainmenu.menu { background-image: none; } diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php index 0e0b144d187..f2f5e247e78 100644 --- a/htdocs/theme/md/main_menu_fa_icons.inc.php +++ b/htdocs/theme/md/main_menu_fa_icons.inc.php @@ -18,10 +18,6 @@ color: var(--colortextbackhmenu); } -.fa-15x { - font-size: 1.5em; -} - div.mainmenu.menu { background-image: none; } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 8715ee4f389..df2b6bc0174 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -316,7 +316,9 @@ class User extends CommonObject * @var stdClass To store personal config */ public $conf; - public $default_values; // To store default values for user + + public $default_values; // To store default values for user. Loaded by loadDefaultValues(). + public $lastsearch_values_tmp; // To store current search criterias for user public $lastsearch_values; // To store last saved search criterias for user @@ -2825,7 +2827,7 @@ class User extends CommonObject $result .= (($option == 'nolink') ? '' : $linkstart); if ($withpictoimg) { $paddafterimage = ''; - if (abs($withpictoimg) == 1) { + if (abs((int) $withpictoimg) == 1) { $paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"'; } // Only picto