[*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders

admin-dev/tabs/AdminInformation.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -32,7 +32,7 @@ class AdminInformation extends AdminTab
 		$html = '';
 		// Functions list to test with 'test_system'
 		$funcs = array('fopen', 'fclose', 'fread', 'fwrite', 'rename', 'file_exists', 'unlink', 'rmdir', 'mkdir', 'getcwd', 'chdir', 'chmod');
-		
+
 		// Test list to execute (function/args)
 		$tests = array(
 			'phpversion' => false,
@@ -41,8 +41,7 @@ class AdminInformation extends AdminTab
 			'gd' => false,
 			'mysql_support' => false,
 			'config_dir' => _PS_ADMIN_DIR_.'/../config/',
-			'tools_dir' => _PS_ADMIN_DIR_.'/../tools/smarty/compile',
+			'cache_dir' => _PS_CACHE_DIR_,
-			'cache_dir' => _PS_ADMIN_DIR_.'/../tools/smarty/cache/',
 			'sitemap' => _PS_ADMIN_DIR_.'/../sitemap.xml',
 			'img_dir' => _PS_ADMIN_DIR_.'/../img/',
 			'mails_dir' => _PS_ADMIN_DIR_.'/../mails/',
@@ -66,7 +65,6 @@ class AdminInformation extends AdminTab
 			'gd' => $this->l('Enable the GD library on your server'),
 			'mysql_support' => $this->l('Enable the MySQL support on your server'),
 			'config_dir' => $this->l('Set write permissions for config folder'),
-			'tools_dir' => $this->l('Set write permissions for tools folder'),
 			'cache_dir' => $this->l('Set write permissions for cache folder'),
 			'sitemap' => $this->l('Set write permissions for sitemap.xml file'),
 			'img_dir' => $this->l('Set write permissions for img folder and subfolders/recursively'),
@@ -102,7 +100,7 @@ class AdminInformation extends AdminTab
 					$html .= '<li>'.$testsErrors[$key].'</li>';
 			$html .= '</ul>';
 		}
-		
+
 		$html .= '
 			<p>
 				<b>'.$this->l('Optional parameters').':</b>';
@@ -121,10 +119,10 @@ class AdminInformation extends AdminTab
 					$html .= '<li>'.$testsErrors[$key].'</li>';
 			$html .= '</ul>';
 		}
-		
+
 		return $html;
 	}
-	
+
 	public function display()
 	{
 		echo '
@@ -138,28 +136,28 @@ class AdminInformation extends AdminTab
 			<legend><img src="../img/t/AdminInformation.gif" alt="" /> '.$this->l('Information about your configuration').'</legend>
 			<h3>'.$this->l('Server information').'</h3>
 			<p>
-				<b>'.$this->l('Prestashop Version').':</b> 
+				<b>'.$this->l('Prestashop Version').':</b>
 				'._PS_VERSION_.'
 			</p>';
-			
+
 		if (function_exists('php_uname'))
 			echo '
 			<p>
-				<b>'.$this->l('Server information').':</b> 
+				<b>'.$this->l('Server information').':</b>
 				'.php_uname('s').' '.php_uname('v').' '.php_uname('m').'
 			</p>';
-			
+
 		echo '
 			<p>
-				<b>'.$this->l('Server software Version').':</b> 
+				<b>'.$this->l('Server software Version').':</b>
 				'.$_SERVER['SERVER_SOFTWARE'].'
 			</p>
 			<p>
-				<b>'.$this->l('PHP Version').':</b> 
+				<b>'.$this->l('PHP Version').':</b>
 				'.phpversion().'
 			</p>
 			<p>
-				<b>'.$this->l('MySQL Version').':</b> 
+				<b>'.$this->l('MySQL Version').':</b>
 				'.Db::getInstance()->getVersion().'
 			</p>';
 		if (function_exists('apache_get_modules') AND in_array('mod_instaweb', apache_get_modules()))
@@ -168,11 +166,11 @@ class AdminInformation extends AdminTab
 			<hr />
 			<h3>'.$this->l('Store information').'</h3>
 			<p>
-				<b>'.$this->l('URL of your website').':</b> 
+				<b>'.$this->l('URL of your website').':</b>
 				'.Tools::getHttpHost(true).__PS_BASE_URI__.'
 			</p>
 			<p>
-				<b>'.$this->l('Theme name used').':</b> 
+				<b>'.$this->l('Theme name used').':</b>
 				'._THEME_NAME_.'
 			</p>
 			<hr />
@@ -187,23 +185,23 @@ class AdminInformation extends AdminTab
 			echo $this->l('You use your own SMTP parameters').'</p>';
 			echo '
 			<p>
-				<b>'.$this->l('SMTP server').':</b> 
+				<b>'.$this->l('SMTP server').':</b>
 				'.Configuration::get('PS_MAIL_SERVER').'
 			</p>
 			<p>
-				<b>'.$this->l('SMTP user').':</b> 
+				<b>'.$this->l('SMTP user').':</b>
 				'.(Configuration::get('PS_MAIL_USER') ? $this->l('Defined') : '<span style="color:red;">'.$this->l('Not defined').'</span>').'
 			</p>
 			<p>
-				<b>'.$this->l('SMTP password').':</b> 
+				<b>'.$this->l('SMTP password').':</b>
 				'.(Configuration::get('PS_MAIL_PASSWD') ? $this->l('Defined') : '<span style="color:red;">'.$this->l('Not defined').'</span>').'
 			</p>
 			<p>
-				<b>'.$this->l('Encryption').':</b> 
+				<b>'.$this->l('Encryption').':</b>
 				'.Configuration::get('PS_MAIL_SMTP_ENCRYPTION').'
 			</p>
 			<p>
-				<b>'.$this->l('Port').':</b> 
+				<b>'.$this->l('Port').':</b>
 				'.Configuration::get('PS_MAIL_SMTP_PORT').'
 			</p>
 			';
@@ -212,7 +210,7 @@ class AdminInformation extends AdminTab
 			<hr />
 			<h3>'.$this->l('Your information').'</h3>
 			<p>
-				<b>'.$this->l('Information from you').':</b> 
+				<b>'.$this->l('Information from you').':</b>
 				'.$_SERVER["HTTP_USER_AGENT"].'
 			</p>
 		</fieldset>
@@ -223,7 +221,7 @@ class AdminInformation extends AdminTab
 		</fieldset>
 		';
 	}
-	
+
 	static private function		check($tests)
 	{
 		$res = array();
@@ -231,20 +229,20 @@ class AdminInformation extends AdminTab
 			$res[$key] = self::run($key, $test);
 		return $res;
 	}
-	
+
 	static private function		run($ptr, $arg = 0)
 	{
 		if (call_user_func(array('self', 'test_'.$ptr), $arg))
 			return ('ok');
 		return ('fail');
 	}
-	
+
-	// Misc functions	
+	// Misc functions
 	static private function		test_phpversion()
 	{
 		return PHP_VERSION_ID >= 50000; /* PHP version > 5.0 */
 	}
-	
+
 	static private function		test_mysql_support()
 	{
 		return function_exists('mysql_connect');
@@ -272,20 +270,20 @@ class AdminInformation extends AdminTab
 	{
 		return function_exists('imagecreatetruecolor');
 	}
-	
+
 	static private function		test_register_globals()
 	{
 		return !ini_get('register_globals');
 	}
-	
+
 	static private function		test_gz()
 	{
 		if (function_exists('gzencode'))
-			return !(@gzencode('dd') === false); 
+			return !(@gzencode('dd') === false);
 		return false;
 	}
-	
+
-	// is_writable dirs	
+	// is_writable dirs
 	static private function		test_dir($dir, $recursive = false)
 	{
 		if (!is_writable($dir) OR !$dh = opendir($dir))
@@ -300,23 +298,23 @@ class AdminInformation extends AdminTab
 		closedir($dh);
 		return true;
 	}
-	
+
-	// is_writable files	
+	// is_writable files
 	static private function		test_file($file)
 	{
 		return (file_exists($file) AND is_writable($file));
 	}
-	
+
 	static private function		test_config_dir($dir)
 	{
 		return self::test_dir($dir);
 	}
-	
+
 	static private function		test_sitemap($dir)
 	{
 		return self::test_file($dir);
 	}
-	
+
 	static private function		test_root_dir($dir)
 	{
 		return self::test_dir($dir);
@@ -326,42 +324,37 @@ class AdminInformation extends AdminTab
 	{
 		return self::test_dir($dir);
 	}
-	
+
 	static private function		test_img_dir($dir)
 	{
 		return self::test_dir($dir, true);
 	}
-	
+
 	static private function		test_module_dir($dir)
 	{
 		return self::test_dir($dir, true);
 	}
-	
+
-	static private function		test_tools_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
 	static function		test_cache_dir($dir)
 	{
 		return self::test_dir($dir);
 	}
-	
+
 	static private function		test_download_dir($dir)
 	{
 		return self::test_dir($dir);
 	}
-	
+
 	static private function		test_mails_dir($dir)
 	{
 		return self::test_dir($dir, true);
 	}
-	
+
 	static private function		test_translations_dir($dir)
 	{
 		return self::test_dir($dir, true);
 	}
-	
+
 	static private function		test_theme_lang_dir($dir)
 	{
 		return self::test_dir($dir, true);
@@ -371,7 +364,7 @@ class AdminInformation extends AdminTab
 	{
 		return self::test_dir($dir);
 	}
-	
+
 	static private function		test_virtual_products_dir($dir)
 	{
 		return self::test_dir($dir);

cache/class_index.php

@@ -1,10 +1,10 @@
 <?php return array (
   'AbstractLoggerCore' => 'classes/AbstractLogger.php',
   'AbstractLogger' => 'override/classes/AbstractLogger.php',
-  'AddressFormatCore' => 'classes/AddressFormat.php',
-  'AddressFormat' => 'override/classes/AddressFormat.php',
   'AddressCore' => 'classes/Address.php',
   'Address' => 'override/classes/Address.php',
+  'AddressFormatCore' => 'classes/AddressFormat.php',
+  'AddressFormat' => 'override/classes/AddressFormat.php',
   'AdminControllerCore' => 'classes/AdminController.php',
   'AdminController' => 'override/classes/AdminController.php',
   'AdminTabCore' => 'classes/AdminTab.php',
@@ -13,39 +13,29 @@
   'Alias' => 'override/classes/Alias.php',
   'AttachmentCore' => 'classes/Attachment.php',
   'Attachment' => 'override/classes/Attachment.php',
-  'AttributeGroupCore' => 'classes/AttributeGroup.php',
-  'AttributeGroup' => 'override/classes/AttributeGroup.php',
   'AttributeCore' => 'classes/Attribute.php',
   'Attribute' => 'override/classes/Attribute.php',
+  'AttributeGroupCore' => 'classes/AttributeGroup.php',
+  'AttributeGroup' => 'override/classes/AttributeGroup.php',
   'Autoload' => 'classes/Autoload.php',
   'BackupCore' => 'classes/Backup.php',
   'Backup' => 'override/classes/Backup.php',
   'BlowfishCore' => 'classes/Blowfish.php',
   'Blowfish' => 'override/classes/Blowfish.php',
-  'CacheApcCore' => 'classes/cache/CacheApc.php',
+  'CMSCore' => 'classes/CMS.php',
-  'CacheApc' => 'override/classes/cache/CacheApc.php',
+  'CMS' => 'override/classes/CMS.php',
-  'CacheFsCore' => 'classes/cache/CacheFs.php',
+  'CMSCategoryCore' => 'classes/CMSCategory.php',
-  'CacheFs' => 'override/classes/cache/CacheFs.php',
+  'CMSCategory' => 'override/classes/CMSCategory.php',
-  'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php',
-  'CacheMemcache' => 'override/classes/cache/CacheMemcache.php',
-  'CacheCore' => 'classes/cache/Cache.php',
-  'Cache' => 'override/classes/cache/Cache.php',
-  'CacheXcacheCore' => 'classes/cache/CacheXcache.php',
-  'CacheXcache' => 'override/classes/cache/CacheXcache.php',
-  'CarrierModuleCore' => 'classes/CarrierModule.php',
-  'CarrierModule' => 'override/classes/CarrierModule.php',
   'CarrierCore' => 'classes/Carrier.php',
   'Carrier' => 'override/classes/Carrier.php',
+  'CarrierModuleCore' => 'classes/CarrierModule.php',
+  'CarrierModule' => 'override/classes/CarrierModule.php',
   'CartCore' => 'classes/Cart.php',
   'Cart' => 'override/classes/Cart.php',
   'CategoryCore' => 'classes/Category.php',
   'Category' => 'override/classes/Category.php',
   'ChartCore' => 'classes/Chart.php',
   'Chart' => 'override/classes/Chart.php',
-  'CMSCategoryCore' => 'classes/CMSCategory.php',
-  'CMSCategory' => 'override/classes/CMSCategory.php',
-  'CMSCore' => 'classes/CMS.php',
-  'CMS' => 'override/classes/CMS.php',
   'CombinationCore' => 'classes/Combination.php',
   'Combination' => 'override/classes/Combination.php',
   'CompareProductCore' => 'classes/CompareProduct.php',
@@ -62,10 +52,10 @@
   'Contact' => 'override/classes/Contact.php',
   'ContextCore' => 'classes/Context.php',
   'Context' => 'override/classes/Context.php',
-  'ControllerFactoryCore' => 'classes/ControllerFactory.php',
-  'ControllerFactory' => 'override/classes/ControllerFactory.php',
   'ControllerCore' => 'classes/Controller.php',
   'Controller' => 'override/classes/Controller.php',
+  'ControllerFactoryCore' => 'classes/ControllerFactory.php',
+  'ControllerFactory' => 'override/classes/ControllerFactory.php',
   'CookieCore' => 'classes/Cookie.php',
   'Cookie' => 'override/classes/Cookie.php',
   'CountryCore' => 'classes/Country.php',
@@ -74,26 +64,16 @@
   'County' => 'override/classes/County.php',
   'CurrencyCore' => 'classes/Currency.php',
   'Currency' => 'override/classes/Currency.php',
-  'CustomerMessageCore' => 'classes/CustomerMessage.php',
-  'CustomerMessage' => 'override/classes/CustomerMessage.php',
   'CustomerCore' => 'classes/Customer.php',
   'Customer' => 'override/classes/Customer.php',
+  'CustomerMessageCore' => 'classes/CustomerMessage.php',
+  'CustomerMessage' => 'override/classes/CustomerMessage.php',
   'CustomerThreadCore' => 'classes/CustomerThread.php',
   'CustomerThread' => 'override/classes/CustomerThread.php',
   'CustomizationCore' => 'classes/Customization.php',
   'Customization' => 'override/classes/Customization.php',
   'DateRangeCore' => 'classes/DateRange.php',
   'DateRange' => 'override/classes/DateRange.php',
-  'DbMySQLiCore' => 'classes/db/DbMySQLi.php',
-  'DbMySQLi' => 'override/classes/db/DbMySQLi.php',
-  'DbPDOCore' => 'classes/db/DbPDO.php',
-  'DbPDO' => 'override/classes/db/DbPDO.php',
-  'DbCore' => 'classes/db/Db.php',
-  'Db' => 'override/classes/db/Db.php',
-  'DbQueryCore' => 'classes/db/DbQuery.php',
-  'DbQuery' => 'override/classes/db/DbQuery.php',
-  'MySQLCore' => 'classes/db/MySQL.php',
-  'MySQL' => 'override/classes/db/MySQL.php',
   'DeliveryCore' => 'classes/Delivery.php',
   'Delivery' => 'override/classes/Delivery.php',
   'DiscountCore' => 'classes/Discount.php',
@@ -102,14 +82,6 @@
   'Dispatcher' => 'override/classes/Dispatcher.php',
   'EmployeeCore' => 'classes/Employee.php',
   'Employee' => 'override/classes/Employee.php',
-  'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php',
-  'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php',
-  'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php',
-  'PrestashopException' => 'override/classes/exception/PrestashopException.php',
-  'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php',
-  'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php',
-  'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php',
-  'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php',
   'FeatureCore' => 'classes/Feature.php',
   'Feature' => 'override/classes/Feature.php',
   'FeatureValueCore' => 'classes/FeatureValue.php',
@@ -130,12 +102,12 @@
   'Guest' => 'override/classes/Guest.php',
   'HelpAccessCore' => 'classes/HelpAccess.php',
   'HelpAccess' => 'override/classes/HelpAccess.php',
+  'HelperCore' => 'classes/Helper.php',
+  'Helper' => 'override/classes/Helper.php',
   'HelperFormCore' => 'classes/HelperForm.php',
   'HelperForm' => '',
   'HelperListCore' => 'classes/HelperList.php',
   'HelperList' => '',
-  'HelperCore' => 'classes/Helper.php',
-  'Helper' => 'override/classes/Helper.php',
   'HookCore' => 'classes/Hook.php',
   'Hook' => 'override/classes/Hook.php',
   'ImageCore' => 'classes/Image.php',
@@ -162,20 +134,22 @@
   'Message' => 'override/classes/Message.php',
   'MetaCore' => 'classes/Meta.php',
   'Meta' => 'override/classes/Meta.php',
-  'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php',
-  'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php',
-  'ModuleGraphCore' => 'classes/ModuleGraph.php',
-  'ModuleGraph' => 'override/classes/ModuleGraph.php',
-  'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php',
-  'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php',
-  'ModuleGridCore' => 'classes/ModuleGrid.php',
-  'ModuleGrid' => 'override/classes/ModuleGrid.php',
   'ModuleCore' => 'classes/Module.php',
   'Module' => 'override/classes/Module.php',
+  'ModuleGraphCore' => 'classes/ModuleGraph.php',
+  'ModuleGraph' => 'override/classes/ModuleGraph.php',
+  'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php',
+  'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php',
+  'ModuleGridCore' => 'classes/ModuleGrid.php',
+  'ModuleGrid' => 'override/classes/ModuleGrid.php',
+  'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php',
+  'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php',
   'NotificationCore' => 'classes/Notification.php',
   'Notification' => 'override/classes/Notification.php',
   'ObjectModelCore' => 'classes/ObjectModel.php',
   'ObjectModel' => 'override/classes/ObjectModel.php',
+  'OrderCore' => 'classes/Order.php',
+  'Order' => 'override/classes/Order.php',
   'OrderDetailCore' => 'classes/OrderDetail.php',
   'OrderDetail' => 'override/classes/OrderDetail.php',
   'OrderDiscountCore' => 'classes/OrderDiscount.php',
@@ -184,8 +158,6 @@
   'OrderHistory' => 'override/classes/OrderHistory.php',
   'OrderMessageCore' => 'classes/OrderMessage.php',
   'OrderMessage' => 'override/classes/OrderMessage.php',
-  'OrderCore' => 'classes/Order.php',
-  'Order' => 'override/classes/Order.php',
   'OrderReturnCore' => 'classes/OrderReturn.php',
   'OrderReturn' => 'override/classes/OrderReturn.php',
   'OrderReturnStateCore' => 'classes/OrderReturnState.php',
@@ -194,6 +166,8 @@
   'OrderSlip' => 'override/classes/OrderSlip.php',
   'OrderStateCore' => 'classes/OrderState.php',
   'OrderState' => 'override/classes/OrderState.php',
+  'PDFCore' => 'classes/PDF.php',
+  'PDF' => 'override/classes/PDF.php',
   'PackCore' => 'classes/Pack.php',
   'Pack' => 'override/classes/Pack.php',
   'PageCore' => 'classes/Page.php',
@@ -202,12 +176,10 @@
   'PaymentCC' => 'override/classes/PaymentCC.php',
   'PaymentModuleCore' => 'classes/PaymentModule.php',
   'PaymentModule' => 'override/classes/PaymentModule.php',
-  'PDFCore' => 'classes/PDF.php',
-  'PDF' => 'override/classes/PDF.php',
-  'ProductDownloadCore' => 'classes/ProductDownload.php',
-  'ProductDownload' => 'override/classes/ProductDownload.php',
   'ProductCore' => 'classes/Product.php',
   'Product' => 'override/classes/Product.php',
+  'ProductDownloadCore' => 'classes/ProductDownload.php',
+  'ProductDownload' => 'override/classes/ProductDownload.php',
   'ProductSaleCore' => 'classes/ProductSale.php',
   'ProductSale' => 'override/classes/ProductSale.php',
   'ProfileCore' => 'classes/Profile.php',
@@ -226,34 +198,20 @@
   'Rijndael' => 'override/classes/Rijndael.php',
   'SceneCore' => 'classes/Scene.php',
   'Scene' => 'override/classes/Scene.php',
-  'SearchEngineCore' => 'classes/SearchEngine.php',
-  'SearchEngine' => 'override/classes/SearchEngine.php',
   'SearchCore' => 'classes/Search.php',
   'Search' => 'override/classes/Search.php',
-  'GroupShopCore' => 'classes/shop/GroupShop.php',
+  'SearchEngineCore' => 'classes/SearchEngine.php',
-  'GroupShop' => 'override/classes/shop/GroupShop.php',
+  'SearchEngine' => 'override/classes/SearchEngine.php',
-  'ShopCore' => 'classes/shop/Shop.php',
-  'Shop' => 'override/classes/shop/Shop.php',
-  'ShopUrlCore' => 'classes/shop/ShopUrl.php',
-  'ShopUrl' => 'override/classes/shop/ShopUrl.php',
   'SpecificPriceCore' => 'classes/SpecificPrice.php',
   'SpecificPrice' => 'override/classes/SpecificPrice.php',
   'StateCore' => 'classes/State.php',
   'State' => 'override/classes/State.php',
-  'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php',
+  'StockCore' => 'classes/Stock.php',
-  'StockManagerFactory' => '',
+  'Stock' => 'override/classes/Stock.php',
-  'StockManagerInterface' => 'classes/stock/StockManagerInterface.php',
-  'StockManagerModule' => 'classes/stock/StockManagerModule.php',
-  'StockManagerCore' => 'classes/stock/StockManager.php',
-  'StockManager' => '',
-  'WarehouseCore' => 'classes/stock/Warehouse.php',
-  'Warehouse' => '',
   'StockMvtCore' => 'classes/StockMvt.php',
   'StockMvt' => 'override/classes/StockMvt.php',
   'StockMvtReasonCore' => 'classes/StockMvtReason.php',
   'StockMvtReason' => 'override/classes/StockMvtReason.php',
-  'StockCore' => 'classes/Stock.php',
-  'Stock' => 'override/classes/Stock.php',
   'StoreCore' => 'classes/Store.php',
   'Store' => 'override/classes/Store.php',
   'SubDomainCore' => 'classes/SubDomain.php',
@@ -264,21 +222,6 @@
   'Tab' => 'override/classes/Tab.php',
   'TagCore' => 'classes/Tag.php',
   'Tag' => 'override/classes/Tag.php',
-  'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php',
-  'TaxCalculator' => 'override/classes/tax/TaxCalculator.php',
-  'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php',
-  'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php',
-  'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php',
-  'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php',
-  'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php',
-  'TaxCore' => 'classes/tax/Tax.php',
-  'Tax' => 'override/classes/tax/Tax.php',
-  'TaxRuleCore' => 'classes/tax/TaxRule.php',
-  'TaxRule' => 'override/classes/tax/TaxRule.php',
-  'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php',
-  'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php',
-  'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php',
-  'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php',
   'ThemeCore' => 'classes/Theme.php',
   'Theme' => 'override/classes/Theme.php',
   'ToolsCore' => 'classes/Tools.php',
@@ -289,6 +232,67 @@
   'Upgrader' => 'override/classes/Upgrader.php',
   'ValidateCore' => 'classes/Validate.php',
   'Validate' => 'override/classes/Validate.php',
+  'ZoneCore' => 'classes/Zone.php',
+  'Zone' => 'override/classes/Zone.php',
+  'CacheCore' => 'classes/cache/Cache.php',
+  'Cache' => 'override/classes/cache/Cache.php',
+  'CacheApcCore' => 'classes/cache/CacheApc.php',
+  'CacheApc' => 'override/classes/cache/CacheApc.php',
+  'CacheFsCore' => 'classes/cache/CacheFs.php',
+  'CacheFs' => 'override/classes/cache/CacheFs.php',
+  'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php',
+  'CacheMemcache' => 'override/classes/cache/CacheMemcache.php',
+  'CacheXcacheCore' => 'classes/cache/CacheXcache.php',
+  'CacheXcache' => 'override/classes/cache/CacheXcache.php',
+  'DbCore' => 'classes/db/Db.php',
+  'Db' => 'override/classes/db/Db.php',
+  'DbMySQLiCore' => 'classes/db/DbMySQLi.php',
+  'DbMySQLi' => 'override/classes/db/DbMySQLi.php',
+  'DbPDOCore' => 'classes/db/DbPDO.php',
+  'DbPDO' => 'override/classes/db/DbPDO.php',
+  'DbQueryCore' => 'classes/db/DbQuery.php',
+  'DbQuery' => 'override/classes/db/DbQuery.php',
+  'MySQLCore' => 'classes/db/MySQL.php',
+  'MySQL' => 'override/classes/db/MySQL.php',
+  'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php',
+  'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php',
+  'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php',
+  'PrestashopException' => 'override/classes/exception/PrestashopException.php',
+  'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php',
+  'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php',
+  'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php',
+  'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php',
+  'GroupShopCore' => 'classes/shop/GroupShop.php',
+  'GroupShop' => 'override/classes/shop/GroupShop.php',
+  'ShopCore' => 'classes/shop/Shop.php',
+  'Shop' => 'override/classes/shop/Shop.php',
+  'ShopUrlCore' => 'classes/shop/ShopUrl.php',
+  'ShopUrl' => 'override/classes/shop/ShopUrl.php',
+  'StockAvailableCore' => 'classes/stock/StockAvailable.php',
+  'StockAvailable' => '',
+  'StockManagerCore' => 'classes/stock/StockManager.php',
+  'StockManager' => '',
+  'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php',
+  'StockManagerFactory' => '',
+  'StockManagerInterface' => 'classes/stock/StockManagerInterface.php',
+  'StockManagerModule' => 'classes/stock/StockManagerModule.php',
+  'WarehouseCore' => 'classes/stock/Warehouse.php',
+  'Warehouse' => '',
+  'TaxCore' => 'classes/tax/Tax.php',
+  'Tax' => 'override/classes/tax/Tax.php',
+  'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php',
+  'TaxCalculator' => 'override/classes/tax/TaxCalculator.php',
+  'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php',
+  'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php',
+  'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php',
+  'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php',
+  'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php',
+  'TaxRuleCore' => 'classes/tax/TaxRule.php',
+  'TaxRule' => 'override/classes/tax/TaxRule.php',
+  'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php',
+  'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php',
+  'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php',
+  'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php',
   'WebserviceExceptionCore' => 'classes/webservice/WebserviceException.php',
   'WebserviceException' => 'override/classes/webservice/WebserviceException.php',
   'WebserviceKeyCore' => 'classes/webservice/WebserviceKey.php',
@@ -305,8 +309,6 @@
   'WebserviceSpecificManagementInterface' => 'classes/webservice/WebserviceSpecificManagementInterface.php',
   'WebserviceSpecificManagementSearchCore' => 'classes/webservice/WebserviceSpecificManagementSearch.php',
   'WebserviceSpecificManagementSearch' => 'override/classes/webservice/WebserviceSpecificManagementSearch.php',
-  'ZoneCore' => 'classes/Zone.php',
-  'Zone' => 'override/classes/Zone.php',
   'FB' => 'override/classes/fb.php',
   'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php',
   'AdminAddressesController' => '',

cache/smarty/compile/index.php

@@ -0,0 +1,11 @@
+<?php
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

cache/smarty/index.php

@@ -0,0 +1,11 @@
+<?php
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

classes/ConfigurationTest.php

@@ -156,11 +156,6 @@ class ConfigurationTestCore
 		return self::test_dir($dir, true);
 	}
 
-	public static function test_tools_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-
 	public static function test_cache_dir($dir)
 	{
 		return self::test_dir($dir);

config/defines.inc.php

@@ -66,6 +66,7 @@ define('_PS_GENDERS_DIR_',            _PS_IMG_DIR_.'genders/');
 define('_PS_FPDF_PATH_',            _PS_TOOL_DIR_.'fpdf/');
 define('_PS_TAASC_PATH_',            _PS_TOOL_DIR_.'taasc/');
 define('_PS_PEAR_XML_PARSER_PATH_', _PS_TOOL_DIR_.'pear_xml_parser/');
+define('_PS_CACHE_DIR_',			_PS_ROOT_DIR_.'/cache/');
 
 /* settings php */
 define('_PS_TRANS_PATTERN_',            '(.*[^\\\\])');

config/smarty.config.inc.php

@@ -32,8 +32,8 @@ require_once(_PS_SMARTY_DIR_.'Smarty.class.php');
 global $smarty;
 $smarty = new Smarty();
 $smarty->template_dir = _PS_THEME_DIR_.'tpl';
-$smarty->compile_dir = _PS_SMARTY_DIR_.'compile';
+$smarty->compile_dir = _PS_CACHE_DIR_.'smarty/compile';
-$smarty->cache_dir = _PS_SMARTY_DIR_.'cache';
+$smarty->cache_dir = _PS_CACHE_DIR_.'smarty/cache';
 $smarty->config_dir = _PS_SMARTY_DIR_.'configs';
 $smarty->caching = false;
 $smarty->force_compile = (Configuration::get('PS_SMARTY_FORCE_COMPILE') == _PS_SMARTY_FORCE_COMPILE_) ? true : false;

config/smartyadmin.config.inc.php

@@ -31,8 +31,8 @@ require_once(_PS_SMARTY_DIR_.'Smarty.class.php');
 global $smarty;
 $smarty = new Smarty();
 $smarty->template_dir = _PS_ADMIN_DIR_.'/themes/template';
-$smarty->compile_dir = _PS_SMARTY_DIR_.'admincompile';
+$smarty->compile_dir = _PS_CACHE_DIR_.'smarty/compile';
-$smarty->cache_dir = _PS_SMARTY_DIR_.'admincache';
+$smarty->cache_dir = _PS_CACHE_DIR_.'smarty/cache';
 $smarty->caching = false;
 $smarty->force_compile = (Configuration::get('PS_SMARTY_FORCE_COMPILE') == _PS_SMARTY_FORCE_COMPILE_) ? true : false;
 $smarty->compile_check = (Configuration::get('PS_SMARTY_FORCE_COMPILE') == _PS_SMARTY_CHECK_COMPILE_) ? true : false;

install-dev/index.php

@@ -446,8 +446,7 @@ if ($lm->getIncludeTradFilename())
 				<li class="required"><?php echo lang('MySQL support is on')?></li>
 				<li class="title"><?php echo lang('Write permissions on files and folders:')?></li>
 				<li class="required first">/config</li>
-				<li class="required">/tools/smarty/compile</li>
+				<li class="required">/cache</li>
-				<li class="required">/tools/smarty/cache</li>
 				<li class="required">/sitemap.xml</li>
 				<li class="required">/log</li>
 				<li class="title"><?php echo lang('Write permissions on folders (and subfolders):')?></li>
@@ -1245,8 +1244,7 @@ if ($lm->getIncludeTradFilename())
 				<li class="required"><?php echo lang('MySQL support is on')?></li>
 				<li class="title"><?php echo lang('Write permissions on folders:')?></li>
 				<li class="required first">/config</li>
-				<li class="required">/tools/smarty/compile</li>
+				<li class="required">/cache</li>
-				<li class="required">/tools/smarty/cache</li>
 				<li class="required">/sitemap.xml</li>
 				<li class="required">/log</li>
 				<li class="title"><?php echo lang('Write permissions on folders (and subfolders):')?></li>

install-dev/xml/checkConfig.php

@@ -40,8 +40,7 @@ $tests = array(
 	'gd' => false,
 	'mysql_support' => false,
 	'config_dir' => INSTALL_PATH.'/../config/',
-	'tools_dir' => INSTALL_PATH.'/../tools/smarty/compile/',
+	'cache_dir' => INSTALL_PATH.'/../cache/',
-	'cache_dir' => INSTALL_PATH.'/../tools/smarty/cache/',
 	'sitemap' => INSTALL_PATH.'/../sitemap.xml',
 	'log_dir' => INSTALL_PATH.'/../log/',
 	'img_dir' => INSTALL_PATH.'/../img/',