diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-28 15:00:11 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2016-01-29 00:03:44 +0100 |
| commit | a649768e17d25bcf55ae539420abe4eb4b7a1ef1 (patch) | |
| tree | f8441c9c77054d6a58bd1e8befa8842ef180be4a /phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php | |
| parent | 10756f3f87efac29448a48207548d5b71a3206b9 (diff) | |
| download | forums-a649768e17d25bcf55ae539420abe4eb4b7a1ef1.tar forums-a649768e17d25bcf55ae539420abe4eb4b7a1ef1.tar.gz forums-a649768e17d25bcf55ae539420abe4eb4b7a1ef1.tar.bz2 forums-a649768e17d25bcf55ae539420abe4eb4b7a1ef1.tar.xz forums-a649768e17d25bcf55ae539420abe4eb4b7a1ef1.zip | |
[ticket/14262] Move convertor to controller
PHPBB3-14262
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 |