From 77dd07c846e335869800b6e1e0f01ed6c7086e3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Mar 2015 13:12:33 +0100
Subject: [PATCH] Fix thumbs generation
---
htdocs/categories/class/categorie.class.php | 16 +++++++++-----
htdocs/product/class/product.class.php | 24 +++++++++++++--------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f5828ecdea7..b9876bb8382 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1330,17 +1330,23 @@ class Categorie extends CommonObject
* Build thumb
*
* @param string $file Chemin du fichier d'origine
- * @param int $maxWidth Largeur maximum que dois faire la miniature (160 par defaut)
- * @param int $maxHeight Hauteur maximum que dois faire la miniature (120 par defaut)
* @return void
*/
- function add_thumb($file, $maxWidth = 160, $maxHeight = 120)
+ function add_thumb($file)
{
- require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+ global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
+
+ require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
if (file_exists($file))
{
- vignette($file,$maxWidth,$maxHeight);
+ // Create small thumbs for company (Ratio is near 16/9)
+ // Used on logon for example
+ $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+ // Create mini thumbs for company (Ratio is near 16/9)
+ // Used on menu or for setup page for example
+ $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality);
}
}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e26f9102544..653925701ad 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3100,11 +3100,9 @@ class Product extends CommonObject
*
* @param string $sdir Target directory
* @param string $file Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
- * @param int $maxWidth Largeur maximum que dois faire la miniature (160 by defaut)
- * @param int $maxHeight Hauteur maximum que dois faire la miniature (120 by defaut)
* @return int <0 if KO, >0 if OK
*/
- function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
+ function add_photo($sdir, $file)
{
global $conf;
@@ -3114,10 +3112,12 @@ class Product extends CommonObject
$dir = $sdir;
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2) . $this->id ."/photos";
+ else $dir .= '/'.dol_sanitizeFileName($this->ref);
dol_mkdir($dir);
$dir_osencoded=$dir;
+
if (is_dir($dir_osencoded))
{
$originImage = $dir . '/' . $file['name'];
@@ -3128,7 +3128,7 @@ class Product extends CommonObject
if (file_exists(dol_osencode($originImage)))
{
// Cree fichier en taille vignette
- $this->add_thumb($originImage,$maxWidth,$maxHeight);
+ $this->add_thumb($originImage);
}
}
@@ -3140,18 +3140,24 @@ class Product extends CommonObject
* Build thumb
*
* @param string $file Chemin du fichier d'origine
- * @param int $maxWidth Largeur maximum que dois faire la miniature (160 par defaut)
- * @param int $maxHeight Hauteur maximum que dois faire la miniature (120 par defaut)
* @return void
*/
- function add_thumb($file, $maxWidth = 160, $maxHeight = 120)
+ function add_thumb($file)
{
- require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+ global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
+
+ require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
$file_osencoded=dol_osencode($file);
if (file_exists($file_osencoded))
{
- vignette($file,$maxWidth,$maxHeight);
+ // Create small thumbs for company (Ratio is near 16/9)
+ // Used on logon for example
+ $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+ // Create mini thumbs for company (Ratio is near 16/9)
+ // Used on menu or for setup page for example
+ $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality);
}
}
--
GitLab