[-] BO : Fixed bug #PSCFV-2288. _PS_ADMIN_DIR_ was not defined

admin-dev/ajaxfilemanager/_ajax_load_folders.php

@@ -1,6 +1,7 @@
 <?php
 	require_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');
 ?>

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");

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");

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");

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");	

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");

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");

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 = '';

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');
 	 

admin-dev/ajaxfilemanager/ajax_get_file_listing.php

@@ -1,139 +1,141 @@
-<?php 
+<?php 
-
+
-		/**
+	/**
-	 * the php script used to get the list of file or folders under a specific folder
+	 * the php script used to get the list of file or folders under a specific folder
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
+	 * @link www.phpletter.com
-	 * @since 22/May/2007
+	 * @since 22/May/2007
-	 *
+	 *
-	 */
+	 */
-	require_once('../../config/config.inc.php');
+	if (!defined('_PS_ADMIN_DIR_'))
-	require_once('../init.php');
+		define('_PS_ADMIN_DIR_', getcwd());
-
+	require_once('../../config/config.inc.php');
-	if(!isset($manager))
+	require_once('../init.php');
-	{
+
-		/**
+	if(!isset($manager))
-		 *  this is part of  script for processing file paste 
+	{
-		 */
+		/**
-		//$_GET = $_POST;
+		 *  this is part of  script for processing file paste 
-		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+		 */
-		include_once(CLASS_PAGINATION);
+		//$_GET = $_POST;
-		$pagination = new pagination(false);
+		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-		if(!empty($_GET['search']))
+		include_once(CLASS_PAGINATION);
-		{
+		$pagination = new pagination(false);
-			include_once(CLASS_SEARCH);
+		if(!empty($_GET['search']))
-			
+		{
-			$search  = new Search($_GET['search_folder']);
+			include_once(CLASS_SEARCH);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			
-			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
+			$search  = new Search($_GET['search_folder']);
-			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
+			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
-			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
+			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
-			$search->addSearchKeyword('name', @$_GET['search_name']);
+			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
-			$search->doSearch();
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$fileList = $search->getFoundFiles();
+			$search->addSearchKeyword('name', @$_GET['search_name']);
-			$folderInfo = $search->getRootFolderInfo();			
+			$search->doSearch();
-			
+			$fileList = $search->getFoundFiles();
-		}else 
+			$folderInfo = $search->getRootFolderInfo();			
-		{
+			
-			include_once(CLASS_MANAGER);
+		}else 
-			include_once(CLASS_SESSION_ACTION);
+		{
-			$sessionAction = new SessionAction();
+			include_once(CLASS_MANAGER);
-			include_once(DIR_AJAX_INC . "class.manager.php");
+			include_once(CLASS_SESSION_ACTION);
-		
+			$sessionAction = new SessionAction();
-			$manager = new manager();
+			include_once(DIR_AJAX_INC . "class.manager.php");
-			$manager->setSessionAction($sessionAction);
+		
-		
+			$manager = new manager();
-			$fileList = $manager->getFileList();
+			$manager->setSessionAction($sessionAction);
-			$folderInfo = $manager->getFolderInfo();	
+		
-						
+			$fileList = $manager->getFileList();
-		}
+			$folderInfo = $manager->getFolderInfo();	
-		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
+						
-
+		}
-	}else 
+		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
-	{
+
-		include_once(CLASS_PAGINATION);
+	}else 
-		$pagination = new pagination(false);			
+	{
-	}
+		include_once(CLASS_PAGINATION);
-
+		$pagination = new pagination(false);			
-		
+	}
-		$pagination->setTotal(sizeof($fileList));
+
-		$pagination->setFirstText(PAGINATION_FIRST);
+		
-		$pagination->setPreviousText(PAGINATION_PREVIOUS);
+		$pagination->setTotal(sizeof($fileList));
-		$pagination->setNextText(PAGINATION_NEXT);
+		$pagination->setFirstText(PAGINATION_FIRST);
-		$pagination->setLastText(PAGINATION_LAST);
+		$pagination->setPreviousText(PAGINATION_PREVIOUS);
-		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
+		$pagination->setNextText(PAGINATION_NEXT);
-		echo $pagination->getPaginationHTML();
+		$pagination->setLastText(PAGINATION_LAST);
-		echo "<script type=\"text/javascript\">\n";
+		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
-		
+		echo $pagination->getPaginationHTML();
-        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
+		echo "<script type=\"text/javascript\">\n";
-		echo 'currentFolder ={'; 
+		
-		$count =1;
+        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
-		foreach($folderInfo as $k=>$v)
+		echo 'currentFolder ={'; 
-		{
+		$count =1;
-			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
+		foreach($folderInfo as $k=>$v)
-
+		{
-		}
+			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
-		echo "};\n";
+
-		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
+		}
-		echo 'numRows = ' . sizeof($fileList) . ";\n";
+		echo "};\n";
-		echo "files = {\n";
+		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
-		$count = 1;
+		echo 'numRows = ' . sizeof($fileList) . ";\n";
-		
+		echo "files = {\n";
-		
+		$count = 1;
-		foreach($fileList as $file)
+		
-		{
+		
-			echo (($count > 1)?",":'').$count++ . ":{";
+		foreach($fileList as $file)
-			$j = 1;
+		{
-			foreach($file as $k=>$v)
+			echo (($count > 1)?",":'').$count++ . ":{";
-			{
+			$j = 1;
-				
+			foreach($file as $k=>$v)
-				if($k  == 'ctime' || $k == 'mtime')
+			{
-				{
+				
-					$v = @date(DATE_TIME_FORMAT, $v);
+				if($k  == 'ctime' || $k == 'mtime')
-				}	
+				{
-				if($k == 'size')
+					$v = @date(DATE_TIME_FORMAT, $v);
-				{
+				}	
-					$v = transformFileSize($v);
+				if($k == 'size')
-				}
+				{
-				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
+					$v = transformFileSize($v);
-			}
+				}
-			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
+				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
-			echo "}\n";				
+			}
-		}
+			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
-		echo  "};</script>\n";
+			echo "}\n";				
-	if(!empty($_GET['view']))
+		}
-	{
+		echo  "};</script>\n";
-		switch($_GET['view'])
+	if(!empty($_GET['view']))
-		{
+	{
-			case 'detail':
+		switch($_GET['view'])
-			case 'thumbnail':
+		{
-			case 'text':	
+			case 'detail':
-				$view = $_GET['view'];
+			case 'thumbnail':
-				break;
+			case 'text':	
-			default:
+				$view = $_GET['view'];
-				$view = CONFIG_DEFAULT_VIEW;
+				break;
-		}
+			default:
-	}else 
+				$view = CONFIG_DEFAULT_VIEW;
-	{
+		}
-		$view = CONFIG_DEFAULT_VIEW;
+	}else 
-	}	
+	{
-	switch($view)
+		$view = CONFIG_DEFAULT_VIEW;
-	{
+	}	
-		case 'text':
+	switch($view)
-			//list file name only
+	{
-			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
+		case 'text':
-			break;
+			//list file name only
-		case 'thumbnail':
+			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
-			//list file with thumbnail
+			break;
-			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
+		case 'thumbnail':
-			break;
+			//list file with thumbnail
-		case 'detail':
+			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
-		default:
+			break;
-			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
+		case 'detail':
-	}
+		default:
-
+			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
-	
+	}
-
+
+	
+
 ?>

admin-dev/ajaxfilemanager/ajax_get_folder_listing.php

@@ -1,4 +1,6 @@
 <?php
+	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");

admin-dev/ajaxfilemanager/ajax_image_editor.php

@@ -1,5 +1,6 @@
 <?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');
 		/**

admin-dev/ajaxfilemanager/ajax_image_save.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_image_thumbnail.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_image_undo.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_login.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_preview.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_save_as_form.php

@@ -1,5 +1,6 @@
 <?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');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_save_name.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_save_text.php

@@ -1,5 +1,6 @@
 <?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');
 	/**

admin-dev/ajaxfilemanager/ajax_text_editor.php

@@ -1,5 +1,6 @@
 <?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');
 		/**

admin-dev/ajaxfilemanager/ajaxfilemanager.php

@@ -1,5 +1,6 @@
 <?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');
 	/**