' // TODO Use a better way to define Sent dir.
- if (count($mailfromid)==0) $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
- else
- {
- $mbid = $mailfromid[1];
-
- // IMAP Postbox
- $mailboxconfig = new IMAP($db);
- $mailboxconfig->fetch($mbid);
- if ($mailboxconfig->mailbox_imap_host) $ref=$mailboxconfig->get_ref();
-
- $mailboxconfig->folder_id=$mailboxconfig->mailbox_imap_outbox;
- $mailboxconfig->userfolder_fetch();
-
- if ($mailboxconfig->mailbox_save_sent_mails == 1)
- {
-
- $folder=str_replace($ref, '', $mailboxconfig->folder_cache_key);
- if (!$folder) $folder = "Sent"; // Default Sent folder
-
- $mailboxconfig->mbox = imap_open($mailboxconfig->get_connector_url().$folder, $mailboxconfig->mailbox_imap_login, $mailboxconfig->mailbox_imap_password);
- if (false === $mailboxconfig->mbox)
- {
- $info = false;
- $err = $langs->trans('Error3_Imap_Connection_Error');
- setEventMessages($err,$mailboxconfig->element, null, 'errors');
- }
- else
- {
- $mailboxconfig->mailboxid=$_POST['frommail'];
- $mailboxconfig->foldername=$folder;
- $from = $mailfromid[0] . $mailfromid[2];
- $imap=1;
- }
-
- }
- }
- }
- */
-
// Make substitution in email content
$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
$substitutionarray['__EMAIL__'] = $sendto;
@@ -398,38 +343,38 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$subject = make_substitutions($subject, $substitutionarray);
$message = make_substitutions($message, $substitutionarray);
- if (method_exists($object, 'makeSubstitution'))
- {
+ if (method_exists($object, 'makeSubstitution')) {
$subject = $object->makeSubstitution($subject);
$message = $object->makeSubstitution($message);
}
// Send mail (substitutionarray must be done just before this)
- if (empty($sendcontext)) $sendcontext = 'standard';
+ if (empty($sendcontext)) {
+ $sendcontext = 'standard';
+ }
$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
- if ($mailfile->error)
- {
+ if ($mailfile->error) {
setEventMessages($mailfile->error, $mailfile->errors, 'errors');
$action = 'presend';
} else {
$result = $mailfile->sendfile();
- if ($result)
- {
+ if ($result) {
// Initialisation of datas of object to call trigger
- if (is_object($object))
- {
- if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+ if (is_object($object)) {
+ if (empty($actiontypecode)) {
+ $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+ }
$object->socid = $sendtosocid; // To link to a company
$object->sendtoid = $sendtoid; // To link to contact-addresses. This is an array.
$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
$object->actionmsg = $actionmsg; // Long text (@todo Replace this with $message, we already have details of email in dedicated properties)
- $object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
+ $object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
$object->trackid = $trackid;
- $object->fk_element = $object->id;
- $object->elementtype = $object->element;
+ $object->fk_element = $object->id;
+ $object->elementtype = $object->element;
if (is_array($attachedfiles) && count($attachedfiles) > 0) {
$object->attachedfiles = $attachedfiles;
}
@@ -447,11 +392,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$object->email_msgid = $mailfile->msgid;
// Call of triggers (you should have set $triggersendname to execute trigger. $trigger_name is deprecated)
- if (!empty($triggersendname) || !empty($trigger_name))
- {
+ if (!empty($triggersendname) || !empty($trigger_name)) {
// Call trigger
$result = $object->call_trigger(empty($triggersendname) ? $trigger_name : $triggersendname, $user);
- if ($result < 0) $error++;
+ if ($result < 0) {
+ $error++;
+ }
// End call triggers
if ($error) {
@@ -466,10 +412,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
setEventMessages($mesg, null, 'mesgs');
- $moreparam = '';
- if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
- header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
- exit;
+ $moreparam = '';
+ if (isset($paramname2) || isset($paramval2)) {
+ $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
+ }
+ header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
+ exit;
} else {
$langs->load("other");
$mesg = '';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7be97293938..20721b8ea05 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6668,8 +6668,7 @@ class Form
});
';
- if ($acceptdelayedhtml)
- {
+ if ($acceptdelayedhtml) {
$delayedhtmlcontent .= $outdelayed;
} else {
$out .= $outdelayed;
@@ -6707,24 +6706,20 @@ class Form
}
// Add code for jquery to use multiselect
- if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
- {
+ if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
$out .= "\n".'