admin-dev/ajax-tab.php

@@ -25,65 +25,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-define('_PS_ADMIN_DIR_', dirname(__FILE__));
+define('_PS_ADMIN_DIR_', getcwd());
-
+require(dirname(__FILE__).'/../config/config.inc.php');
-include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require(dirname(__FILE__).'/functions.php');
-include(_PS_ADMIN_DIR_.'/functions.php');
-
-
-include(_PS_ADMIN_DIR_.'/init.php');
-
-if (empty($tab) and !sizeof($_POST))
-{
-	$tab = 'AdminHome';
-	$_POST['tab'] = 'AdminHome';
-	$_POST['token'] = Tools::getAdminTokenLite($tab);
-}
-	if ($adminObj = checkingTab($tab))
-	{
-    	$isoUser = Context::getContext()->language->iso_code;
-
-		if (Validate::isLoadedObject($adminObj))
-		{
-			$adminObj->ajax = true;
-			if ($adminObj->checkToken())
-			{
-				// the differences with index.php is here
-
-				$adminObj->ajaxPreProcess();
-				$action = Tools::getValue('action');
-
-				// no need to use displayConf() here
-
-				if (!empty($action) AND method_exists($adminObj, 'ajaxProcess'.Tools::toCamelCase($action)) )
-					$adminObj->{'ajaxProcess'.Tools::toCamelCase($action)}();
-				else
-					$adminObj->ajaxProcess();
-
-				// @TODO We should use a displayAjaxError
-				$adminObj->displayErrors();
-				if (!empty($action) AND method_exists($adminObj, 'displayAjax'.Tools::toCamelCase($action)) )
-					$adminObj->{'displayAjax'.$action}();
-				else
-					$adminObj->displayAjax();
-
-			}
-			else
-			{
-				// If this is an XSS attempt, then we should only display a simple, secure page
-				ob_clean();
-
-				// ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17)
-				$url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$adminObj->token.'$2', $_SERVER['REQUEST_URI']);
-				if (false === strpos($url, '?token=') AND false === strpos($url, '&token='))
-					$url .= '&token='.$adminObj->token;
-
-				// we can display the correct url
-				// die(Tools::jsonEncode(array(translate('Invalid security token'),$url)));
-				die(Tools::jsonEncode(translate('Invalid security token')));
-			}
-		}
-	}
 
+// For retrocompatibility with "tab" parameter
+if (!isset($_GET['controller']) && isset($_GET['tab']))
+	$_GET['controller'] = strtolower($_GET['tab']);
+if (!isset($_POST['controller']) && isset($_POST['tab']))
+	$_POST['controller'] = strtolower($_POST['tab']);
+if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
+	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 	
+Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
+Dispatcher::getInstance()->dispatch();
 

admin-dev/functions.php

@@ -239,6 +239,7 @@ function checkingTab($tab)
 		$controllers = Dispatcher::getControllers(_PS_ADMIN_DIR_.'/tabs/');
 
 	$tab = trim($tab);
+	$tab_lowercase = strtolower($tab);
 	if (!Validate::isTabName($tab))
 		return false;
 	$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('SELECT id_tab, module FROM `'._DB_PREFIX_.'tab` WHERE class_name = \''.pSQL($tab).'\'');
@@ -249,10 +250,10 @@ function checkingTab($tab)
 		echo sprintf(Tools::displayError('Tab %s cannot be found.'),$tab);
 		return false;
 	}
-	if ($row['module'] AND file_exists(_PS_MODULE_DIR_.'/'.$row['module'].'/'.$controllers[$tab].'.php'))
+	if ($row['module'] AND file_exists(_PS_MODULE_DIR_.'/'.$row['module'].'/'.$controllers[$tab_lowercase].'.php'))
-		include_once(_PS_MODULE_DIR_.'/'.$row['module'].'/'.$controllers[$tab].'.php');
+		include_once(_PS_MODULE_DIR_.'/'.$row['module'].'/'.$controllers[$tab_lowercase].'.php');
-	elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$controllers[$tab].'.php'))
+	elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$controllers[$tab_lowercase].'.php'))
-		include_once(_PS_ADMIN_DIR_.'/tabs/'.$controllers[$tab].'.php');
+		include_once(_PS_ADMIN_DIR_.'/tabs/'.$controllers[$tab_lowercase].'.php');
 	if (!class_exists($tab, false) OR !$row['id_tab'])
 	{
 		echo sprintf(Tools::displayError('Tab file %s cannot be found.'),$tab);
@@ -427,8 +428,10 @@ function generateShopList()
  *
  * @return void
  */
-function runAdminTab()
+function runAdminTab($ajaxMode = false)
 {
+	$ajaxMode = (bool)$ajaxMode;
+
 	require_once(_PS_ADMIN_DIR_.'/init.php');
 	$cookie = Context::getContext()->cookie;
 	if (empty($tab) and !sizeof($_POST))
@@ -448,6 +451,7 @@ function runAdminTab()
 		}
 		else
 		{
+			if (!$ajaxMode)
 				require_once(_PS_ADMIN_DIR_.'/header.inc.php');
 			$isoUser = Context::getContext()->language->id;
 			$tabs = array();
@@ -466,6 +470,7 @@ function runAdminTab()
 			}
 
 			// @TODO : a way to desactivate this feature
+			if (!$ajaxMode)
 				echo'<script type="text/javascript">
 
 				$(function() {
@@ -481,16 +486,15 @@ function runAdminTab()
 					});
 				});</script>';
 
+			if (!$ajaxMode)
 				echo '<div class="path_bar">
 			<div id="help-button" class="floatr" style="display: none; font-family: Verdana; font-size: 10px; margin-right: 4px; margin-top: 4px;">
 			</div>
 				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
-				'.$bread;
+				'.$bread.'</div>';
-			echo '
-			</div>';
 
 
-			if (Shop::isMultiShopActivated() && Context::shop() != Shop::CONTEXT_ALL)
+			if (!$ajaxMode && Shop::isMultiShopActivated() && Context::shop() != Shop::CONTEXT_ALL)
 			{
 				echo '<div class="multishop_info">';
 				if (Context::shop() == Shop::CONTEXT_GROUP)
@@ -499,10 +503,32 @@ function runAdminTab()
 					printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo '</div>';
 			}
-
 			if (Validate::isLoadedObject($adminObj))
 			{
 				if ($adminObj->checkToken())
+				{
+					if($ajaxMode)
+					{
+						// the differences with index.php is here 
+						$adminObj->ajaxPreProcess();
+						$action = Tools::getValue('action');
+						// no need to use displayConf() here
+
+						if (!empty($action) AND method_exists($adminObj, 'ajaxProcess'.Tools::toCamelCase($action)) )
+							$adminObj->{'ajaxProcess'.Tools::toCamelCase($action)}();
+						else
+							$adminObj->ajaxProcess();
+
+						// @TODO We should use a displayAjaxError
+						$adminObj->displayErrors();
+						if (!empty($action) AND method_exists($adminObj, 'displayAjax'.Tools::toCamelCase($action)) )
+							$adminObj->{'displayAjax'.$action}();
+						else
+							$adminObj->displayAjax();
+						
+					
+					}
+					else
 					{
 						/* Filter memorization */
 						if (isset($_POST) AND !empty($_POST) AND isset($adminObj->table))
@@ -530,6 +556,25 @@ function runAdminTab()
 						$adminObj->postProcess();
 						$adminObj->displayErrors();
 						$adminObj->display();
+						include(_PS_ADMIN_DIR_.'/footer.inc.php');
+					}
+				}
+				else
+				{
+					if($ajaxMode)
+					{
+						// If this is an XSS attempt, then we should only display a simple, secure page
+						ob_clean();
+
+						// ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17)
+						$url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$adminObj->token.'$2', $_SERVER['REQUEST_URI']);
+						if (false === strpos($url, '?token=') AND false === strpos($url, '&token='))
+							$url .= '&token='.$adminObj->token;
+
+
+						// we can display the correct url
+						// die(Tools::jsonEncode(array(translate('Invalid security token'),$url)));
+						die(Tools::jsonEncode(translate('Invalid security token')));
 					}
 					else
 					{
@@ -557,7 +602,7 @@ function runAdminTab()
 						die;
 					}
 				}
-			include(_PS_ADMIN_DIR_.'/footer.inc.php');
+			}
 		}
 	}
 }

classes/Dispatcher.php

@@ -236,14 +236,15 @@ class DispatcherCore
 		$this->getController();
 		$controllers = Dispatcher::getControllers($this->controller_directories);
 
-		if (!$this->controller)
+		if (!$this->controller || $this->controller == 'index')
 			$this->controller = (defined('_PS_ADMIN_DIR_')) ? 'adminhome' : 'index';
 
 		// For retrocompatibility with admin/tabs/ old system
 		if (isset($controllers[$this->controller]) && defined('_PS_ADMIN_DIR_') && file_exists(_PS_ADMIN_DIR_.'/tabs/'.$controllers[$this->controller].'.php'))
 		{
 			require_once(_PS_ADMIN_DIR_.'/functions.php');
-			runAdminTab();
+			$ajaxMode = !empty($_REQUEST['ajaxMode']);
+			runAdminTab($ajaxMode);
 			return;
 		}
 		else if (!isset($controllers[$this->controller]))