lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: change for use url of image

Browse Source
This commit is contained in:
Regis Houssin 2013-07-03 16:06:42 +02:00
parent 64a04ef150
commit 7e70d935b6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/images.lib.php
View File

@ -65,16 +65,21 @@ function image_format_supported($file)
* Return size of image file on disk (Supported extensions are gif, jpg, png and bmp) * Return size of image file on disk (Supported extensions are gif, jpg, png and bmp)
* *
* @param string $file Full path name of file * @param string $file Full path name of file
* @param bool $url Image with url (true or false)
* @return array array('width'=>width, 'height'=>height) * @return array array('width'=>width, 'height'=>height)
*/ */
function dol_getImageSize($file) function dol_getImageSize($file, $url = false)
{ {
$ret=array(); $ret=array();
if (image_format_supported($file) < 0) return $ret; if (image_format_supported($file) < 0) return $ret;
$fichier = realpath($file); // Chemin canonique absolu de l'image $fichier = $file;
$dir = dirname($file); // Chemin du dossier contenant l'image if (!$url)
{
$fichier = realpath($file); // Chemin canonique absolu de l'image
$dir = dirname($file); // Chemin du dossier contenant l'image
}
$infoImg = getimagesize($fichier); // Recuperation des infos de l'image $infoImg = getimagesize($fichier); // Recuperation des infos de l'image
$ret['width']=$infoImg[0]; // Largeur de l'image $ret['width']=$infoImg[0]; // Largeur de l'image

5
htdocs/core/lib/pdf.lib.php
View File

@ -227,13 +227,14 @@ function pdf_getPDFFontSize($outputlangs)
* Return height to use for Logo onot PDF * Return height to use for Logo onot PDF
* *
* @param string $logo Full path to logo file to use * @param string $logo Full path to logo file to use
* @param bool $url Image with url (true or false)
* @return number * @return number
*/ */
function pdf_getHeightForLogo($logo) function pdf_getHeightForLogo($logo, $url = false)
{ {
$height=22; $maxwidth=130; $height=22; $maxwidth=130;
include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
$tmp=dol_getImageSize($logo); $tmp=dol_getImageSize($logo, $url);
if ($tmp['height']) if ($tmp['height'])
{ {
$width=round($height*$tmp['width']/$tmp['height']); $width=round($height*$tmp['width']/$tmp['height']);