From e0664df6f86f5d16a9fd1c29aa6ceb59f08e0970 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 29 Mar 2012 16:14:14 +0000 Subject: [PATCH] // Renaming options to fields_options --- classes/controller/AdminController.php | 8 ++++---- controllers/admin/AdminAdminPreferencesController.php | 2 +- controllers/admin/AdminBackupController.php | 2 +- controllers/admin/AdminCarriersController.php | 2 +- controllers/admin/AdminCountriesController.php | 2 +- controllers/admin/AdminCurrenciesController.php | 2 +- controllers/admin/AdminCustomerPreferencesController.php | 2 +- controllers/admin/AdminCustomerThreadsController.php | 2 +- controllers/admin/AdminDeliverySlipController.php | 2 +- controllers/admin/AdminEmailsController.php | 2 +- controllers/admin/AdminEmployeesController.php | 2 +- controllers/admin/AdminGeolocationController.php | 4 ++-- controllers/admin/AdminImagesController.php | 2 +- controllers/admin/AdminInvoicesController.php | 2 +- controllers/admin/AdminLocalizationController.php | 4 ++-- controllers/admin/AdminLogsController.php | 2 +- controllers/admin/AdminMaintenanceController.php | 2 +- controllers/admin/AdminMetaController.php | 8 ++++---- controllers/admin/AdminOrderPreferencesController.php | 2 +- controllers/admin/AdminPPreferencesController.php | 2 +- controllers/admin/AdminPreferencesController.php | 2 +- controllers/admin/AdminRequestSqlController.php | 2 +- controllers/admin/AdminReturnController.php | 2 +- controllers/admin/AdminSearchConfController.php | 6 +++--- controllers/admin/AdminShippingController.php | 2 +- controllers/admin/AdminShopController.php | 2 +- controllers/admin/AdminStockConfigurationController.php | 2 +- controllers/admin/AdminStoresController.php | 4 ++-- controllers/admin/AdminTaxesController.php | 4 ++-- controllers/admin/AdminThemesController.php | 6 +++--- controllers/admin/AdminWebserviceController.php | 7 +++---- 31 files changed, 47 insertions(+), 48 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 09b4718c9..dd3275bf7 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -831,7 +831,7 @@ class AdminControllerCore extends Controller $languages = Language::getLanguages(false); - foreach ($this->options as $category_data) + foreach ($this->fields_options as $category_data) { if (!isset($category_data['fields'])) continue; @@ -1459,7 +1459,7 @@ class AdminControllerCore extends Controller */ public function renderOptions() { - if ($this->options && is_array($this->options)) + if ($this->fields_options && is_array($this->fields_options)) { if ($this->display != 'options') $this->show_toolbar = false; @@ -1468,7 +1468,7 @@ class AdminControllerCore extends Controller $this->setHelperDisplay($helper); $helper->id = $this->id; $helper->tpl_vars = $this->tpl_option_vars; - $options = $helper->generateOptions($this->options); + $options = $helper->generateOptions($this->fields_options); return $options; } @@ -1849,7 +1849,7 @@ class AdminControllerCore extends Controller break; } } - elseif (!empty($this->options) && empty($this->fieldsDisplay)) + elseif (!empty($this->fields_options) && empty($this->fieldsDisplay)) $this->display = 'options'; } diff --git a/controllers/admin/AdminAdminPreferencesController.php b/controllers/admin/AdminAdminPreferencesController.php index d19138839..559969ec5 100644 --- a/controllers/admin/AdminAdminPreferencesController.php +++ b/controllers/admin/AdminAdminPreferencesController.php @@ -41,7 +41,7 @@ class AdminAdminPreferencesControllerCore extends AdminController $upload_mb = min($max_upload, $max_post); // Options list - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), 'icon' => 'tab-preferences', diff --git a/controllers/admin/AdminBackupController.php b/controllers/admin/AdminBackupController.php index e39cb2cf5..b7d9e9cdd 100644 --- a/controllers/admin/AdminBackupController.php +++ b/controllers/admin/AdminBackupController.php @@ -46,7 +46,7 @@ class AdminBackupControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Backup options'), 'fields' => array( diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 5180fadcd..750f2ec7c 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -113,7 +113,7 @@ class AdminCarriersControllerCore extends AdminController array('value' => Carrier::SORT_BY_DESC, 'name' => $this->l('Descending')) ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Carrier options'), 'fields' => array( diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index a8bf373e4..cb22fb25e 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -52,7 +52,7 @@ class AdminCountriesControllerCore extends AdminController 'dir' => 'st' ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Country options'), 'fields' => array( diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 53c71aeb0..ec1ad8a9b 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -53,7 +53,7 @@ class AdminCurrenciesControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->options = array( + $this->fields_options = array( 'change' => array( 'title' => $this->l('Currency rates'), 'image' => '../img/admin/exchangesrate.gif', diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 3c48841cc..a3773366c 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.php @@ -45,7 +45,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController ) ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), 'icon' => 'tab-preferences', diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 6f2bbe6e3..9a8f34d67 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -129,7 +129,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $this->shopLinkType = 'shop'; - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Customer service options'), 'fields' => array( diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php index d67f810f6..3ba68904e 100644 --- a/controllers/admin/AdminDeliverySlipController.php +++ b/controllers/admin/AdminDeliverySlipController.php @@ -33,7 +33,7 @@ class AdminDeliverySlipControllerCore extends AdminController $this->context = Context::getContext(); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Delivery slip options'), 'fields' => array( diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index e7ce0e576..625969ad1 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -37,7 +37,7 @@ class AdminEmailsControllerCore extends AdminController foreach (Contact::getContacts($this->context->language->id) as $contact) $arr[] = array('email_message' => $contact['id_contact'], 'name' => $contact['name']); - $this->options = array( + $this->fields_options = array( 'email' => array( 'title' => $this->l('E-mail'), 'icon' => 'email', diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index d154c134a..cf0731a01 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -80,7 +80,7 @@ class AdminEmployeesControllerCore extends AdminController 'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'width' => 30), ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Employee options'), 'fields' => array( diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php index 8ae4834f7..2e3795929 100755 --- a/controllers/admin/AdminGeolocationController.php +++ b/controllers/admin/AdminGeolocationController.php @@ -31,7 +31,7 @@ class AdminGeolocationControllerCore extends AdminController { parent::__construct(); - $this->options = array( + $this->fields_options = array( 'geolocationConfiguration' => array( 'title' => $this->l('Geolocation by IP address:'), 'icon' => 'world', @@ -121,7 +121,7 @@ class AdminGeolocationControllerCore extends AdminController public function renderOptions() { // This field is not declared in class constructor because we want it to be manually post processed - $this->options['geolocationCountries']['fields']['countries'] = array( + $this->fields_options['geolocationCountries']['fields']['countries'] = array( 'title' => $this->l('Select countries that can access your store:'), 'type' => 'checkbox_table', 'identifier' => 'iso_code', diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 789e7d5a7..848652fa0 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -46,7 +46,7 @@ class AdminImagesControllerCore extends AdminController 'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5) ); - $this->options = array( + $this->fields_options = array( 'images' => array( 'title' => $this->l('Images'), 'icon' => 'tab-orders', diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php index d9ad39e8f..bc9c3d307 100644 --- a/controllers/admin/AdminInvoicesController.php +++ b/controllers/admin/AdminInvoicesController.php @@ -33,7 +33,7 @@ class AdminInvoicesControllerCore extends AdminController parent::__construct(); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Invoice options'), 'fields' => array( diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index cb21d41e7..1c6a9d5a5 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -34,7 +34,7 @@ class AdminLocalizationControllerCore extends AdminController parent::__construct(); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Configuration'), 'fields' => array( @@ -130,7 +130,7 @@ class AdminLocalizationControllerCore extends AdminController ); if (function_exists('date_default_timezone_set')) - $this->options['general']['fields']['PS_TIMEZONE'] = array( + $this->fields_options['general']['fields']['PS_TIMEZONE'] = array( 'title' => $this->l('Time Zone.'), 'validation' => 'isAnything', 'type' => 'select', diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index 52a9a8576..5a6a22e14 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -47,7 +47,7 @@ class AdminLogsControllerCore extends AdminController 'date_add' => array('title' => $this->l('Date'), 'width' => 150, 'align' => 'right', 'type' => 'datetime') ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Logs by e-mail'), 'fields' => array( diff --git a/controllers/admin/AdminMaintenanceController.php b/controllers/admin/AdminMaintenanceController.php index 1612b2bcd..cd87e0553 100644 --- a/controllers/admin/AdminMaintenanceController.php +++ b/controllers/admin/AdminMaintenanceController.php @@ -34,7 +34,7 @@ class AdminMaintenanceControllerCore extends AdminController parent::__construct(); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), 'icon' => 'tab-preferences', diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 5504098fe..a5bf41937 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -113,7 +113,7 @@ class AdminMetaControllerCore extends AdminController $robots_options['submit'] = $robots_submit; // List of options - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Set up URLs'), 'description' => $url_description, @@ -154,7 +154,7 @@ class AdminMetaControllerCore extends AdminController foreach (Dispatcher::getInstance()->default_routes[$routeID]['keywords'] as $keyword => $data) $keywords[] = ((isset($data['param'])) ? ''.$keyword.'*' : $keyword); - $this->options['routes']['fields']['PS_ROUTE_'.$routeID] = array( + $this->fields_options['routes']['fields']['PS_ROUTE_'.$routeID] = array( 'title' => $title, 'desc' => sprintf($this->l('Keywords: %s'), implode(', ', $keywords)), 'validation' => 'isString', @@ -418,7 +418,7 @@ class AdminMetaControllerCore extends AdminController if (Configuration::get('PS_REWRITING_SETTINGS')) $this->addAllRouteFields(); - if ($this->options && is_array($this->options)) + if ($this->fields_options && is_array($this->fields_options)) { $helper = new HelperOptions($this); $this->setHelperDisplay($helper); @@ -429,7 +429,7 @@ class AdminMetaControllerCore extends AdminController )); $helper->id = $this->id; $helper->tpl_vars = $this->tpl_option_vars; - $options = $helper->generateOptions($this->options); + $options = $helper->generateOptions($this->fields_options); return $options; } diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index fabe528a6..205d56031 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -59,7 +59,7 @@ class AdminOrderPreferencesControllerCore extends AdminController foreach (Tax::getTaxes($this->context->language->id) as $tax) $taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), 'icon' => 'tab-preferences', diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 1035af8a7..6b7a25142 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -34,7 +34,7 @@ class AdminPPreferencesControllerCore extends AdminController parent::__construct(); - $this->options = array( + $this->fields_options = array( 'products' => array( 'title' => $this->l('Products (general)'), 'fields' => array( diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php index fdff4b3f8..29c41fd34 100644 --- a/controllers/admin/AdminPreferencesController.php +++ b/controllers/admin/AdminPreferencesController.php @@ -98,7 +98,7 @@ class AdminPreferencesControllerCore extends AdminController $this->l('Please click here to use HTTPS protocol before enabling SSL.').''; } - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), 'icon' => 'tab-preferences', diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 1533d3793..6810c4e70 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -51,7 +51,7 @@ class AdminRequestSqlControllerCore extends AdminController 'sql' => array('title' => $this->l('Request'), 'width' => 500) ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Settings'), 'fields' => array( diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php index 9498f8b47..7cbe21bf0 100644 --- a/controllers/admin/AdminReturnController.php +++ b/controllers/admin/AdminReturnController.php @@ -43,7 +43,7 @@ class AdminReturnControllerCore extends AdminController 'date_add' => array('title' => $this->l('Date issued'), 'width' => 150, 'type' => 'date', 'align' => 'right'), ); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Merchandise return (RMA) options'), 'fields' => array( diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index f0798f8f7..a66fa1982 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -60,7 +60,7 @@ class AdminSearchConfControllerCore extends AdminController 'searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8); list($total, $indexed) = Db::getInstance()->getRow('SELECT COUNT(*) as "0", SUM(indexed) as "1" FROM '._DB_PREFIX_.'product'); - $this->options = array( + $this->fields_options = array( 'indexation' => array( 'title' => $this->l('Indexation'), 'icon' => 'search', @@ -201,7 +201,7 @@ class AdminSearchConfControllerCore extends AdminController */ public function renderOptions() { - if ($this->options && is_array($this->options)) + if ($this->fields_options && is_array($this->fields_options)) { $helper = new HelperOptions($this); $this->setHelperDisplay($helper); @@ -212,7 +212,7 @@ class AdminSearchConfControllerCore extends AdminController )); $helper->id = $this->id; $helper->tpl_vars = $this->tpl_option_vars; - $options = $helper->generateOptions($this->options); + $options = $helper->generateOptions($this->fields_options); return $options; } diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php index 84d1c80b5..c0a6b5034 100644 --- a/controllers/admin/AdminShippingController.php +++ b/controllers/admin/AdminShippingController.php @@ -39,7 +39,7 @@ class AdminShippingControllerCore extends AdminController if ($carrier['is_free']) unset($carriers[$key]); - $this->options = array( + $this->fields_options = array( 'handling' => array( 'title' => $this->l('Handling'), 'icon' => 'delivery', diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index f585e8823..01798f1db 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -74,7 +74,7 @@ class AdminShopControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?'))); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Shops options'), 'fields' => array( diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index df24c5ae2..f2a2a36e6 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -80,7 +80,7 @@ class AdminStockConfigurationControllerCore extends AdminController array(Configuration::get('PS_STOCK_MVT_TRANSFER_FROM')), -1); // defines options for StockMvt - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Options'), 'fields' => array( diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index 329ac33e4..5a0cde7a5 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -60,7 +60,7 @@ class AdminStoresControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Parameters'), 'fields' => array( @@ -523,7 +523,7 @@ class AdminStoresControllerCore extends AdminController if (!isset($fields[$key])) $fields[$key] = $formFields[$key]; - $this->options['contact'] = array( + $this->fields_options['contact'] = array( 'title' => $this->l('Contact details'), 'icon' => 'tab-contact', 'fields' => $fields, diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php index b0d5fed05..4009b3e9c 100644 --- a/controllers/admin/AdminTaxesController.php +++ b/controllers/admin/AdminTaxesController.php @@ -46,7 +46,7 @@ class AdminTaxesControllerCore extends AdminController if (Configuration::get('PS_USE_ECOTAX')) $ecotax_desc = $this->l('If you disable the ecotax, the ecotax for all your products will be set to 0'); - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Tax options'), 'fields' => array( @@ -60,7 +60,7 @@ class AdminTaxesControllerCore extends AdminController ); if (Configuration::get('PS_USE_ECOTAX')) - $this->options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array('title' => $this->l('Ecotax:'), 'desc' => $this->l('The tax to apply on the ecotax (e.g. French ecotax: 19.6%).'), + $this->fields_options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array('title' => $this->l('Ecotax:'), 'desc' => $this->l('The tax to apply on the ecotax (e.g. French ecotax: 19.6%).'), 'cast' => 'intval', 'type' => 'select', 'identifier' => 'id_tax', 'identifier' => 'id_tax_rules_group', 'list' => TaxRulesGroup::getTaxRulesGroupsForOptions()); parent::__construct(); diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index d689d0640..b9cfa2861 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -99,7 +99,7 @@ class AdminThemesControllerCore extends AdminController $this->can_display_themes = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP) ? true : false; - $this->options = array( + $this->fields_options = array( 'theme' => array( 'title' => sprintf($this->l('Select theme for shop %s'), $this->context->shop->name), 'description' => (!$this->can_display_themes) ? $this->l('You must select a shop from the above list if you want to select a theme') : '', @@ -640,7 +640,7 @@ class AdminThemesControllerCore extends AdminController */ public function renderOptions() { - if ($this->options && is_array($this->options)) + if ($this->fields_options && is_array($this->fields_options)) { $helper = new HelperOptions($this); $this->setHelperDisplay($helper); @@ -652,7 +652,7 @@ class AdminThemesControllerCore extends AdminController )); $helper->id = $this->id; $helper->tpl_vars = $this->tpl_option_vars; - $options = $helper->generateOptions($this->options); + $options = $helper->generateOptions($this->fields_options); return $options; } diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php index 4ee00d0e2..f3fffd6e9 100755 --- a/controllers/admin/AdminWebserviceController.php +++ b/controllers/admin/AdminWebserviceController.php @@ -62,7 +62,7 @@ class AdminWebserviceControllerCore extends AdminController ); if (file_exists(_PS_ROOT_DIR_.'/.htaccess')) - $this->options = array( + $this->fields_options = array( 'general' => array( 'title' => $this->l('Configuration'), 'fields' => array( @@ -182,7 +182,7 @@ class AdminWebserviceControllerCore extends AdminController */ public function renderOptions() { - if ($this->options && is_array($this->options)) + if ($this->fields_options && is_array($this->fields_options)) { $helper = new HelperOptions($this); $this->setHelperDisplay($helper); @@ -193,7 +193,7 @@ class AdminWebserviceControllerCore extends AdminController )); $helper->id = $this->id; $helper->tpl_vars = $this->tpl_option_vars; - $options = $helper->generateOptions($this->options); + $options = $helper->generateOptions($this->fields_options); return $options; } @@ -207,7 +207,6 @@ class AdminWebserviceControllerCore extends AdminController $this->display = ''; } - public function postProcess() { if (Tools::getValue('key') && strlen(Tools::getValue('key')) < 32)