From 543c42430ca7aa157c1d809df0fe1ddb77206711 Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 13 Oct 2011 08:14:03 +0000 Subject: [PATCH] [*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9300 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/tabs/AdminInformation.php | 95 ++++----- cache/class_index.php | 188 +++++++++--------- .../compile => cache/smarty/cache}/index.php | 0 cache/smarty/compile/index.php | 11 + cache/smarty/index.php | 11 + classes/ConfigurationTest.php | 5 - config/defines.inc.php | 1 + config/smarty.config.inc.php | 4 +- config/smartyadmin.config.inc.php | 4 +- install-dev/index.php | 6 +- install-dev/xml/checkConfig.php | 3 +- 11 files changed, 169 insertions(+), 159 deletions(-) rename {tools/smarty/compile => cache/smarty/cache}/index.php (100%) create mode 100644 cache/smarty/compile/index.php create mode 100644 cache/smarty/index.php diff --git a/admin-dev/tabs/AdminInformation.php b/admin-dev/tabs/AdminInformation.php index fbb2e18cc..7f5ca57b2 100644 --- a/admin-dev/tabs/AdminInformation.php +++ b/admin-dev/tabs/AdminInformation.php @@ -1,6 +1,6 @@ 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_ADMIN_DIR_.'/../tools/smarty/cache/', + 'cache_dir' => _PS_CACHE_DIR_, '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 .= '
  • '.$testsErrors[$key].'
    • '; $html .= ''; } - + $html .= '

    '.$this->l('Optional parameters').':'; @@ -121,10 +119,10 @@ class AdminInformation extends AdminTab $html .= '

  • '.$testsErrors[$key].'
    • '; $html .= ''; } - + return $html; } - + public function display() { echo ' @@ -138,28 +136,28 @@ class AdminInformation extends AdminTab '.$this->l('Information about your configuration').'

    '.$this->l('Server information').'

    - '.$this->l('Prestashop Version').': + '.$this->l('Prestashop Version').': '._PS_VERSION_.'

    '; - + if (function_exists('php_uname')) echo '

    - '.$this->l('Server information').': + '.$this->l('Server information').': '.php_uname('s').' '.php_uname('v').' '.php_uname('m').'

    '; - + echo '

    - '.$this->l('Server software Version').': + '.$this->l('Server software Version').': '.$_SERVER['SERVER_SOFTWARE'].'

    - '.$this->l('PHP Version').': + '.$this->l('PHP Version').': '.phpversion().'

    - '.$this->l('MySQL Version').': + '.$this->l('MySQL Version').': '.Db::getInstance()->getVersion().'

    '; if (function_exists('apache_get_modules') AND in_array('mod_instaweb', apache_get_modules())) @@ -168,11 +166,11 @@ class AdminInformation extends AdminTab

    '.$this->l('Store information').'

    - '.$this->l('URL of your website').': + '.$this->l('URL of your website').': '.Tools::getHttpHost(true).__PS_BASE_URI__.'

    - '.$this->l('Theme name used').': + '.$this->l('Theme name used').': '._THEME_NAME_.'

    @@ -187,23 +185,23 @@ class AdminInformation extends AdminTab echo $this->l('You use your own SMTP parameters').'

    '; echo '

    - '.$this->l('SMTP server').': + '.$this->l('SMTP server').': '.Configuration::get('PS_MAIL_SERVER').'

    - '.$this->l('SMTP user').': + '.$this->l('SMTP user').': '.(Configuration::get('PS_MAIL_USER') ? $this->l('Defined') : ''.$this->l('Not defined').'').'

    - '.$this->l('SMTP password').': + '.$this->l('SMTP password').': '.(Configuration::get('PS_MAIL_PASSWD') ? $this->l('Defined') : ''.$this->l('Not defined').'').'

    - '.$this->l('Encryption').': + '.$this->l('Encryption').': '.Configuration::get('PS_MAIL_SMTP_ENCRYPTION').'

    - '.$this->l('Port').': + '.$this->l('Port').': '.Configuration::get('PS_MAIL_SMTP_PORT').'

    '; @@ -212,7 +210,7 @@ class AdminInformation extends AdminTab

    '.$this->l('Your information').'

    - '.$this->l('Information from you').': + '.$this->l('Information from you').': '.$_SERVER["HTTP_USER_AGENT"].'

    @@ -223,7 +221,7 @@ class AdminInformation extends AdminTab '; } - + 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); diff --git a/cache/class_index.php b/cache/class_index.php index 7c4b229ca..77d50233c 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -1,10 +1,10 @@ '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', - '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', - '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', + 'CMSCore' => 'classes/CMS.php', + 'CMS' => 'override/classes/CMS.php', + 'CMSCategoryCore' => 'classes/CMSCategory.php', + 'CMSCategory' => 'override/classes/CMSCategory.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', - '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', + 'SearchEngineCore' => 'classes/SearchEngine.php', + 'SearchEngine' => 'override/classes/SearchEngine.php', 'SpecificPriceCore' => 'classes/SpecificPrice.php', 'SpecificPrice' => 'override/classes/SpecificPrice.php', 'StateCore' => 'classes/State.php', 'State' => 'override/classes/State.php', - 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', - 'StockManagerFactory' => '', - 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', - 'StockManagerModule' => 'classes/stock/StockManagerModule.php', - 'StockManagerCore' => 'classes/stock/StockManager.php', - 'StockManager' => '', - 'WarehouseCore' => 'classes/stock/Warehouse.php', - 'Warehouse' => '', + 'StockCore' => 'classes/Stock.php', + 'Stock' => 'override/classes/Stock.php', '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' => '', diff --git a/tools/smarty/compile/index.php b/cache/smarty/cache/index.php similarity index 100% rename from tools/smarty/compile/index.php rename to cache/smarty/cache/index.php diff --git a/cache/smarty/compile/index.php b/cache/smarty/compile/index.php new file mode 100644 index 000000000..15aba8204 --- /dev/null +++ b/cache/smarty/compile/index.php @@ -0,0 +1,11 @@ +template_dir = _PS_THEME_DIR_.'tpl'; -$smarty->compile_dir = _PS_SMARTY_DIR_.'compile'; -$smarty->cache_dir = _PS_SMARTY_DIR_.'cache'; +$smarty->compile_dir = _PS_CACHE_DIR_.'smarty/compile'; +$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; diff --git a/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php index 69a594c7c..7814211ab 100644 --- a/config/smartyadmin.config.inc.php +++ b/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->cache_dir = _PS_SMARTY_DIR_.'admincache'; +$smarty->compile_dir = _PS_CACHE_DIR_.'smarty/compile'; +$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; diff --git a/install-dev/index.php b/install-dev/index.php index fc43866f6..0a2605c13 100644 --- a/install-dev/index.php +++ b/install-dev/index.php @@ -446,8 +446,7 @@ if ($lm->getIncludeTradFilename())
  • /config
    • -
  • /tools/smarty/compile
    • -
  • /tools/smarty/cache
    • +
  • /cache
  • /sitemap.xml
  • /log
    • @@ -1245,8 +1244,7 @@ if ($lm->getIncludeTradFilename())
  • /config
    • -
  • /tools/smarty/compile
    • -
  • /tools/smarty/cache
    • +
  • /cache
  • /sitemap.xml
  • /log
    • diff --git a/install-dev/xml/checkConfig.php b/install-dev/xml/checkConfig.php index ee3e3d9c5..dcecb7dff 100644 --- a/install-dev/xml/checkConfig.php +++ b/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.'/../tools/smarty/cache/', + 'cache_dir' => INSTALL_PATH.'/../cache/', 'sitemap' => INSTALL_PATH.'/../sitemap.xml', 'log_dir' => INSTALL_PATH.'/../log/', 'img_dir' => INSTALL_PATH.'/../img/',