From 5361b1f68df8e8fc108378b3ce14c16795183af6 Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 5 Dec 2011 16:49:05 +0000 Subject: [PATCH] // Fix missing Core suffix for some classes / controllers --- classes/pdf/HTMLTemplateSupplyOrderForm.php | 2 +- classes/stock/StockManagerModule.php | 2 +- controllers/admin/AdminAccessController.php | 2 +- controllers/admin/AdminCartsController.php | 2 +- controllers/admin/AdminCatalogController.php | 2 +- controllers/admin/AdminCurrenciesController.php | 2 -- controllers/admin/AdminGendersController.php | 2 +- controllers/admin/AdminGroupsController.php | 2 +- controllers/admin/AdminImagesController.php | 2 +- controllers/admin/AdminImportController.php | 2 +- controllers/admin/AdminLoginController.php | 2 +- controllers/admin/AdminModulesController.php | 5 ++--- controllers/admin/AdminOrderMessageController.php | 2 +- controllers/admin/AdminPerformanceController.php | 2 +- controllers/admin/AdminQuickAccessesController.php | 2 +- controllers/admin/AdminStockConfigurationController.php | 2 +- controllers/admin/AdminTrackingController.php | 2 +- controllers/admin/AdminTranslationsController.php | 6 ++++-- controllers/front/PdfOrderReturnController.php | 2 +- 19 files changed, 22 insertions(+), 23 deletions(-) diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php index 99567cc50..d6713d345 100644 --- a/classes/pdf/HTMLTemplateSupplyOrderForm.php +++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php @@ -28,7 +28,7 @@ /** * @since 1.5 */ -class HTMLTemplateSupplyOrderForm extends HTMLTemplate +class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate { public $supply_order; public $warehouse; diff --git a/classes/stock/StockManagerModule.php b/classes/stock/StockManagerModule.php index 341c05aa6..ec5ae94f1 100644 --- a/classes/stock/StockManagerModule.php +++ b/classes/stock/StockManagerModule.php @@ -28,7 +28,7 @@ /** * @since 1.5.0 */ -abstract class StockManagerModule extends Module +abstract class StockManagerModuleCore extends Module { public $stock_manager_class; diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php index 9f1b0d0a6..38921d60d 100644 --- a/controllers/admin/AdminAccessController.php +++ b/controllers/admin/AdminAccessController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminAccessController extends AdminController +class AdminAccessControllerCore extends AdminController { /* Black list of id_tab that do not have access */ public $accesses_black_list = array(107); diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index d15e1ddff..792258113 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminCartsController extends AdminController +class AdminCartsControllerCore extends AdminController { public function __construct() { diff --git a/controllers/admin/AdminCatalogController.php b/controllers/admin/AdminCatalogController.php index 45af03580..1a4284486 100644 --- a/controllers/admin/AdminCatalogController.php +++ b/controllers/admin/AdminCatalogController.php @@ -26,7 +26,7 @@ */ -class AdminCatalogController extends AdminController +class AdminCatalogControllerCore extends AdminController { /** @var object AdminCategories() instance */ //private $adminCategories; diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index ef156234a..298d0433c 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -25,8 +25,6 @@ * International Registered Trademark & Property of PrestaShop SA */ -include_once(_PS_ADMIN_DIR_.'/../classes/AdminTab.php'); - class AdminCurrenciesControllerCore extends AdminController { public function __construct() diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 49e4816b5..cf2007947 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminGendersController extends AdminController +class AdminGendersControllerCore extends AdminController { public function __construct() { diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index d77e60565..ca58755cc 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminGroupsController extends AdminController +class AdminGroupsControllerCore extends AdminController { public function __construct() { diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 86ab8529d..1cbd8d2b8 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminImagesController extends AdminController +class AdminImagesControllerCore extends AdminController { private $start_time = 0; private $max_execution_time = 7200; diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 12e0bb327..270a648c0 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -38,7 +38,7 @@ define('MAX_COLUMNS', 6); /** correct Mac error on eof */ @ini_set('auto_detect_line_endings', '1'); -class AdminImportController extends AdminController +class AdminImportControllerCore extends AdminController { public static $column_mask; diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php index 5d9efa8c9..11589533a 100755 --- a/controllers/admin/AdminLoginController.php +++ b/controllers/admin/AdminLoginController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminLoginController extends AdminController +class AdminLoginControllerCore extends AdminController { public function __construct() { diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 017c9934b..a9ac5aad6 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -25,9 +25,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - -include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php'); - class AdminModulesControllerCore extends AdminController { @@ -75,6 +72,8 @@ class AdminModulesControllerCore extends AdminController { parent::__construct(); + include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php'); + // Set the modules categories $this->list_modules_categories['administration']['name'] = $this->l('Administration'); $this->list_modules_categories['advertising_marketing']['name'] = $this->l('Advertising & Marketing'); diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php index 8470ca1bb..b5e087b42 100644 --- a/controllers/admin/AdminOrderMessageController.php +++ b/controllers/admin/AdminOrderMessageController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminOrderMessageController extends AdminController +class AdminOrderMessageControllerCore extends AdminController { public function __construct() { diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index ed12e8609..8ebc921f8 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminPerformanceController extends AdminController +class AdminPerformanceControllerCore extends AdminController { public function initFieldsetSmarty() { diff --git a/controllers/admin/AdminQuickAccessesController.php b/controllers/admin/AdminQuickAccessesController.php index e5a88c7f0..21fb140de 100644 --- a/controllers/admin/AdminQuickAccessesController.php +++ b/controllers/admin/AdminQuickAccessesController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminQuickAccessesController extends AdminController +class AdminQuickAccessesControllerCore extends AdminController { public function __construct() { diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index 0464606ca..fe66381c1 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -28,7 +28,7 @@ /** * @since 1.5.0 */ -class AdminStockConfigurationController extends AdminController +class AdminStockConfigurationControllerCore extends AdminController { /* * By default, we use StockMvtReason as the table / className diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php index 9eb600634..241ac56bf 100644 --- a/controllers/admin/AdminTrackingController.php +++ b/controllers/admin/AdminTrackingController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminTrackingController extends AdminController +class AdminTrackingControllerCore extends AdminController { public function postprocess() { diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 2f3570667..8374915f0 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -25,8 +25,6 @@ * International Registered Trademark & Property of PrestaShop SA */ -include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php'); -include_once(_PS_ADMIN_DIR_.'/../tools/pear/PEAR.php'); define ('TEXTAREA_SIZED', 70); class AdminTranslationsControllerCore extends AdminController @@ -49,6 +47,10 @@ class AdminTranslationsControllerCore extends AdminController public function __construct() { parent::__construct(); + + include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php'); + include_once(_PS_ADMIN_DIR_.'/../tools/pear/PEAR.php'); + self::$tpl_regexp = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( mod=\'.+\')?( js=1)?\}/U'; // added ? after spaces because some peoples forget them. see PSCFI-2501 self::$php_regexp = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U'; diff --git a/controllers/front/PdfOrderReturnController.php b/controllers/front/PdfOrderReturnController.php index 6d5cf3f27..ae6ca8847 100644 --- a/controllers/front/PdfOrderReturnController.php +++ b/controllers/front/PdfOrderReturnController.php @@ -35,7 +35,7 @@ class PdfOrderReturnControllerCore extends FrontController if (!$this->context->customer->isLogged()) Tools::redirect('index.php?controller=authentication&back=order-follow'); - if (isset(Tools::getValue('id_order_return')) && Validate::isUnsignedId(Tools::getValue('id_order_return'))) + if (Tools::getValue('id_order_return') && Validate::isUnsignedId(Tools::getValue('id_order_return'))) $this->orderReturn = new OrderReturn(Tools::getValue('id_order_return')); if (!isset($this->orderReturn) || !Validate::isLoadedObject($this->orderReturn))