dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
vAugagneur
2012-12-18 16:00:20 +01:00
parent 9b0dbae730 d431802e7e
commit 66f58dfbd9
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ImageManager.php
+29
View File
@@ -410,4 +410,33 @@ class ImageManagerCore
@chmod($filename, 0664);
return $success;
}
/**
* Return the mime type by the file extension
*
* @param string $file_name
* @return string
*/
public static function getMimeTypeByExtension($file_name)
{
$types = array(
'image/gif' => array('gif'),
'image/jpeg' => array('jpg', 'jpeg'),
'image/png' => array('jpg', 'png')
);
$extension = substr($file_name, strrpos($file_name, '.') + 1);
$mime_type = null;
foreach ($types as $mime => $exts)
if (in_array($extension, $exts))
{
$mime_type = $mime;
break;
}
if ($mime_type === null)
$mime_type = 'image/jpeg';
return $mime_type;
}
}
classes/Mail.php
+9 -3
View File
@@ -233,12 +233,18 @@ class MailCore
$message->headers->setEncoding('Q');
if (Configuration::get('PS_LOGO_MAIL') !== false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL')))
$template_vars['{shop_logo}'] = $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL'))));
$logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL');
else
if (file_exists(_PS_IMG_DIR_.'logo.jpg'))
$template_vars['{shop_logo}'] = $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.Configuration::get('PS_LOGO'))));
{
if (file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO')))
$logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO');
else
$template_vars['{shop_logo}'] = '';
}
/* don't attach the logo as */
if (isset($logo))
$template_vars['{shop_logo}'] = $message->attach(new Swift_Message_EmbeddedFile(new Swift_File($logo), null, ImageManager::getMimeTypeByExtension($logo)));
$template_vars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME'));
$template_vars['{shop_url}'] = Tools::getShopDomain(true, true).__PS_BASE_URI__.'index.php';