From ce9f262feb65880791add472e643aa44da04b4b0 Mon Sep 17 00:00:00 2001
From: Gregory Roussac <gregory.roussac@prestashop.com>
Date: Sat, 15 Jun 2013 01:55:02 +0200
Subject: [PATCH] [-] BO : Upload image name with trailing slash in name

---
 admin-dev/ajaxfilemanager/ajax_file_upload.php      | 4 ++--
 admin-dev/ajaxfilemanager/ajax_get_file_listing.php | 4 ++--
 admin-dev/ajaxfilemanager/inc/class.file.php        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin-dev/ajaxfilemanager/ajax_file_upload.php b/admin-dev/ajaxfilemanager/ajax_file_upload.php
index 309490e06..b21a39c13 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_upload.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_upload.php
@@ -60,7 +60,7 @@
 									$tem[$k] = $v;
 								}
 								
-								$tem['path'] = backslashToSlash($path);		
+								$tem['path'] = addslashes(backslashToSlash($path));
 								$tem['type'] = "file";
 								$tem['size'] = transformFileSize($tem['size']);
 								$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
@@ -73,7 +73,7 @@
 										$info .= sprintf(", %s:'%s'", $k, $v);									
 								}
 
-								$info .= sprintf(", url:'%s'",  getFileUrl($path));
+								$info .= sprintf(", url:'%s'",  addslashes(getFileUrl($path)));
 								$info .= sprintf(", tipedit:'%s'",  TIP_DOC_RENAME);		
 
 																				
diff --git a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
index 133486637..c72110344 100755
--- a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
+++ b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
@@ -99,9 +99,9 @@
 				{
 					$v = transformFileSize($v);
 				}
-				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
+				echo (($j++ > 1)?",":'') . "'" . addslashes($k) . "':'" . addslashes($v) . "'";
 			}
-			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
+			echo (($j++ > 1)?",":'') . "'url':'" . addslashes(getFileUrl($file['path'])) . "'";
 			echo "}\n";				
 		}
 		echo  "};</script>\n";
diff --git a/admin-dev/ajaxfilemanager/inc/class.file.php b/admin-dev/ajaxfilemanager/inc/class.file.php
index 85512eb02..d35ff7a33 100755
--- a/admin-dev/ajaxfilemanager/inc/class.file.php
+++ b/admin-dev/ajaxfilemanager/inc/class.file.php
@@ -33,15 +33,15 @@
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];
-					$this->fileInfo['path'] = $path;
-					$this->fileInfo['name'] = basename($path);	
+					$this->fileInfo['path'] = addslashes($path);
+					$this->fileInfo['name'] = addslashes(basename($path));
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();
 				}elseif(is_dir($this->filePath))
 				{
 					$this->fileStat = @stat($path);
-					$this->fileInfo['name'] = basename($path);
-					$this->fileInfo['path'] = $path;
+					$this->fileInfo['name'] = addslashes(basename($path));
+					$this->fileInfo['path'] = addslashes($path);
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];