diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-02 21:29:20 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-02 21:29:20 +0100 |
| commit | 03fba990747bb0eeda47c8247b5808257d1443b7 (patch) | |
| tree | a81f78974d37ed7182231aa8a9138d242824f61c /phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php | |
| parent | 724bd471a746d0fe2ef799091b943e671d21166e (diff) | |
| parent | 91f809dc3dc926ff858e5e53ee8cfed781c1aeaa (diff) | |
| download | forums-03fba990747bb0eeda47c8247b5808257d1443b7.tar forums-03fba990747bb0eeda47c8247b5808257d1443b7.tar.gz forums-03fba990747bb0eeda47c8247b5808257d1443b7.tar.bz2 forums-03fba990747bb0eeda47c8247b5808257d1443b7.tar.xz forums-03fba990747bb0eeda47c8247b5808257d1443b7.zip | |
Merge pull request #4017 from CHItA/ticket/14262
[ticket/14262] Move convertor to controller
* CHItA/ticket/14262:
[ticket/14262] Add error handling and small CS fixes
[ticket/14262] Remove converter template duplicate
[ticket/14262] Fix stage navigation
[ticket/14262] Move convertor to controller
Diffstat (limited to 'phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php')
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php index 1342ffa30f..31474ae4e9 100644 --- a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php @@ -72,6 +72,11 @@ class ajax_iohandler extends iohandler_base protected $download; /** + * @var array + */ + protected $redirect_url; + + /** * Constructor * * @param path_helper $path_helper @@ -89,6 +94,7 @@ class ajax_iohandler extends iohandler_base $this->nav_data = array(); $this->cookies = array(); $this->download = array(); + $this->redirect_url = array(); $this->file_status = ''; parent::__construct(); @@ -131,6 +137,14 @@ class ajax_iohandler extends iohandler_base */ public function add_user_form_group($title, $form) { + $this->form = $this->generate_form_render_data($title, $form); + } + + /** + * {@inheritdoc} + */ + public function generate_form_render_data($title, $form) + { $this->template->assign_block_vars('options', array( 'LEGEND' => $this->language->lang($title), 'S_LEGEND' => true, @@ -189,7 +203,7 @@ class ajax_iohandler extends iohandler_base 'form_install' => 'installer_form.html', )); - $this->form = $this->template->assign_display('form_install'); + return $this->template->assign_display('form_install'); } /** @@ -273,6 +287,12 @@ class ajax_iohandler extends iohandler_base $this->cookies = array(); } + if (!empty($this->redirect_url)) + { + $json_array['redirect'] = $this->redirect_url; + $this->redirect_url = array(); + } + return $json_array; } @@ -373,6 +393,15 @@ class ajax_iohandler extends iohandler_base } /** + * {@inheritdoc} + */ + public function redirect($url, $use_ajax = false) + { + $this->redirect_url = array('url' => $url, 'use_ajax' => $use_ajax); + $this->send_response(); + } + + /** * Callback function for language replacing * * @param array $matches |