From a649768e17d25bcf55ae539420abe4eb4b7a1ef1 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 28 Oct 2015 15:00:11 +0100
Subject: [ticket/14262] Move convertor to controller

PHPBB3-14262
---
 .../install/helper/iohandler/ajax_iohandler.php    | 31 +++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php')

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
@@ -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
 	 *
-- 
cgit v1.2.1