Update dependencies

This commit is contained in:
Frédéric Guillot
2014-09-09 07:21:10 +02:00
parent 0d4b6525dd
commit 54a77cd585
15 changed files with 573 additions and 153 deletions

View File

@@ -14,18 +14,8 @@ $preferences->setCharset('utf-8');
// Without these lines the default caching mechanism is "array" but this uses a lot of memory.
// If possible, use a disk cache to enable attaching large attachments etc.
// You can override the default temporary directory by setting the TMPDIR environment variable.
// The @ operator in front of is_writable calls is to avoid PHP warnings
// when using open_basedir
$tmp = getenv('TMPDIR');
if ($tmp && @is_writable($tmp)) {
$preferences
->setTempDir($tmp)
->setCacheType('disk');
} elseif (function_exists('sys_get_temp_dir') && @is_writable(sys_get_temp_dir())) {
$preferences
->setTempDir(sys_get_temp_dir())
->setCacheType('disk');
if (@is_writable($tmpDir = sys_get_temp_dir())) {
$preferences->setTempDir($tmpDir)->setCacheType('disk');
}
// this should only be done when Swiftmailer won't use the native QP content encoder

View File

@@ -35,13 +35,10 @@ function generateUpToDateMimeArray()
'php3' => 'application/x-php',
'php4' => 'application/x-php',
'php5' => 'application/x-php',
'pdf' => 'application/pdf',
'zip' => 'application/zip',
'gif' => 'image/gif',
'jpg' => 'image/jpeg',
'png' => 'image/png',
'css' => 'text/css',
'html' => 'text/html',
'js' => 'text/javascript',
'txt' => 'text/plain',
'xml' => 'text/xml',
@@ -58,7 +55,6 @@ function generateUpToDateMimeArray()
'aps' => 'application/postscript',
'exe' => 'application/x-ms-dos-executable',
'flv' => 'video/x-flv',
'gif' => 'image/gif',
'gz' => 'application/x-gzip',
'hqx' => 'application/stuffit',
'htm' => 'text/html',
@@ -82,7 +78,6 @@ function generateUpToDateMimeArray()
'ods' => 'vnd.oasis.opendocument.spreadsheet',
'ogg' => 'audio/ogg',
'pdf' => 'application/pdf',
'png' => 'image/png',
'ppt' => 'application/vnd.ms-powerpoint',
'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'ps' => 'application/postscript',
@@ -94,15 +89,13 @@ function generateUpToDateMimeArray()
'tif' => 'image/tiff',
'tiff' => 'image/tiff',
'ttf' => 'application/x-font-truetype',
'txt' => 'text/plain',
'vcf' => 'text/x-vcard',
'wav' => 'audio/wav',
'wma' => 'audio/x-ms-wma',
'wmv' => 'audio/x-ms-wmv',
'xls' => 'application/excel',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'xml' => 'application/xml',
'zip' => 'application/zip'
'xml' => 'application/xml'
);
// wrap array for generating file