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

[-] PDF : Bug Fixed #PSCFV-2945 - Basic Authentication + TCPDF : Beware if you need to modify the getLogo think to symlinks, vhosts etc ...

Browse Source
This commit is contained in:
fBrignoli
2012-06-27 09:44:01 +00:00
parent 17ee57faf6
commit 5455fc00eb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplate.php
+7 -4
View File
@@ -48,7 +48,7 @@ abstract class HTMLTemplateCore
$shop_name = $this->shop->name; $shop_name = $this->shop->name;
$path_logo = $this->getLogo(); $path_logo = $this->getLogo();
list($width, $height) = getimagesize(_PS_BASE_URL_.$path_logo); list($width, $height) = getimagesize(_PS_ROOT_DIR_.'/'.str_replace(Context::getContext()->shop->physical_uri, '', $path_logo));
$this->smarty->assign(array( $this->smarty->assign(array(
'logo_path' => $path_logo, 'logo_path' => $path_logo,
@@ -106,9 +106,12 @@ abstract class HTMLTemplateCore
*/ */
protected function getLogo() protected function getLogo()
{ {
$logo = ''; $logo = '';
// TCPDF always uses the complete physical path, beware of PrestaShop virtual URI or complete path using symlinks
$physical_uri = Context::getContext()->shop->physical_uri.'img/'; // TCPDF check if the document root is present in the image path, if not it will add it.
// In our case, _PS_ROOT_DIR_ could be different from document_root if we use symlinks, that's why
// we don't use _PS_ROOT_DIR_ and we let TCPDF add the document root.
$physical_uri = Context::getContext()->shop->physical_uri.'img/';
if (Configuration::get('PS_LOGO_INVOICE') != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE'))) if (Configuration::get('PS_LOGO_INVOICE') != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE')))
$logo = $physical_uri.Configuration::get('PS_LOGO_INVOICE'); $logo = $physical_uri.Configuration::get('PS_LOGO_INVOICE');