diff --git a/admin-dev/ajaxfilemanager/_ajax_load_folders.php b/admin-dev/ajaxfilemanager/_ajax_load_folders.php
index 9ef34f8e8..e0c27690e 100755
--- a/admin-dev/ajaxfilemanager/_ajax_load_folders.php
+++ b/admin-dev/ajaxfilemanager/_ajax_load_folders.php
@@ -1,6 +1,7 @@
diff --git a/admin-dev/ajaxfilemanager/ajax_create_folder.php b/admin-dev/ajaxfilemanager/ajax_create_folder.php
index 48e3497dc..78bffadf4 100755
--- a/admin-dev/ajaxfilemanager/ajax_create_folder.php
+++ b/admin-dev/ajaxfilemanager/ajax_create_folder.php
@@ -6,6 +6,8 @@
* @since 22/May/2007
*
*/
+ if (!defined('_PS_ADMIN_DIR_'))
+ 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 21f244df9..22d2b48f1 100755
--- a/admin-dev/ajaxfilemanager/ajax_delete_file.php
+++ b/admin-dev/ajaxfilemanager/ajax_delete_file.php
@@ -6,7 +6,8 @@
* @since 22/April/2007
*
*/
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ 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 e1defee7f..739625e18 100755
--- a/admin-dev/ajaxfilemanager/ajax_download.php
+++ b/admin-dev/ajaxfilemanager/ajax_download.php
@@ -6,7 +6,8 @@
* @since 22/April/2007
*
*/
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ 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 b6e8c61b0..11a035c29 100755
--- a/admin-dev/ajaxfilemanager/ajax_editor_reset.php
+++ b/admin-dev/ajaxfilemanager/ajax_editor_reset.php
@@ -6,7 +6,8 @@
* @since 22/May/2007
*
*/
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ 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 c190de625..ed38feed2 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_copy.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_copy.php
@@ -6,7 +6,8 @@
* @since 22/May/2007
*
*/
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ 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 ad0036abb..024150a81 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_cut.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_cut.php
@@ -6,7 +6,8 @@
* @since 22/May/2007
*
*/
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ 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 a55557f0c..0ffff8102 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_paste.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_paste.php
@@ -1,6 +1,7 @@
include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ define('_PS_ADMIN_DIR_', getcwd());
require_once('../../config/config.inc.php');
require_once('../init.php');
$error = '';
diff --git a/admin-dev/ajaxfilemanager/ajax_file_upload.php b/admin-dev/ajaxfilemanager/ajax_file_upload.php
index 454fe0003..309490e06 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_upload.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_upload.php
@@ -6,7 +6,8 @@
* @since 22/May/2007
*
*/
- define('_PS_ADMIN_DIR_', getcwd());
+ if (!defined('_PS_ADMIN_DIR_'))
+ define('_PS_ADMIN_DIR_', getcwd());
require_once('../../config/config.inc.php');
require_once('../init.php');
diff --git a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
index 05f46af93..133486637 100755
--- a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
+++ b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
@@ -1,139 +1,141 @@
-addSearchKeyword('recursive', @$_GET['search_recursively']);
- $search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
- $search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
- $search->addSearchKeyword('size_from', @$_GET['search_size_from']);
- $search->addSearchKeyword('size_to', @$_GET['search_size_to']);
- $search->addSearchKeyword('recursive', @$_GET['search_recursively']);
- $search->addSearchKeyword('name', @$_GET['search_name']);
- $search->doSearch();
- $fileList = $search->getFoundFiles();
- $folderInfo = $search->getRootFolderInfo();
-
- }else
- {
- include_once(CLASS_MANAGER);
- include_once(CLASS_SESSION_ACTION);
- $sessionAction = new SessionAction();
- include_once(DIR_AJAX_INC . "class.manager.php");
-
- $manager = new manager();
- $manager->setSessionAction($sessionAction);
-
- $fileList = $manager->getFileList();
- $folderInfo = $manager->getFolderInfo();
-
- }
- $pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);
-
- }else
- {
- include_once(CLASS_PAGINATION);
- $pagination = new pagination(false);
- }
-
-
- $pagination->setTotal(sizeof($fileList));
- $pagination->setFirstText(PAGINATION_FIRST);
- $pagination->setPreviousText(PAGINATION_PREVIOUS);
- $pagination->setNextText(PAGINATION_NEXT);
- $pagination->setLastText(PAGINATION_LAST);
- $pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
- echo $pagination->getPaginationHTML();
- echo "\n";
- if(!empty($_GET['view']))
- {
- switch($_GET['view'])
- {
- case 'detail':
- case 'thumbnail':
- case 'text':
- $view = $_GET['view'];
- break;
- default:
- $view = CONFIG_DEFAULT_VIEW;
- }
- }else
- {
- $view = CONFIG_DEFAULT_VIEW;
- }
- switch($view)
- {
- case 'text':
- //list file name only
- include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
- break;
- case 'thumbnail':
- //list file with thumbnail
- include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
- break;
- case 'detail':
- default:
- include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
- }
-
-
-
+addSearchKeyword('recursive', @$_GET['search_recursively']);
+ $search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
+ $search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
+ $search->addSearchKeyword('size_from', @$_GET['search_size_from']);
+ $search->addSearchKeyword('size_to', @$_GET['search_size_to']);
+ $search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+ $search->addSearchKeyword('name', @$_GET['search_name']);
+ $search->doSearch();
+ $fileList = $search->getFoundFiles();
+ $folderInfo = $search->getRootFolderInfo();
+
+ }else
+ {
+ include_once(CLASS_MANAGER);
+ include_once(CLASS_SESSION_ACTION);
+ $sessionAction = new SessionAction();
+ include_once(DIR_AJAX_INC . "class.manager.php");
+
+ $manager = new manager();
+ $manager->setSessionAction($sessionAction);
+
+ $fileList = $manager->getFileList();
+ $folderInfo = $manager->getFolderInfo();
+
+ }
+ $pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);
+
+ }else
+ {
+ include_once(CLASS_PAGINATION);
+ $pagination = new pagination(false);
+ }
+
+
+ $pagination->setTotal(sizeof($fileList));
+ $pagination->setFirstText(PAGINATION_FIRST);
+ $pagination->setPreviousText(PAGINATION_PREVIOUS);
+ $pagination->setNextText(PAGINATION_NEXT);
+ $pagination->setLastText(PAGINATION_LAST);
+ $pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
+ echo $pagination->getPaginationHTML();
+ echo "\n";
+ if(!empty($_GET['view']))
+ {
+ switch($_GET['view'])
+ {
+ case 'detail':
+ case 'thumbnail':
+ case 'text':
+ $view = $_GET['view'];
+ break;
+ default:
+ $view = CONFIG_DEFAULT_VIEW;
+ }
+ }else
+ {
+ $view = CONFIG_DEFAULT_VIEW;
+ }
+ switch($view)
+ {
+ case 'text':
+ //list file name only
+ include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
+ break;
+ case 'thumbnail':
+ //list file with thumbnail
+ include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
+ break;
+ case 'detail':
+ default:
+ include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
+ }
+
+
+
?>
\ No newline at end of file
diff --git a/admin-dev/ajaxfilemanager/ajax_get_folder_listing.php b/admin-dev/ajaxfilemanager/ajax_get_folder_listing.php
index 565703ad9..978aa95cf 100755
--- a/admin-dev/ajaxfilemanager/ajax_get_folder_listing.php
+++ b/admin-dev/ajaxfilemanager/ajax_get_folder_listing.php
@@ -1,4 +1,6 @@