From 14004d9f97eb1860491998d1b84d7639a9751dad Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 15 Sep 2011 08:22:10 +0000
Subject: [PATCH] // fix ajax file manager error with undefined employee

---
 admin-dev/ajaxfilemanager/_ajax_load_folders.php   |  1 +
 admin-dev/ajaxfilemanager/ajax_create_folder.php   |  1 +
 admin-dev/ajaxfilemanager/ajax_delete_file.php     |  1 +
 admin-dev/ajaxfilemanager/ajax_download.php        |  1 +
 admin-dev/ajaxfilemanager/ajax_editor_reset.php    |  1 +
 admin-dev/ajaxfilemanager/ajax_file_copy.php       |  1 +
 admin-dev/ajaxfilemanager/ajax_file_cut.php        |  1 +
 admin-dev/ajaxfilemanager/ajax_file_paste.php      | 13 +++++++------
 admin-dev/ajaxfilemanager/ajax_file_upload.php     |  2 +-
 admin-dev/ajaxfilemanager/ajax_image_editor.php    |  1 +
 admin-dev/ajaxfilemanager/ajax_image_save.php      |  1 +
 admin-dev/ajaxfilemanager/ajax_image_thumbnail.php |  1 +
 admin-dev/ajaxfilemanager/ajax_image_undo.php      |  1 +
 admin-dev/ajaxfilemanager/ajax_login.php           |  1 +
 admin-dev/ajaxfilemanager/ajax_preview.php         |  1 +
 admin-dev/ajaxfilemanager/ajax_save_as_form.php    |  1 +
 admin-dev/ajaxfilemanager/ajax_save_name.php       |  1 +
 admin-dev/ajaxfilemanager/ajax_save_text.php       |  1 +
 admin-dev/ajaxfilemanager/ajax_text_editor.php     |  1 +
 admin-dev/ajaxfilemanager/ajaxfilemanager.php      |  1 +
 admin-dev/init.php                                 |  2 +-
 21 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/admin-dev/ajaxfilemanager/_ajax_load_folders.php b/admin-dev/ajaxfilemanager/_ajax_load_folders.php
index 6017ac47f..ac6986890 100755
--- a/admin-dev/ajaxfilemanager/_ajax_load_folders.php
+++ b/admin-dev/ajaxfilemanager/_ajax_load_folders.php
@@ -1,5 +1,6 @@
 <?php
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 ?>
diff --git a/admin-dev/ajaxfilemanager/ajax_create_folder.php b/admin-dev/ajaxfilemanager/ajax_create_folder.php
index ad3d5eea1..c164d188e 100755
--- a/admin-dev/ajaxfilemanager/ajax_create_folder.php
+++ b/admin-dev/ajaxfilemanager/ajax_create_folder.php
@@ -6,6 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
diff --git a/admin-dev/ajaxfilemanager/ajax_delete_file.php b/admin-dev/ajaxfilemanager/ajax_delete_file.php
index be52c2c99..575d13186 100755
--- a/admin-dev/ajaxfilemanager/ajax_delete_file.php
+++ b/admin-dev/ajaxfilemanager/ajax_delete_file.php
@@ -6,6 +6,7 @@
 	 * @since 22/April/2007
 	 *
 	 */
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
diff --git a/admin-dev/ajaxfilemanager/ajax_download.php b/admin-dev/ajaxfilemanager/ajax_download.php
index ec054a846..b7ba3bde8 100755
--- a/admin-dev/ajaxfilemanager/ajax_download.php
+++ b/admin-dev/ajaxfilemanager/ajax_download.php
@@ -6,6 +6,7 @@
 	 * @since 22/April/2007
 	 *
 	 */
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
diff --git a/admin-dev/ajaxfilemanager/ajax_editor_reset.php b/admin-dev/ajaxfilemanager/ajax_editor_reset.php
index ba210e6a9..e989e9bd2 100755
--- a/admin-dev/ajaxfilemanager/ajax_editor_reset.php
+++ b/admin-dev/ajaxfilemanager/ajax_editor_reset.php
@@ -6,6 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
diff --git a/admin-dev/ajaxfilemanager/ajax_file_copy.php b/admin-dev/ajaxfilemanager/ajax_file_copy.php
index 99b19ab64..eb4b59fc9 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_copy.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_copy.php
@@ -6,6 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
diff --git a/admin-dev/ajaxfilemanager/ajax_file_cut.php b/admin-dev/ajaxfilemanager/ajax_file_cut.php
index 07a7f5574..d9db2e949 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_cut.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_cut.php
@@ -6,6 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
diff --git a/admin-dev/ajaxfilemanager/ajax_file_paste.php b/admin-dev/ajaxfilemanager/ajax_file_paste.php
index 787626267..229caebc5 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_paste.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_paste.php
@@ -1,10 +1,11 @@
 <?
-		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");		
-		require_once('../../config/config.inc.php');
-		require_once('../init.php');
-		$error = '';
-		$fileMoved = array();
-		$unmovedDocDueToSamePath = array();
+	include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");		
+	define('PS_ADMIN_DIR', getcwd());
+	require_once('../../config/config.inc.php');
+	require_once('../init.php');
+	$error = '';
+	$fileMoved = array();
+	$unmovedDocDueToSamePath = array();
 	if(CONFIG_SYS_VIEW_ONLY || (!CONFIG_OPTIONS_CUT && !CONFIG_OPTIONS_COPY))
 	{
 		$error = SYS_DISABLED;
diff --git a/admin-dev/ajaxfilemanager/ajax_file_upload.php b/admin-dev/ajaxfilemanager/ajax_file_upload.php
index ebe128482..6fbcf0a8b 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_upload.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_upload.php
@@ -6,7 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */	
-	 
+	define('PS_ADMIN_DIR', getcwd());	 
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	 
diff --git a/admin-dev/ajaxfilemanager/ajax_image_editor.php b/admin-dev/ajaxfilemanager/ajax_image_editor.php
index b959bbdc2..81c1cacf7 100755
--- a/admin-dev/ajaxfilemanager/ajax_image_editor.php
+++ b/admin-dev/ajaxfilemanager/ajax_image_editor.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**
diff --git a/admin-dev/ajaxfilemanager/ajax_image_save.php b/admin-dev/ajaxfilemanager/ajax_image_save.php
index 9c4de2fac..9dbd67086 100755
--- a/admin-dev/ajaxfilemanager/ajax_image_save.php
+++ b/admin-dev/ajaxfilemanager/ajax_image_save.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_image_thumbnail.php b/admin-dev/ajaxfilemanager/ajax_image_thumbnail.php
index ac32a2314..9879fa14e 100755
--- a/admin-dev/ajaxfilemanager/ajax_image_thumbnail.php
+++ b/admin-dev/ajaxfilemanager/ajax_image_thumbnail.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_image_undo.php b/admin-dev/ajaxfilemanager/ajax_image_undo.php
index ae813a5f8..02b50241f 100755
--- a/admin-dev/ajaxfilemanager/ajax_image_undo.php
+++ b/admin-dev/ajaxfilemanager/ajax_image_undo.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_login.php b/admin-dev/ajaxfilemanager/ajax_login.php
index 74a09ee84..694aad6f0 100755
--- a/admin-dev/ajaxfilemanager/ajax_login.php
+++ b/admin-dev/ajaxfilemanager/ajax_login.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_preview.php b/admin-dev/ajaxfilemanager/ajax_preview.php
index e233a214f..5423d22c6 100755
--- a/admin-dev/ajaxfilemanager/ajax_preview.php
+++ b/admin-dev/ajaxfilemanager/ajax_preview.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_save_as_form.php b/admin-dev/ajaxfilemanager/ajax_save_as_form.php
index 8ad17406b..7013d5bc0 100755
--- a/admin-dev/ajaxfilemanager/ajax_save_as_form.php
+++ b/admin-dev/ajaxfilemanager/ajax_save_as_form.php
@@ -1,4 +1,5 @@
 <?php 
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
diff --git a/admin-dev/ajaxfilemanager/ajax_save_name.php b/admin-dev/ajaxfilemanager/ajax_save_name.php
index c0435bad9..7f88412b1 100755
--- a/admin-dev/ajaxfilemanager/ajax_save_name.php
+++ b/admin-dev/ajaxfilemanager/ajax_save_name.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_save_text.php b/admin-dev/ajaxfilemanager/ajax_save_text.php
index 1d7724c4e..252d4c743 100755
--- a/admin-dev/ajaxfilemanager/ajax_save_text.php
+++ b/admin-dev/ajaxfilemanager/ajax_save_text.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/ajaxfilemanager/ajax_text_editor.php b/admin-dev/ajaxfilemanager/ajax_text_editor.php
index 16b91045b..18fbd91c0 100755
--- a/admin-dev/ajaxfilemanager/ajax_text_editor.php
+++ b/admin-dev/ajaxfilemanager/ajax_text_editor.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**
diff --git a/admin-dev/ajaxfilemanager/ajaxfilemanager.php b/admin-dev/ajaxfilemanager/ajaxfilemanager.php
index d7ec72663..5fc369af0 100755
--- a/admin-dev/ajaxfilemanager/ajaxfilemanager.php
+++ b/admin-dev/ajaxfilemanager/ajaxfilemanager.php
@@ -1,4 +1,5 @@
 <?php
+	define('PS_ADMIN_DIR', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
diff --git a/admin-dev/init.php b/admin-dev/init.php
index c36b09571..f795e187d 100644
--- a/admin-dev/init.php
+++ b/admin-dev/init.php
@@ -32,7 +32,7 @@ $context = Context::getContext();
 if (isset($_GET['logout']))
 	$context->employee->logout();
 
-if (!$context->employee->isLoggedBack())
+if (!isset($context->employee) || !$context->employee->isLoggedBack())
 	Tools::redirectAdmin('login.php?redirect='.$_SERVER['REQUEST_URI']);