diff --git a/classes/AdminController.php b/classes/AdminController.php index db7bd436c..0570f5b8f 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1292,19 +1292,19 @@ class AdminControllerCore extends Controller if (!$this->loadObject(true)) return; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); } else if ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) $this->loadObject(true); - $this->content .= $this->initView(); + $this->content .= $this->renderView(); } else if (!$this->ajax) { - $this->content .= $this->initList(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderList(); + $this->content .= $this->renderOptions(); } $this->context->smarty->assign(array( @@ -1344,9 +1344,9 @@ class AdminControllerCore extends Controller } /** - * Function used to initialise the list to display for this controller + * Function used to render the list to display for this controller */ - public function initList() + public function renderList() { if (!($this->fieldsDisplay && is_array($this->fieldsDisplay))) return false; @@ -1376,9 +1376,9 @@ class AdminControllerCore extends Controller } /** - * Override to init display of the view page + * Override to render the view page */ - public function initView() + public function renderView() { $helper = new HelperView($this); $this->setHelperDisplay($helper); @@ -1391,9 +1391,9 @@ class AdminControllerCore extends Controller } /** - * Function used to initialise the form to display for this controller + * Function used to render the form for this controller */ - public function initForm() + public function renderForm() { if (Tools::getValue('submitFormAjax')) $this->content .= $this->context->smarty->fetch($this->context->smarty->template_dir[0].'form_submit_ajax.tpl'); @@ -1422,9 +1422,9 @@ class AdminControllerCore extends Controller } /** - * Function used to initialise the options to display for this controller + * Function used to render the options for this controller */ - public function initOptions() + public function renderOptions() { if ($this->options && is_array($this->options)) { diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php index 37b247b04..9f1b0d0a6 100644 --- a/controllers/admin/AdminAccessController.php +++ b/controllers/admin/AdminAccessController.php @@ -41,10 +41,10 @@ class AdminAccessController extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { $current_profile = (int)$this->getCurrentProfileId(); $profiles = Profile::getProfiles($this->context->language->id); @@ -83,7 +83,7 @@ class AdminAccessController extends AdminController 'link' => $this->context->link ); - return parent::initForm(); + return parent::renderForm(); } /** @@ -101,7 +101,7 @@ class AdminAccessController extends AdminController if (!$this->loadObject(true)) return; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index bb9bae4e7..fd8f4c379 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -58,7 +58,7 @@ class AdminAddressesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->_select = 'cl.`name` as country'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON @@ -69,10 +69,10 @@ class AdminAddressesControllerCore extends AdminController foreach ($countries AS $country) $this->countriesArray[$country['id_country']] = $country['name']; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -273,7 +273,7 @@ class AdminAddressesControllerCore extends AdminController // merge address format with the rest of the form array_splice($this->fields_form['input'], 3, 0, $temp_fields); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminAliasesController.php b/controllers/admin/AdminAliasesController.php index 1be41df49..7fc0e9eec 100644 --- a/controllers/admin/AdminAliasesController.php +++ b/controllers/admin/AdminAliasesController.php @@ -53,7 +53,7 @@ class AdminAliasesControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -89,7 +89,7 @@ class AdminAliasesControllerCore extends AdminController $this->fields_value = array('alias' => $this->object->getAliases()); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php index 2f2df111c..6dbbcd6ed 100644 --- a/controllers/admin/AdminAttachmentsController.php +++ b/controllers/admin/AdminAttachmentsController.php @@ -56,7 +56,7 @@ class AdminAttachmentsControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -93,7 +93,7 @@ class AdminAttachmentsControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index 1555bda58..7fa3f90be 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -57,10 +57,10 @@ class AdminAttributesGroupsControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -68,7 +68,7 @@ class AdminAttributesGroupsControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::initList(); + return parent::renderList(); } /** @@ -154,10 +154,10 @@ class AdminAttributesGroupsControllerCore extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { $group_type = array( array( @@ -232,7 +232,7 @@ class AdminAttributesGroupsControllerCore extends AdminController if (!($obj = $this->loadObject(true))) return; - return parent::initForm(); + return parent::renderForm(); } public function initFormAttributes() @@ -341,7 +341,7 @@ class AdminAttributesGroupsControllerCore extends AdminController 'imageTextureUrl' => Tools::safeOutput($_SERVER['REQUEST_URI']).'&deleteImage=1' ); - return parent::initForm(); + return parent::renderForm(); } /** @@ -377,7 +377,7 @@ class AdminAttributesGroupsControllerCore extends AdminController { if (!($this->object = $this->loadObject(true))) return; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); } else if ($this->display == 'editAttributes') { @@ -388,8 +388,8 @@ class AdminAttributesGroupsControllerCore extends AdminController } else if ($this->display != 'view' && !$this->ajax) { - $this->content .= $this->initList(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderList(); + $this->content .= $this->renderOptions(); } $this->context->smarty->assign(array( diff --git a/controllers/admin/AdminBackupController.php b/controllers/admin/AdminBackupController.php index 902f67161..e43568b8a 100644 --- a/controllers/admin/AdminBackupController.php +++ b/controllers/admin/AdminBackupController.php @@ -69,16 +69,16 @@ class AdminBackupControllerCore extends AdminController ); } - public function initList() + public function renderList() { $this->addRowAction('view'); $this->addRowAction('delete'); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::initList(); + return parent::renderList(); } - public function initView() + public function renderView() { if (!($object = $this->loadObject())) $this->_errors[] = Tools::displayError('The object could not be loaded.'); @@ -88,14 +88,14 @@ class AdminBackupControllerCore extends AdminController else if ($object->error) $this->_errors[] = $object->error; - return parent::initView(); + return parent::renderView(); } public function initViewDownload() { $this->tpl_folder = $this->tpl_folder.'download/'; - return parent::initView(); + return parent::renderView(); } public function initToolbar() @@ -129,12 +129,12 @@ class AdminBackupControllerCore extends AdminController // Some controllers use the view action without an object if ($this->className) $this->loadObject(true); - $this->content .= $this->initView(); + $this->content .= $this->renderView(); } else if (!$this->ajax) { - $this->content .= $this->initList(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderList(); + $this->content .= $this->renderOptions(); } $this->context->smarty->assign(array( diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 696a547f6..9a8bf7233 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -147,7 +147,7 @@ class AdminCarriersControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->displayInformation( ' '.$this->l('How to create a new carrier?').' @@ -178,10 +178,10 @@ class AdminCarriersControllerCore extends AdminController $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier'; $this->_where = 'AND b.id_lang = '.$this->context->language->id; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -442,7 +442,7 @@ class AdminCarriersControllerCore extends AdminController $this->getFieldsValues($obj); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 1cacf7bd7..b8224157e 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -268,7 +268,7 @@ class AdminCartRulesControllerCore extends AdminController return $productRulesArray; } - public function initForm() + public function renderForm() { $back = Tools::safeOutput(Tools::getValue('back', '')); if (empty($back)) @@ -339,7 +339,7 @@ class AdminCartRulesControllerCore extends AdminController $this->content .= Context::getContext()->smarty->fetch('cart_rules/form.tpl'); $this->addJqueryUI('ui.datepicker'); - return parent::initForm(); + return parent::renderForm(); } public function displayAjaxSearchCartRuleVouchers() diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index cdce41c4e..005a97863 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -99,7 +99,7 @@ class AdminCartsController extends AdminController parent::__construct(); } - public function initView() + public function renderView() { if (!($cart = $this->loadObject(true))) return; @@ -178,7 +178,7 @@ class AdminCartsController extends AdminController 'customized_datas' => $customized_datas ); - return parent::initView(); + return parent::renderView(); } public function ajaxPreProcess() diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 53fae1ac9..3e767915e 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -95,7 +95,7 @@ class AdminCategoriesControllerCore extends AdminController $this->addJqueryPlugin('tagify'); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -113,7 +113,7 @@ class AdminCategoriesControllerCore extends AdminController $this->tpl_list_vars['categories_tree'] = $categories_tree; $this->tpl_list_vars['categories_name'] = $categories_name; - return parent::initList(); + return parent::renderList(); } public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) @@ -131,10 +131,10 @@ class AdminCategoriesControllerCore extends AdminController } } - public function initView() + public function renderView() { $this->initToolbar(); - return $this->initList(); + return $this->renderList(); } public function initToolbar() @@ -166,7 +166,7 @@ class AdminCategoriesControllerCore extends AdminController parent::initToolbar(); } - public function initForm() + public function renderForm() { $this->initToolbar(); $obj = $this->loadObject(true); @@ -315,7 +315,7 @@ class AdminCategoriesControllerCore extends AdminController foreach ($groups as $group) $this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], (in_array($group['id_group'], $carrier_groups_ids))); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php index 71f722e7a..b0061f557 100644 --- a/controllers/admin/AdminCmsCategoriesController.php +++ b/controllers/admin/AdminCmsCategoriesController.php @@ -54,10 +54,10 @@ class AdminCmsCategoriesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->initToolbar(); - return parent::initList(); + return parent::renderList(); } /** @@ -174,7 +174,7 @@ class AdminCmsCategoriesControllerCore extends AdminController parent::postProcess(true); } - public function initForm() + public function renderForm() { $this->display = 'edit'; $this->initToolbar(); @@ -273,6 +273,6 @@ class AdminCmsCategoriesControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } } diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php index e92f3291e..a914370d4 100644 --- a/controllers/admin/AdminCmsContentController.php +++ b/controllers/admin/AdminCmsContentController.php @@ -75,9 +75,9 @@ class AdminCmsContentControllerCore extends AdminController $this->adminCMS->token = $this->token; if ($this->display == 'edit_category') - $this->content .= $this->adminCMSCategories->initForm(); + $this->content .= $this->adminCMSCategories->renderForm(); elseif ($this->display == 'edit_page') - $this->content .= $this->adminCMS->initForm(); + $this->content .= $this->adminCMS->renderForm(); elseif ($this->display == 'view_page'){} else { @@ -93,9 +93,9 @@ class AdminCmsContentControllerCore extends AdminController if (Tools::getValue($tab.'Orderby') && Tools::getValue($tab.'Orderway')) $catBarIndex = preg_replace('/&'.$tab.'Orderby=([a-z _]*)&'.$tab.'Orderway=([a-z]*)/i', '', self::$currentIndex); - $this->content .= $this->adminCMSCategories->initList(); + $this->content .= $this->adminCMSCategories->renderList(); $this->adminCMS->id_cms_category = $id_cms_category; - $this->content .= $this->adminCMS->initList(); + $this->content .= $this->adminCMS->renderList(); $this->context->smarty->assign(array( 'cms_breadcrumb' => getPath($catBarIndex, $id_cms_category,'','','cms'), )); diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php index d6df031f3..0184f1fa2 100644 --- a/controllers/admin/AdminCmsController.php +++ b/controllers/admin/AdminCmsController.php @@ -58,7 +58,7 @@ class AdminCmsControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->display = 'edit'; $this->toolbar_btn['save-and-preview'] = array( @@ -170,10 +170,10 @@ class AdminCmsControllerCore extends AdminController 'active' => $this->object->active ); - return parent::initForm(); + return parent::renderForm(); } - public function initList() + public function renderList() { $this->toolbar_title = $this->l('Pages in this category'); $this->toolbar_btn['new'] = array( @@ -181,7 +181,7 @@ class AdminCmsControllerCore extends AdminController 'desc' => $this->l('Add new') ); - return parent::initList(); + return parent::renderList(); } public function displayList($token = NULL) diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php index 4f3be3437..78ae619b1 100644 --- a/controllers/admin/AdminContactsController.php +++ b/controllers/admin/AdminContactsController.php @@ -46,7 +46,7 @@ class AdminContactsControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -109,7 +109,7 @@ class AdminContactsControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } } diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index b839610de..f21abab2f 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -122,15 +122,15 @@ class AdminCountriesControllerCore extends AdminController $this->addJqueryPlugin('fieldselection'); } - public function initList() + public function renderList() { $this->_select = 'z.`name` AS zone'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'zone` z ON (z.`id_zone` = a.`id_zone`)'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { if (!($obj = $this->loadObject(true))) return; @@ -352,7 +352,7 @@ class AdminCountriesControllerCore extends AdminController 'class' => 'button' ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index de300373c..193246c05 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -82,7 +82,7 @@ class AdminCurrenciesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -90,10 +90,10 @@ class AdminCurrenciesControllerCore extends AdminController $this->_where = 'AND a.`deleted` = 0'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -247,7 +247,7 @@ class AdminCurrenciesControllerCore extends AdminController 'class' => 'button' ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 47cf9a829..1693164f4 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -418,7 +418,7 @@ class AdminCustomerThreadsControllerCore extends AdminController return $output; } - public function initView() + public function renderView() { $content = ''; $this->toolbar_title = $this->l('Customer Threads'); @@ -613,7 +613,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $content .= '
 
'; $this->content = $content; - return parent::initView(); + return parent::renderView(); } private function displayButton($content) @@ -627,7 +627,7 @@ class AdminCustomerThreadsControllerCore extends AdminController } - public function initOptions() + public function renderOptions() { if (Configuration::get('PS_SAV_IMAP_URL') && Configuration::get('PS_SAV_IMAP_PORT') @@ -637,7 +637,7 @@ class AdminCustomerThreadsControllerCore extends AdminController else $this->tpl_option_vars['use_sync'] = false; - return parent::initOptions(); + return parent::renderOptions(); } diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index c0496ac91..e48b5e70a 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -182,7 +182,7 @@ class AdminCustomersControllerCore extends AdminController $this->action = 'select_delete'; } - public function initList() + public function renderList() { $this->_select = '(YEAR(CURRENT_DATE)-YEAR(`birthday`)) - (RIGHT(CURRENT_DATE, 5) < RIGHT(birthday, 5)) AS `age`, ( SELECT c.date_add FROM '._DB_PREFIX_.'guest g @@ -192,10 +192,10 @@ class AdminCustomersControllerCore extends AdminController LIMIT 1 ) as connect'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { if (!($obj = $this->loadObject(true))) return; @@ -395,10 +395,10 @@ class AdminCustomersControllerCore extends AdminController foreach ($groups as $group) $this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], in_array($group['id_group'], $customer_groups_ids)); - return parent::initForm(); + return parent::renderForm(); } - public function initView() + public function renderView() { if (!($customer = $this->loadObject())) return; @@ -577,7 +577,7 @@ class AdminCustomersControllerCore extends AdminController 'show_toolbar' => true ); - return parent::initView(); + return parent::renderView(); } public function processDelete($token) diff --git a/controllers/admin/AdminDbController.php b/controllers/admin/AdminDbController.php index 820e53668..51e12eee6 100644 --- a/controllers/admin/AdminDbController.php +++ b/controllers/admin/AdminDbController.php @@ -106,8 +106,8 @@ class AdminDbControllerCore extends AdminController $this->display = 'options'; $this->initToolbar(); - $this->content .= $this->initOptions(); - $this->content .= $this->initForm(); + $this->content .= $this->renderOptions(); + $this->content .= $this->renderForm(); $this->context->smarty->assign(array( 'content' => $this->content, @@ -115,7 +115,7 @@ class AdminDbControllerCore extends AdminController )); } - public function initForm() + public function renderForm() { $engines = array(); $tab_engines = $this->getEngines(); @@ -158,7 +158,7 @@ class AdminDbControllerCore extends AdminController $this->show_toolbar = false; - return parent::initForm(); + return parent::renderForm(); } /* @@ -168,7 +168,7 @@ class AdminDbControllerCore extends AdminController For all issues, check the config/settings.inc.php file.'); $this->initToolbar(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderOptions(); $table_status = $this->getTablesStatus(); foreach ($table_status as $key => $table) diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php index 1cfb6c817..27adaa325 100644 --- a/controllers/admin/AdminDeliverySlipController.php +++ b/controllers/admin/AdminDeliverySlipController.php @@ -57,7 +57,7 @@ class AdminDeliverySlipControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -95,7 +95,7 @@ class AdminDeliverySlipControllerCore extends AdminController 'date_to' => date('Y-m-d') ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() @@ -121,9 +121,9 @@ class AdminDeliverySlipControllerCore extends AdminController public function initContent() { - $this->content .= $this->initForm().'
'; + $this->content .= $this->renderForm().'
'; $this->show_toolbar = false; - $this->content .= $this->initOptions(); + $this->content .= $this->renderOptions(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 4786c34e8..8f280eca9 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -96,16 +96,16 @@ class AdminEmployeesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->_select = 'pl.`name` AS profile'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'profile` p ON a.`id_profile` = p.`id_profile` LEFT JOIN `'._DB_PREFIX_.'profile_lang` pl ON (pl.`id_profile` = p.`id_profile` AND pl.`id_lang` = '.(int)$this->context->language->id.')'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { if (!($obj = $this->loadObject(true))) return; @@ -262,7 +262,7 @@ class AdminEmployeesControllerCore extends AdminController $this->fields_value['passwd'] = false; - return parent::initForm(); + return parent::renderForm(); } protected function _childValidation() diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index 673f9bfbd..5bc062abc 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -62,10 +62,10 @@ class AdminFeaturesControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -84,7 +84,7 @@ class AdminFeaturesControllerCore extends AdminController 'desc' => $this->l('Add new feature') ); - return parent::initList(); + return parent::renderList(); } /** @@ -151,10 +151,10 @@ class AdminFeaturesControllerCore extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { $this->toolbar_title = $this->l('Add a new feature'); $this->fields_form = array( @@ -190,7 +190,7 @@ class AdminFeaturesControllerCore extends AdminController 'class' => 'button' ); - return parent::initForm(); + return parent::renderForm(); } /** @@ -224,8 +224,8 @@ class AdminFeaturesControllerCore extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ public function initFormFeatureValue() { @@ -314,14 +314,14 @@ class AdminFeaturesControllerCore extends AdminController { if (!$this->loadObject(true)) return; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); } else if ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) $this->loadObject(true); - $this->content .= $this->initView(); + $this->content .= $this->renderView(); } else if ($this->display == 'editFeatureValue') { @@ -332,8 +332,8 @@ class AdminFeaturesControllerCore extends AdminController } else if (!$this->ajax) { - $this->content .= $this->initList(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderList(); + $this->content .= $this->renderOptions(); } } else diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 09aa6135e..043129302 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -89,7 +89,7 @@ class AdminGendersController extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -166,7 +166,7 @@ class AdminGendersController extends AdminController 'image' => $obj->getImage() ); - return parent::initForm(); + return parent::renderForm(); } public function displayGenderType($value, $tr) diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php index fb0e86aa5..02f400372 100755 --- a/controllers/admin/AdminGeolocationController.php +++ b/controllers/admin/AdminGeolocationController.php @@ -129,11 +129,11 @@ class AdminGeolocationControllerCore extends AdminController return parent::postProcess(); } - public function initOptions() + public function renderOptions() { $this->tpl_option_vars = array('allowed_countries' => explode(';', Configuration::get('PS_ALLOWED_COUNTRIES'))); - return parent::initOptions(); + return parent::renderOptions(); } public function initContent() diff --git a/controllers/admin/AdminGroupShopController.php b/controllers/admin/AdminGroupShopController.php index e35884b6f..9f91f3b01 100644 --- a/controllers/admin/AdminGroupShopController.php +++ b/controllers/admin/AdminGroupShopController.php @@ -66,7 +66,7 @@ class AdminGroupShopControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -207,7 +207,7 @@ class AdminGroupShopControllerCore extends AdminController if (isset($this->fields_import_form)) $this->tpl_form_vars = array_merge($this->tpl_form_vars, array('form_import' => $this->fields_import_form)); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 96776b001..c018e5309 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -68,7 +68,7 @@ class AdminGroupsController extends AdminController $this->addJqueryUi('ui.sortable'); } - public function initView() + public function renderView() { $this->context = Context::getContext(); if (!($group = $this->loadObject(true))) @@ -80,7 +80,7 @@ class AdminGroupsController extends AdminController 'categorieReductions' => $this->formatCategoryDiscountList($group->id) ); - return parent::initView(); + return parent::renderView(); } protected function initCustomersList($group) @@ -116,7 +116,7 @@ class AdminGroupsController extends AdminController return $helper->generateList($customer_list, $customer_fields_display); } - public function initForm() + public function renderForm() { if (!($group = $this->loadObject(true))) return; @@ -194,7 +194,7 @@ class AdminGroupsController extends AdminController ); $this->tpl_form_vars['categoryTreeView'] = Helper::renderAdminCategorieTree($trads, array(), 'id_category', true); - return parent::initForm(); + return parent::renderForm(); } diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 18106a46c..12e0bb327 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -343,7 +343,7 @@ class AdminImportController extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { if (!is_writable(_PS_ADMIN_DIR_.'/import/')) $this->displayWarning($this->l('directory import on admin directory must be writable (CHMOD 755 / 777)')); @@ -380,10 +380,10 @@ class AdminImportController extends AdminController 'available_fields' => $this->getAvailableFields() ); - return parent::initForm(); + return parent::renderForm(); } - public function initView() + public function renderView() { $this->addJS(_PS_JS_DIR_.'adminImport.js'); @@ -421,7 +421,7 @@ class AdminImportController extends AdminController 'data' => $data ); - return parent::initView(); + return parent::renderView(); } public function initToolbar() @@ -500,9 +500,9 @@ class AdminImportController extends AdminController // toolbar (save, cancel, new, ..) $this->initToolbar(); if ($this->display == 'import') - $this->content .= $this->initView(); + $this->content .= $this->renderView(); else - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminInformationController.php b/controllers/admin/AdminInformationController.php index 04849dd02..a2aeed229 100644 --- a/controllers/admin/AdminInformationController.php +++ b/controllers/admin/AdminInformationController.php @@ -33,7 +33,7 @@ class AdminInformationControllerCore extends AdminController parent::initContent(); } - public function initView() + public function renderView() { $this->tpl_view_vars = array( 'version' => array( @@ -62,7 +62,7 @@ class AdminInformationControllerCore extends AdminController $this->toolbar_title = $this->l('Tools : Informations'); unset($this->toolbar_btn['cancel']); - return parent::initView(); + return parent::renderView(); } /** diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php index 41868feaf..042e0c4cb 100644 --- a/controllers/admin/AdminInvoicesController.php +++ b/controllers/admin/AdminInvoicesController.php @@ -113,7 +113,7 @@ class AdminInvoicesControllerCore extends AdminController $this->tpl_form_vars = array('style' => 'float:left;'); $this->table = 'invoice_date'; $this->toolbar_title = $this->l('Print PDF invoices'); - return parent::initForm(); + return parent::renderForm(); } public function initFormByStatus() @@ -167,7 +167,7 @@ class AdminInvoicesControllerCore extends AdminController $this->table = 'invoice_status'; $this->show_toolbar = false; - return parent::initForm(); + return parent::renderForm(); } public function initContent() @@ -177,7 +177,7 @@ class AdminInvoicesControllerCore extends AdminController $this->content .= $this->initFormByDate(); $this->content .= $this->initFormByStatus(); $this->table = 'invoice'; - $this->content .= $this->initOptions(); + $this->content .= $this->renderOptions(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index 714fbfbc3..6849b8888 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -110,7 +110,7 @@ class AdminLanguagesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -119,10 +119,10 @@ class AdminLanguagesControllerCore extends AdminController $this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?', __CLASS__, true, false); $this->displayWarning($this->l('When you delete a language, all related translations in the database will be deleted.')); - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -290,7 +290,7 @@ class AdminLanguagesControllerCore extends AdminController $this->addJS(_PS_JS_DIR_.'checkLangPack.js'); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index 4222c91c7..1e994053b 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -123,10 +123,10 @@ class AdminLocalizationControllerCore extends AdminController parent::postProcess(); } - public function initForm() + public function renderForm() { $localizations_pack = false; - $this->tpl_option_vars['options_content'] = $this->initOptions(); + $this->tpl_option_vars['options_content'] = $this->renderOptions(); $xml_localization = Tools::simplexml_load_file('http://api.prestashop.com/rss/localization.xml'); if (!$xml_localization) @@ -216,19 +216,19 @@ class AdminLocalizationControllerCore extends AdminController ); $this->show_toolbar = false; - return parent::initForm(); + return parent::renderForm(); } public function initContent() { // toolbar (save, cancel, new, ..) $this->initToolbar(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderOptions(); if (!$this->loadObject(true)) return; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 9e4bcb808..2482af567 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -115,7 +115,7 @@ class AdminManufacturersControllerCore extends AdminController $this->context->smarty->assign('title_list', $this->l('List of manufacturers:')); - $this->content .= parent::initList(); + $this->content .= parent::renderList(); } public function initListManufacturerAddresses() @@ -200,11 +200,11 @@ class AdminManufacturersControllerCore extends AdminController $this->postProcess(); $this->initToolbar(); - $this->content .= parent::initList(); + $this->content .= parent::renderList(); } - public function initList() + public function renderList() { $this->initListManufacturer(); $this->initListManufacturerAddresses(); @@ -231,7 +231,7 @@ class AdminManufacturersControllerCore extends AdminController return $this->context->smarty->fetch('helper/list/list_action_edit.tpl'); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'tinymce' => true, @@ -359,7 +359,7 @@ class AdminManufacturersControllerCore extends AdminController )), ENT_COMPAT, 'UTF-8'); } - return parent::initForm(); + return parent::renderForm(); } public function initFormAddress() @@ -562,7 +562,7 @@ class AdminManufacturersControllerCore extends AdminController } } - public function initView() + public function renderView() { if (!($manufacturer = $this->loadObject())) return; @@ -610,7 +610,7 @@ class AdminManufacturersControllerCore extends AdminController 'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'), ); - return parent::initView(); + return parent::renderView(); } public function initContent() @@ -623,19 +623,19 @@ class AdminManufacturersControllerCore extends AdminController { if (!$this->loadObject(true)) return; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); } else if ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) $this->loadObject(true); - $this->content .= $this->initView(); + $this->content .= $this->renderView(); } else if (!$this->ajax) { - $this->content .= $this->initList(); - $this->content .= $this->initOptions(); + $this->content .= $this->renderList(); + $this->content .= $this->renderOptions(); } $this->context->smarty->assign(array( diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 74d309a3d..10ba841e5 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -100,7 +100,7 @@ class AdminMetaControllerCore extends AdminController ); } - public function initForm() + public function renderForm() { $files = Meta::getPages(true, ($this->object->page ? $this->object->page : false)); $pages = array(); @@ -172,7 +172,7 @@ class AdminMetaControllerCore extends AdminController 'class' => 'button' ) ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php index ff6c89ebd..aaed91d94 100644 --- a/controllers/admin/AdminModulesPositionsController.php +++ b/controllers/admin/AdminModulesPositionsController.php @@ -219,7 +219,7 @@ class AdminModulesPositionsControllerCore extends AdminController if (array_key_exists('addToHook', $_GET) OR array_key_exists('editGraft', $_GET) OR (Tools::isSubmit('submitAddToHook') AND $this->_errors)) { $this->display = 'edit'; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); } else $this->content .= $this->initMain(); @@ -287,7 +287,7 @@ class AdminModulesPositionsControllerCore extends AdminController return $this->context->smarty->fetch('modules_positions/list_modules.tpl'); } - public function initForm() + public function renderForm() { // Init toolbar $this->initToolbarTitle(); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index d4abfd3e7..ba0359ee6 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -83,9 +83,9 @@ class AdminOrdersControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { - parent::initForm(); + parent::renderForm(); $this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch')); $cart = new Cart((int)Tools::getValue('id_cart')); $this->context->smarty->assign(array( @@ -679,7 +679,7 @@ class AdminOrdersControllerCore extends AdminController parent::postProcess(); } - public function initView() + public function renderView() { $order = new Order(Tools::getValue('id_order')); if (!Validate::isLoadedObject($order)) @@ -759,7 +759,7 @@ class AdminOrdersControllerCore extends AdminController 'HOOK_ADMIN_ORDER' => Hook::exec('adminOrder', array('id_order' => $order->id)) ); - return parent::initView(); + return parent::renderView(); } public function ajaxProcessSearchCustomers() diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php index 9d0243dba..e6e82c81b 100644 --- a/controllers/admin/AdminPaymentController.php +++ b/controllers/admin/AdminPaymentController.php @@ -116,7 +116,7 @@ class AdminPaymentControllerCore extends AdminController return parent::initContent(); } - public function initView() + public function renderView() { // link to modules page if (isset($this->payment_modules[0])) @@ -192,7 +192,7 @@ class AdminPaymentControllerCore extends AdminController $this->toolbar_title = $this->l('Paiement'); unset($this->toolbar_btn['cancel']); - return parent::initView(); + return parent::renderView(); } } diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index 9be8ab953..ed12e8609 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -444,7 +444,7 @@ class AdminPerformanceController extends AdminController $this->tpl_form_vars['servers'] = CacheMemcache::getMemcachedServers(); } - public function initForm() + public function renderForm() { // Initialize fieldset for a form $this->initFieldsetSmarty(); @@ -457,7 +457,7 @@ class AdminPerformanceController extends AdminController // Activate multiple fieldset $this->multiple_fieldsets = true; - return parent::initForm(); + return parent::renderForm(); } public function initContent() @@ -477,7 +477,7 @@ class AdminPerformanceController extends AdminController $this->initToolbar(); $this->display = ''; - $this->content .= $this->initForm(); + $this->content .= $this->renderForm(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 49dd9a85e..eb2a8dc54 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1708,11 +1708,11 @@ class AdminProductsControllerCore extends AdminController parent::initContent(); } - public function initList() + public function renderList() { if (!Tools::getValue('id_category')) unset($this->fieldsDisplay['position']); - return parent::initList(); + return parent::renderList(); } public function ajaxProcessProductManufacturers() @@ -1865,7 +1865,7 @@ class AdminProductsControllerCore extends AdminController * * @return void */ - public function initForm() + public function renderForm() { if(!method_exists($this, 'initForm'.$this->action)) return ""; @@ -1905,7 +1905,7 @@ class AdminProductsControllerCore extends AdminController else return $this->tpl_form_vars['custom_form']; } - return parent::initForm(); + return parent::renderForm(); } public function getPreviewUrl(Product $product) diff --git a/controllers/admin/AdminRangePriceController.php b/controllers/admin/AdminRangePriceController.php index 4fa333862..78bd84ab1 100644 --- a/controllers/admin/AdminRangePriceController.php +++ b/controllers/admin/AdminRangePriceController.php @@ -50,7 +50,7 @@ class AdminRangePriceControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $currency = $this->context->currency; $carriers = Carrier::getCarriers((int)(Configuration::get('PS_LANG_DEFAULT')), true , false,false, NULL, Carrier::PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE); @@ -103,7 +103,7 @@ class AdminRangePriceControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) diff --git a/controllers/admin/AdminRangeWeightController.php b/controllers/admin/AdminRangeWeightController.php index f2d976ce7..e284c16cf 100644 --- a/controllers/admin/AdminRangeWeightController.php +++ b/controllers/admin/AdminRangeWeightController.php @@ -50,7 +50,7 @@ class AdminRangeWeightControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $carriers = Carrier::getCarriers($this->context->language->id, true , false, false, NULL, Carrier::PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE); foreach ($carriers AS $key => $carrier) @@ -101,7 +101,7 @@ class AdminRangeWeightControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php index eb51cc80f..0deac4975 100644 --- a/controllers/admin/AdminReferrersController.php +++ b/controllers/admin/AdminReferrersController.php @@ -141,7 +141,7 @@ class AdminReferrersControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { // Display list Referrers: $this->addRowAction('view'); @@ -166,10 +166,10 @@ class AdminReferrersControllerCore extends AdminController 'settings_form' => $this->displaySettings() ); - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $uri = Tools::getHttpHost(true, true).__PS_BASE_URI__; @@ -342,7 +342,7 @@ class AdminReferrersControllerCore extends AdminController $this->tpl_form_vars = array('uri' => $uri); - return parent::initForm(); + return parent::renderForm(); } public function displayCalendar($action = null, $table = null, $identifier = null, $id = null) @@ -397,7 +397,7 @@ class AdminReferrersControllerCore extends AdminController return parent::postProcess(); } - public function initView() + public function renderView() { $referrer = new Referrer((int)Tools::getValue('id_referrer')); @@ -424,7 +424,7 @@ class AdminReferrersControllerCore extends AdminController 'id_lang' => (int)$this->context->language->id ); - return parent::initView(); + return parent::renderView(); } } diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 7fa792430..505c3ec51 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -46,7 +46,7 @@ class AdminRequestSqlControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->displayWarning($this->l('When saving the query, only the request type "SELECT" are allowed.')); $this->displayInformation(' @@ -73,10 +73,10 @@ class AdminRequestSqlControllerCore extends AdminController ) ); - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -105,10 +105,10 @@ class AdminRequestSqlControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } - public function initView() + public function renderView() { if (!($obj = $this->loadObject(true))) return; @@ -133,7 +133,7 @@ class AdminRequestSqlControllerCore extends AdminController $this->tpl_view_vars = array( 'view' => $view ); - return parent::initView(); + return parent::renderView(); } public function _childValidation() diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php index 8563f8e8e..4361275f1 100644 --- a/controllers/admin/AdminReturnController.php +++ b/controllers/admin/AdminReturnController.php @@ -57,7 +57,7 @@ class AdminReturnControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -151,7 +151,7 @@ class AdminReturnControllerCore extends AdminController 'quantityDisplayed' => $quantityDisplayed, 'id_order_return' => $this->object->id, ); - return parent::initForm(); + return parent::renderForm(); } public function initToolbar() diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php index be8dcc5f0..e976f67d5 100644 --- a/controllers/admin/AdminScenesController.php +++ b/controllers/admin/AdminScenesController.php @@ -99,7 +99,7 @@ class AdminScenesControllerCore extends AdminController return true; } - public function initForm() + public function renderForm() { $this->initFieldsForm(); $content = ''; @@ -113,7 +113,7 @@ class AdminScenesControllerCore extends AdminController $products = $obj->getProducts(true, $this->context->language->id, false, $this->context); $this->tpl_form_vars['products'] = $obj->getProducts(true, $this->context->language->id, false, $this->context); - return parent::initForm(); + return parent::renderForm(); } public function initFieldsForm() diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index d684f414d..c4d21e1b3 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -225,13 +225,13 @@ class AdminSearchControllerCore extends AdminController $this->toolbar_title = $this->l('Search results'); } - public function initView() + public function renderView() { $this->tpl_view_vars['query'] = $this->query; $this->tpl_view_vars['show_toolbar'] = true; if (sizeof($this->_errors)) - return parent::initView(); + return parent::renderView(); else { $helper = new HelperList(); @@ -274,7 +274,7 @@ class AdminSearchControllerCore extends AdminController } $this->tpl_view_vars['customers'] = $view; } - return parent::initView(); + return parent::renderView(); } } } diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 2c5709462..75b1d9645 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -97,7 +97,7 @@ class AdminShopControllerCore extends AdminController parent::initContent(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -112,7 +112,7 @@ class AdminShopControllerCore extends AdminController ON (a.id_category = cl.id_category AND cl.id_lang='.(int)$this->context->language->id.')'; $this->_group = 'GROUP BY a.id_shop'; - return parent::initList(); + return parent::renderList(); } public function postProcess() @@ -159,7 +159,7 @@ class AdminShopControllerCore extends AdminController $this->addRowActionSkipList('delete', $shop_delete_list); } - public function initForm() + public function renderForm() { if (!($obj = $this->loadObject(true))) return; @@ -329,6 +329,6 @@ class AdminShopControllerCore extends AdminController if (isset($this->fields_import_form)) $this->tpl_form_vars = array_merge($this->tpl_form_vars, array('form_import' => $this->fields_import_form)); - return parent::initForm(); + return parent::renderForm(); } } diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index c3b276b99..584df416b 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -87,7 +87,7 @@ class AdminShopUrlControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); $this->addRowActionSkipList('delete', array(1)); @@ -98,10 +98,10 @@ class AdminShopUrlControllerCore extends AdminController $this->_select = 's.name AS shop_name, CONCAT(a.physical_uri, a.virtual_uri) AS uri'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'shop` s ON (s.id_shop = a.id_shop)'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -232,7 +232,7 @@ class AdminShopUrlControllerCore extends AdminController 'physical_uri' => Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'physical_uri') : $current_shop->physical_uri ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index f1b2c2770..43c454577 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -56,16 +56,16 @@ class AdminSlipControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -105,7 +105,7 @@ class AdminSlipControllerCore extends AdminController ); $this->show_toolbar = false; - return parent::initForm(); + return parent::renderForm(); } public function postProcess() @@ -132,8 +132,8 @@ class AdminSlipControllerCore extends AdminController public function initContent() { $this->initToolbar(); - $this->content .= $this->initList(); - $this->content .= $this->initForm(); + $this->content .= $this->renderList(); + $this->content .= $this->renderForm(); $this->context->smarty->assign(array( 'content' => $this->content, diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php index c09d66788..12822ee7c 100644 --- a/controllers/admin/AdminStatesController.php +++ b/controllers/admin/AdminStatesController.php @@ -79,15 +79,15 @@ class AdminStatesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->_select = 'z.`name` AS zone'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'zone` z ON (z.`id_zone` = a.`id_zone`)'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -168,7 +168,7 @@ class AdminStatesControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 392a0015b..3220288f7 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -43,7 +43,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor // Some controllers use the view action without an object if ($this->className) $this->loadObject(true); - $this->content .= $this->initView(); + $this->content .= $this->renderView(); } $this->content .= $this->displayMenu(); diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 4fcc137b7..13b1e22c8 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -99,14 +99,14 @@ class AdminStatusesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $list_orders_status = parent::initList(); + $list_orders_status = parent::renderList(); // Added new list @@ -150,7 +150,7 @@ class AdminStatusesControllerCore extends AdminController $this->postProcess(); $this->toolbar_title = $this->l('Return statuses'); - $list_orders_returns_status = parent::initList(); + $list_orders_returns_status = parent::renderList(); return $list_orders_status.$list_orders_returns_status; } @@ -176,7 +176,7 @@ class AdminStatusesControllerCore extends AdminController return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/manufacturers/list_action_edit_adresses.tpl'); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'tinymce' => true, @@ -314,7 +314,7 @@ class AdminStatusesControllerCore extends AdminController 'shipped_on' => $this->getFieldValue($obj, 'shipped') ); - return parent::initForm(); + return parent::renderForm(); } public function initFormStatus() diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index d5d297514..0464606ca 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -139,10 +139,10 @@ class AdminStockConfigurationController extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { // if we are managing StockMvtReason if (Tools::isSubmit('addstock_mvt_reason') || Tools::isSubmit('updatestock_mvt_reason')) @@ -366,14 +366,14 @@ class AdminStockConfigurationController extends AdminController } } - return parent::initForm(); + return parent::renderForm(); } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { /** * General messages displayed for all lists @@ -397,7 +397,7 @@ class AdminStockConfigurationController extends AdminController $this->_where = ' AND a.deleted = 0'; $this->toolbar_title = $this->l('Stock : Stock movements labels'); - $first_list = parent::initList(); + $first_list = parent::renderList(); /** * Second list @@ -418,8 +418,8 @@ class AdminStockConfigurationController extends AdminController } /* - * Help function for AdminStockConfigurationController::initList() - * @see AdminStockConfigurationController::initList() + * Help function for AdminStockConfigurationController::renderList() + * @see AdminStockConfigurationController::renderList() */ public function initSupplyOrderStatusList() { @@ -495,7 +495,7 @@ class AdminStockConfigurationController extends AdminController ), ); - return parent::initList(); + return parent::renderList(); } /** diff --git a/controllers/admin/AdminStockCoverController.php b/controllers/admin/AdminStockCoverController.php index 59b756475..b2fbde111 100644 --- a/controllers/admin/AdminStockCoverController.php +++ b/controllers/admin/AdminStockCoverController.php @@ -144,10 +144,10 @@ class AdminStockCoverControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { $this->addRowAction('details'); @@ -172,7 +172,7 @@ class AdminStockCoverControllerCore extends AdminController $this->displayInformation($this->l('Considering the coverage period choosen and the quantity of products/combinations that you sold, this interface gives you an idea of when one product will run out of stock.')); - return parent::initList(); + return parent::renderList(); } /** diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php index 4979e67a6..5ed4b0fc3 100644 --- a/controllers/admin/AdminStockInstantStateController.php +++ b/controllers/admin/AdminStockInstantStateController.php @@ -98,10 +98,10 @@ class AdminStockInstantStateControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { // query $this->_select = ' @@ -130,7 +130,7 @@ class AdminStockInstantStateControllerCore extends AdminController // displays help information $this->displayInformation($this->l('This interface allows you to display detailed informations on your stock, per warehouse.')); - return parent::initList(); + return parent::renderList(); } /** diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index ae7ab4dc2..dc45cbec4 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -79,10 +79,10 @@ class AdminStockManagementControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { $this->addRowAction('details'); $this->addRowAction('addstock'); @@ -103,14 +103,14 @@ class AdminStockManagementControllerCore extends AdminController $this->displayInformation($this->l('Through this interface, you can add and delete products for a given warehouse.')); $this->displayInformation($this->l('Also, you can transfer products between warehouses, or within one warehouse.')); - return parent::initList(); + return parent::renderList(); } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { $id_product = (int)Tools::getValue('id_product'); $id_product_attribute = (int)Tools::getValue('id_product_attribute'); @@ -967,7 +967,7 @@ class AdminStockManagementControllerCore extends AdminController if ($product_is_valid === true && $is_pack == false && $is_virtual == false) { // init form - $this->initForm(); + $this->renderForm(); $this->getlanguages(); $helper = new HelperForm(); diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index 031ed0c55..d66756080 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -112,10 +112,10 @@ class AdminStockMvtControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { // removes toolbar btn $this->toolbar_btn = array(); @@ -162,7 +162,7 @@ class AdminStockMvtControllerCore extends AdminController array_unshift($warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses'))); $this->tpl_list_vars['list_warehouses'] = $warehouses; - return parent::initList(); + return parent::renderList(); } /** diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index 8476060cf..c976f61ee 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -112,7 +112,7 @@ class AdminStoresControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -127,10 +127,10 @@ class AdminStoresControllerCore extends AdminController LEFT JOIN `'._DB_PREFIX_.'state` st ON (st.`id_state` = a.`id_state`)'; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -292,7 +292,7 @@ class AdminStoresControllerCore extends AdminController 'hours' => isset($hours_unserialized) ? $hours_unserialized : false ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminSubDomainsController.php b/controllers/admin/AdminSubDomainsController.php index dc2a80f2d..f22426110 100644 --- a/controllers/admin/AdminSubDomainsController.php +++ b/controllers/admin/AdminSubDomainsController.php @@ -64,10 +64,10 @@ class AdminSubDomainsControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->warnings[] = $this->l('Cookies are different on each subdomain of your Website. If you want to use the same cookie, please add here the subdomains used by your shop. The most common is "www".'); - return parent::initList(); + return parent::renderList(); } diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index ea955fb22..9450cbfb4 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -61,7 +61,7 @@ class AdminSuppliersControllerCore extends AdminController $this->addJqueryPlugin('tagify'); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -158,10 +158,10 @@ class AdminSuppliersControllerCore extends AdminController 'size' => $image ? filesize(_PS_SUPP_IMG_DIR_.'/'.$this->object->id.'.jpg') / 1000 : false ); - return parent::initForm(); + return parent::renderForm(); } - public function initView() + public function renderView() { $products = $this->object->getProductsLite($this->context->language->id); $total_product = count($products); @@ -203,7 +203,7 @@ class AdminSuppliersControllerCore extends AdminController 'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'), ); - return parent::initView(); + return parent::renderView(); } public function afterImageUpload() diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 557fc5137..8fa68e7c3 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -153,10 +153,10 @@ class AdminSupplyOrdersControllerCore extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { if (Tools::isSubmit('addsupply_order') || Tools::isSubmit('updatesupply_order') || @@ -295,7 +295,7 @@ class AdminSupplyOrdersControllerCore extends AdminController //specific discount display $this->object->discount_rate = Tools::ps_round($this->object->discount_rate, 4); - return parent::initForm(); + return parent::renderForm(); } } @@ -327,10 +327,10 @@ class AdminSupplyOrdersControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { $this->displayInformation($this->l('This interface allows you to manage supply orders.').'
'); $this->displayInformation($this->l('Also, you can create templates that you can later use to generate actual orders.').'
'); @@ -368,11 +368,12 @@ class AdminSupplyOrdersControllerCore extends AdminController LEFT JOIN `'._DB_PREFIX_.'warehouse` w ON (w.id_warehouse = a.id_warehouse)'; $this->_where = ' AND a.is_template = 0'; + if ($this->getCurrentWarehouse() != -1) $this->_where .= ' AND a.id_warehouse = '.$this->getCurrentWarehouse(); if ($this->getFilterStatus() != 0) $this->_where .= ' AND st.enclosed != 1'; - $first_list = parent::initList(); + $first_list = parent::renderList(); // second list : templates $second_list = null; @@ -403,7 +404,7 @@ class AdminSupplyOrdersControllerCore extends AdminController 'desc' => $this->l('Add new template') ); // inits list - $second_list = parent::initList(); + $second_list = parent::renderList(); return $first_list.$second_list; } @@ -1396,9 +1397,9 @@ class AdminSupplyOrdersControllerCore extends AdminController } /** - * @see AdminController::initView() + * @see AdminController::renderView() */ - public function initView() + public function renderView() { $this->show_toolbar = true; $this->toolbar_fix = false; @@ -1609,7 +1610,7 @@ class AdminSupplyOrdersControllerCore extends AdminController ); } - return parent::initView(); + return parent::renderView(); } /** diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index a6f0587cc..055e7eb36 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.php @@ -72,10 +72,10 @@ class AdminTabsControllerCore extends AdminController } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { $tabs = Tab::getTabs($this->context->language->id, 0); @@ -144,14 +144,14 @@ class AdminTabsControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -160,7 +160,7 @@ class AdminTabsControllerCore extends AdminController $this->_where = 'AND a.`id_parent` = 0'; $this->_orderBy = 'position'; - return parent::initList(); + return parent::renderList(); } /** diff --git a/controllers/admin/AdminTagsController.php b/controllers/admin/AdminTagsController.php index 57dfda37a..0f5371234 100644 --- a/controllers/admin/AdminTagsController.php +++ b/controllers/admin/AdminTagsController.php @@ -58,7 +58,7 @@ class AdminTagsControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -76,7 +76,7 @@ class AdminTagsControllerCore extends AdminController ON (l.`id_lang` = a.`id_lang`)'; $this->_group = 'GROUP BY a.name, a.id_lang'; - return parent::initList(); + return parent::renderList(); } public function postProcess() @@ -87,7 +87,7 @@ class AdminTagsControllerCore extends AdminController return parent::postProcess(); } - public function initForm() + public function renderForm() { if (!($obj = $this->loadObject(true))) return; @@ -125,7 +125,7 @@ class AdminTagsControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } } diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index e9ca341e7..44f5d6598 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -62,14 +62,14 @@ class AdminTaxRulesGroupControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::initList(); + return parent::renderList(); } public function initRulesList($id_group) @@ -130,10 +130,10 @@ class AdminTaxRulesGroupControllerCore extends AdminController $this->show_toolbar = false; - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -182,7 +182,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController if (!isset($obj->id)) { $this->no_back = false; - $content = parent::initForm(); + $content = parent::renderForm(); } else { @@ -191,7 +191,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController 'href' => '#', 'desc' => $this->l('Add new tax rule') ); - $content = parent::initForm(); + $content = parent::renderForm(); $this->tpl_folder = 'tax_rules/'; $content .= $this->initRuleForm(); diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php index 0f4d87cf6..d19883439 100644 --- a/controllers/admin/AdminTaxesController.php +++ b/controllers/admin/AdminTaxesController.php @@ -115,7 +115,7 @@ class AdminTaxesControllerCore extends AdminController return $tpl_enable->fetch(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -180,7 +180,7 @@ class AdminTaxesControllerCore extends AdminController ) ); - return parent::initForm(); + return parent::renderForm(); } public function postProcess() diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php index 9c0b53e58..aa851dd18 100644 --- a/controllers/admin/AdminTrackingController.php +++ b/controllers/admin/AdminTrackingController.php @@ -92,7 +92,7 @@ class AdminTrackingController extends AdminController $this->tpl_list_vars = array('sub_title' => $this->l('List of empty categories:')); - return parent::initList(); + return parent::renderList(); } public function getCustomListProductsAttributesNoStock() @@ -130,7 +130,7 @@ class AdminTrackingController extends AdminController $this->tpl_list_vars = array('sub_title' => $this->l('List of products with attributes and without available quantities for sale:')); - return parent::initList(); + return parent::renderList(); } public function getCustomListProductsNoStock() @@ -168,7 +168,7 @@ class AdminTrackingController extends AdminController $this->tpl_list_vars = array('sub_title' => $this->l('List of products without attributes and without available quantities for sale:')); - return parent::initList(); + return parent::renderList(); } public function getCustomListProductsDisabled() @@ -195,7 +195,7 @@ class AdminTrackingController extends AdminController 'name' => array('title' => $this->l('Name')) ); - return parent::initList(); + return parent::renderList(); } public function clearListOptions() diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 262435490..2f3570667 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -117,7 +117,7 @@ class AdminTranslationsControllerCore extends AdminController $this->toolbar_fix = false; $this->base_tpl_view = 'main.tpl'; - return parent::initView(); + return parent::renderView(); } /** @@ -895,7 +895,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_form.tpl'; - return parent::initView(); + return parent::renderView(); } public function initFormBack($lang) @@ -1049,7 +1049,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_form.tpl'; - return parent::initView(); + return parent::renderView(); } public function initFormErrors($lang) @@ -1105,7 +1105,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_errors.tpl'; - return parent::initView(); + return parent::renderView(); } public function initFormFields($lang) @@ -1170,7 +1170,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_form.tpl'; - return parent::initView(); + return parent::renderView(); } /** @@ -1520,7 +1520,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_mails.tpl'; - return parent::initView(); + return parent::renderView(); } protected static function getSubjectMail($directory, $subject_mail) @@ -1706,7 +1706,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_modules.tpl'; - return parent::initView(); + return parent::renderView(); } } @@ -1806,7 +1806,7 @@ class AdminTranslationsControllerCore extends AdminController $this->initToolbar(); $this->base_tpl_view = 'translation_form.tpl'; - return parent::initView(); + return parent::renderView(); } /** diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 07b8989a3..e45db7349 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -76,10 +76,10 @@ class AdminWarehousesControllerCore extends AdminController } /** - * AdminController::initList() override - * @see AdminController::initList() + * AdminController::renderList() override + * @see AdminController::renderList() */ - public function initList() + public function renderList() { // Checks access if (!($this->tabAccess['add'] === '1')) @@ -117,14 +117,14 @@ class AdminWarehousesControllerCore extends AdminController $this->displayInformation($this->l('Finally, you can see detailed informations on your stock per warehouse, such as its valuation, the number of products and quantities stored.')); - return parent::initList(); + return parent::renderList(); } /** - * AdminController::initForm() override - * @see AdminController::initForm() + * AdminController::renderForm() override + * @see AdminController::renderForm() */ - public function initForm() + public function renderForm() { // loads current warehouse if (!($obj = $this->loadObject(true))) @@ -361,7 +361,7 @@ class AdminWarehousesControllerCore extends AdminController $this->fields_value['ids_shops[]'] = $ids_shop; $this->fields_value['ids_carriers[]'] = $carriers; - return parent::initForm(); + return parent::renderForm(); } /** @@ -444,9 +444,9 @@ class AdminWarehousesControllerCore extends AdminController } /** - * @see AdminController::initView() + * @see AdminController::renderView() */ - public function initView() + public function renderView() { $this->displayInformation($this->l('This interface allows you to display detailed informations on your warehouse.').'
'); @@ -460,7 +460,7 @@ class AdminWarehousesControllerCore extends AdminController if (!Validate::isLoadedObject($warehouse) || !Validate::isLoadedObject($employee) || !Validate::isLoadedObject($currency)) - return parent::initView(); + return parent::renderView(); $this->tpl_view_vars = array( 'warehouse' => $warehouse, @@ -473,6 +473,6 @@ class AdminWarehousesControllerCore extends AdminController 'warehouse_quantities' => $warehouse->getQuantitiesofProducts(), ); - return parent::initView(); + return parent::renderView(); } } diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php index e26538b27..c800c4794 100755 --- a/controllers/admin/AdminWebserviceController.php +++ b/controllers/admin/AdminWebserviceController.php @@ -79,7 +79,7 @@ class AdminWebserviceControllerCore extends AdminController parent::__construct(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -158,7 +158,7 @@ class AdminWebserviceControllerCore extends AdminController 'permissions' => $permissions ); - return parent::initForm(); + return parent::renderForm(); } public function initContent() @@ -220,7 +220,7 @@ class AdminWebserviceControllerCore extends AdminController !$instance->useNormalPermissionBehaviour()) unset($this->_list[$k]); - $this->initList(); + $this->renderList(); } } diff --git a/controllers/admin/AdminZonesController.php b/controllers/admin/AdminZonesController.php index 471781285..338e6f27d 100644 --- a/controllers/admin/AdminZonesController.php +++ b/controllers/admin/AdminZonesController.php @@ -58,17 +58,17 @@ class AdminZonesControllerCore extends AdminController parent::__construct(); } - public function initList() + public function renderList() { $this->addRowAction('edit'); $this->addRowAction('delete'); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::initList(); + return parent::renderList(); } - public function initForm() + public function renderForm() { $this->fields_form = array( 'legend' => array( @@ -123,7 +123,7 @@ class AdminZonesControllerCore extends AdminController 'class' => 'button' ); - return parent::initForm(); + return parent::renderForm(); } }