From da2f97134596b7f9955f053e8ae4d27dac631a14 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 8 Sep 2017 10:33:00 +0200
Subject: [PATCH 1/4] fix upload images on category

---
 htdocs/categories/class/categorie.class.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index ecf95c5096d..94113799be9 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1525,11 +1525,13 @@ class Categorie extends CommonObject
 	 *  Deplace fichier uploade sous le nom $files dans le repertoire sdir
 	 *
 	 *  @param      string	$sdir       Repertoire destination finale
-	 *  @param      string	$file		Nom du fichier uploade
+	 *  @param      string	$files		Nom du fichier uploade
 	 *	@return		void
 	 */
 	function add_photo($sdir, $file)
 	{
+
+
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dir = $sdir .'/'. get_exdir($this->id,2,0,0,$this,'category') . $this->id ."/";
@@ -1542,15 +1544,18 @@ class Categorie extends CommonObject
 
 		if (file_exists($dir))
 		{
-			$originImage = $dir . $file['name'];
+			for ($i=0;$i<=count($file['name']);$i++) {
 
-			// Cree fichier en taille origine
-			dol_move_uploaded_file($file['tmp_name'], $originImage, 1, 0, 0);
+				$originImage = $dir . $file['name'][$i];
 
-			if (file_exists($originImage))
-			{
-			    // Create thumbs
-				$this->addThumbs($originImage);
+				// Cree fichier en taille origine
+				dol_move_uploaded_file($file['tmp_name'][$i], $originImage, 1, 0, 0);
+
+				if (file_exists($originImage))
+				{
+				    // Create thumbs
+					$this->addThumbs($originImage);
+				}
 			}
 		}
 	}

From 20ed279489cd87f2dd386d8bbb5421e3317e9d75 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 8 Sep 2017 10:34:38 +0200
Subject: [PATCH 2/4] better fix

---
 htdocs/categories/class/categorie.class.php | 26 ++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 94113799be9..23cced4f0e5 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1542,18 +1542,28 @@ class Categorie extends CommonObject
 			dol_mkdir($dir);
 		}
 
-		if (file_exists($dir))
-		{
-			for ($i=0;$i<=count($file['name']);$i++) {
+		if (file_exists($dir)) {
+			if (is_array($file['name']) && count($file['name']) > 0) {
+				for($i = 0; $i <= count($file['name']); $i ++) {
 
-				$originImage = $dir . $file['name'][$i];
+					$originImage = $dir . $file['name'][$i];
+
+					// Cree fichier en taille origine
+					dol_move_uploaded_file($file['tmp_name'][$i], $originImage, 1, 0, 0);
+
+					if (file_exists($originImage)) {
+						// Create thumbs
+						$this->addThumbs($originImage);
+					}
+				}
+			} else {
+				$originImage = $dir . $file['name'];
 
 				// Cree fichier en taille origine
-				dol_move_uploaded_file($file['tmp_name'][$i], $originImage, 1, 0, 0);
+				dol_move_uploaded_file($file['tmp_name'], $originImage, 1, 0, 0);
 
-				if (file_exists($originImage))
-				{
-				    // Create thumbs
+				if (file_exists($originImage)) {
+					// Create thumbs
 					$this->addThumbs($originImage);
 				}
 			}

From 34f08ce082dd5f0c2aff5173ed549d5cd2312856 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 8 Sep 2017 10:36:11 +0200
Subject: [PATCH 3/4] fix travis

---
 htdocs/categories/class/categorie.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 23cced4f0e5..1e494c4a1ff 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1525,7 +1525,7 @@ class Categorie extends CommonObject
 	 *  Deplace fichier uploade sous le nom $files dans le repertoire sdir
 	 *
 	 *  @param      string	$sdir       Repertoire destination finale
-	 *  @param      string	$files		Nom du fichier uploade
+	 *  @param      string	$file		Nom du fichier uploade
 	 *	@return		void
 	 */
 	function add_photo($sdir, $file)

From 1a389b6faf891d4b3ffc51ad87e0b7d1ffcebb11 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 8 Sep 2017 10:36:45 +0200
Subject: [PATCH 4/4] fix upload photo for categ

---
 htdocs/categories/class/categorie.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 1e494c4a1ff..05d9049ff03 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1530,8 +1530,6 @@ class Categorie extends CommonObject
 	 */
 	function add_photo($sdir, $file)
 	{
-
-
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dir = $sdir .'/'. get_exdir($this->id,2,0,0,$this,'category') . $this->id ."/";