diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index dba4bf1bb91..7f3bec211f9 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -434,21 +434,21 @@ print ''; // @todo Use module notification instead... -// Email de réception des notifications -print ''.$langs->trans("TicketEmailNotificationTo").''; +// Email d'envoi des notifications +print ''.$langs->trans("TicketEmailNotificationFrom").''; print ''; -print ''; +print ''; print ''; -print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help'); +print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help'); print ''; print ''; -// Email d'envoi des notifications -print ''.$langs->trans("TicketEmailNotificationFrom").''; +// Email de réception des notifications +print ''.$langs->trans("TicketEmailNotificationTo").''; print ''; -print ''; +print ''; print ''; -print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help'); +print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help'); print ''; print ''; diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php index 0601ecf5b1e..def832bae14 100644 --- a/htdocs/public/ticket/create_ticket.php +++ b/htdocs/public/ticket/create_ticket.php @@ -218,6 +218,8 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '>'; $replyto = $from; + $sendtocc = ''; + $deliveryreceipt = 0; $message = dol_nl2br($message); @@ -359,14 +361,19 @@ if ($action != "infos_success") { $formticket->param = array('returnurl' => $_SERVER['PHP_SELF'].($conf->entity > 1 ? '?entity='.$conf->entity : '')); - if (empty($defaultref)) { - $defaultref = ''; - } - print load_fiche_titre($langs->trans('NewTicket'), '', '', 0, 0, 'marginleftonly'); - print '
' . $langs->trans('TicketPublicInfoCreateTicket') . '
'; - $formticket->showForm(); + if (empty($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)) { + $langs->load("errors"); + print '
'; + print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'
'; + print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket")); + print '
'; + } + else { + print '
' . $langs->trans('TicketPublicInfoCreateTicket') . '
'; + $formticket->showForm(); + } } print '
'; diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php index 906d50602a1..15eadf8ffb8 100644 --- a/htdocs/ticket/css/styles.css.php +++ b/htdocs/ticket/css/styles.css.php @@ -144,11 +144,7 @@ div.ticketform .blue:hover { border:solid 1px rgba(168,168,168,.4); border-top:solid 1px f8f8f8; background-color: #f8f8f8; - background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); } + #form_create_ticket input.text, #form_create_ticket textarea { width:450px;}