mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/14262] Move convertor to controller

Browse Source 
PHPBB3-14262
This commit is contained in:
Mate Bartus
2015-10-28 15:00:11 +01:00
parent 10756f3f87
commit a649768e17
17 changed files with 3082 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
View File

@@ -71,6 +71,11 @@ class ajax_iohandler extends iohandler_base
*/
protected $download;
/**
* @var array
*/
protected $redirect_url;
/**
* Constructor
*
@@ -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();
@@ -130,6 +136,14 @@ class ajax_iohandler extends iohandler_base
* {@inheritdoc}
*/
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),
@@ -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;
}
@@ -372,6 +392,15 @@ class ajax_iohandler extends iohandler_base
$this->file_status = $this->template->assign_display('file_status');
}
/**
* {@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
*