dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix ajax file manager error with undefined employee

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8602 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean committed 2011-09-15 08:22:10 +00:00
1 parent 224b55c3c2
commit 70a130854c
21 files changed
+27 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/ajaxfilemanager/_ajax_load_folders.php
+1
View File
@@ -1,5 +1,6 @@
<?php <?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.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('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
?> ?>
admin-dev/ajaxfilemanager/ajax_create_folder.php
+1
View File
@@ -6,6 +6,7 @@
* @since 22/May/2007 * @since 22/May/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_delete_file.php
+1
View File
@@ -6,6 +6,7 @@
* @since 22/April/2007 * @since 22/April/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_download.php
+1
View File
@@ -6,6 +6,7 @@
* @since 22/April/2007 * @since 22/April/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_editor_reset.php
+1
View File
@@ -6,6 +6,7 @@
* @since 22/May/2007 * @since 22/May/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_file_copy.php
+1
View File
@@ -6,6 +6,7 @@
* @since 22/May/2007 * @since 22/May/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_file_cut.php
+1
View File
@@ -6,6 +6,7 @@
* @since 22/May/2007 * @since 22/May/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_file_paste.php
+7 -6
View File
@@ -1,10 +1,11 @@
<? <?
include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
require_once('../../config/config.inc.php'); define('PS_ADMIN_DIR', getcwd());
require_once('../init.php'); require_once('../../config/config.inc.php');
$error = ''; require_once('../init.php');
$fileMoved = array(); $error = '';
$unmovedDocDueToSamePath = array(); $fileMoved = array();
$unmovedDocDueToSamePath = array();
if(CONFIG_SYS_VIEW_ONLY || (!CONFIG_OPTIONS_CUT && !CONFIG_OPTIONS_COPY)) if(CONFIG_SYS_VIEW_ONLY || (!CONFIG_OPTIONS_CUT && !CONFIG_OPTIONS_COPY))
{ {
$error = SYS_DISABLED; $error = SYS_DISABLED;
admin-dev/ajaxfilemanager/ajax_file_upload.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @since 22/May/2007 * @since 22/May/2007
* *
*/ */
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
admin-dev/ajaxfilemanager/ajax_image_editor.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_image_save.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_image_thumbnail.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_image_undo.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_login.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_preview.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_save_as_form.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
admin-dev/ajaxfilemanager/ajax_save_name.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_save_text.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajax_text_editor.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/ajaxfilemanager/ajaxfilemanager.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
define('PS_ADMIN_DIR', getcwd());
require_once('../../config/config.inc.php'); require_once('../../config/config.inc.php');
require_once('../init.php'); require_once('../init.php');
/** /**
admin-dev/init.php
+1 -1
View File
@@ -32,7 +32,7 @@ $context = Context::getContext();
if (isset($_GET['logout'])) if (isset($_GET['logout']))
$context->employee->logout(); $context->employee->logout();
if (!$context->employee->isLoggedBack()) if (!isset($context->employee) || !$context->employee->isLoggedBack())
Tools::redirectAdmin('login.php?redirect='.$_SERVER['REQUEST_URI']); Tools::redirectAdmin('login.php?redirect='.$_SERVER['REQUEST_URI']);