dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

This commit is contained in:
markjcrane 2016-05-04 22:47:13 -06:00
parent 164fd03c98 0b3eaa4d30
commit de8794dca9
3 changed files with 1707 additions and 1695 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
secure/v_mailto.php
View File

@ -79,6 +79,10 @@
//includes
require('resources/pop3/mime_parser.php');
require('resources/pop3/rfc822_addresses.php');
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/emails/email_translation.php")) {
require_once($_SERVER["PROJECT_ROOT"]."/app/emails/email_translation.php");
}
//parse the email message
$mime=new mime_parser_class;
@ -282,6 +286,13 @@
//add an attachment
$mail->AddStringAttachment($parts_array["Body"],$file,$encoding,$mime_type);
if (function_exists(get_transcription)) {
$attachments_array=$mail->GetAttachments();
$transcription=get_transcription($attachments_array[0]);
echo "Transcription: " . $transcription;
} else {
$transcription = '';
}
}
}
}
@ -291,13 +302,13 @@
//echo "body_plain = $body_plain\n";
if ((substr($body, 0, 5) == "<html") || (substr($body, 0, 9) == "<!doctype")) {
$mail->ContentType = "text/html";
$mail->Body = $body;
$mail->AltBody = $body_plain;
$mail->Body = $body."<br><br>".nl2br($transcription);
$mail->AltBody = $body_plain."\n\n$transcription";
}
else {
// $mail->Body = ($body != '') ? $body : $body_plain;
$mail->Body = $body_plain;
$mail->AltBody = $body_plain;
$mail->Body = $body_plain."\n\n$transcription";
$mail->AltBody = $body_plain."\n\n$transcription";
}
//send the email

1667
themes/default/css.php Normal file
View File

File diff suppressed because it is too large Load Diff

1716
themes/default/template.php
View File

File diff suppressed because it is too large Load Diff