From 3dcaa48850bf823b238391fbf9c3f085092010bc Mon Sep 17 00:00:00 2001
From: CHItA <mate.bartus@gmail.com>
Date: Sat, 13 Jun 2015 15:35:19 +0200
Subject: [ticket/13740] Move installer files to phpbb/install directory

PHPBB3-13740
---
 phpBB/phpbb/install/controller/installer_index.php | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 phpBB/phpbb/install/controller/installer_index.php

(limited to 'phpBB/phpbb/install/controller/installer_index.php')

diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
new file mode 100644
index 0000000000..3d5224f1be
--- /dev/null
+++ b/phpBB/phpbb/install/controller/installer_index.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\install\controller;
+
+class installer_index
+{
+	/**
+	 * @var helper
+	 */
+	protected $helper;
+
+	/**
+	 * @var \phpbb\language\language
+	 */
+	protected $language;
+
+	/**
+	 * @var \phpbb\template\template
+	 */
+	protected $template;
+
+	/**
+	 * @var string
+	 */
+	protected $phpbb_root_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param helper 					$helper
+	 * @param \phpbb\language\language	$language
+	 * @param \phpbb\template\template	$template
+	 * @param string					$phpbb_root_path
+	 */
+	public function __construct(helper $helper, \phpbb\language\language $language, \phpbb\template\template $template, $phpbb_root_path)
+	{
+		$this->helper = $helper;
+		$this->language = $language;
+		$this->template = $template;
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	public function handle($mode)
+	{
+		switch ($mode)
+		{
+			case "intro":
+				$title = $this->language->lang('INTRODUCTION_TITLE');
+				$body = $this->language->lang('INTRODUCTION_BODY');
+			break;
+			case "support":
+				$title = $this->language->lang('SUPPORT_TITLE');
+				$body = $this->language->lang('SUPPORT_BODY');
+			break;
+			case "license":
+				$title = $this->language->lang('LICENSE_TITLE');
+				$body = implode("<br/>\n", file($this->phpbb_root_path . 'docs/LICENSE.txt'));
+			break;
+		}
+
+		$this->template->assign_vars(array(
+			'TITLE'	=> $title,
+			'BODY'	=> $body,
+		));
+
+		return $this->helper->render('install_main.html', $title);
+	}
+}
-- 
cgit v1.2.1


From 97d08d6f56cf448fd4def8a4d29c570da91faa89 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 22 Jul 2015 03:16:16 +0200
Subject: [ticket/13740] Allow language change in the installer

PHPBB3-13740
---
 phpBB/phpbb/install/controller/installer_index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/install/controller/installer_index.php')

diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
index 3d5224f1be..0a1855f4e5 100644
--- a/phpBB/phpbb/install/controller/installer_index.php
+++ b/phpBB/phpbb/install/controller/installer_index.php
@@ -74,6 +74,6 @@ class installer_index
 			'BODY'	=> $body,
 		));
 
-		return $this->helper->render('install_main.html', $title);
+		return $this->helper->render('install_main.html', $title, true);
 	}
 }
-- 
cgit v1.2.1


From 3356130ce2adf82248cf64fcaa81a47713ce7987 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 22 Jul 2015 12:43:17 +0200
Subject: [ticket/13740] Separate new installer style templates

PHPBB3-13740
---
 phpBB/phpbb/install/controller/installer_index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/install/controller/installer_index.php')

diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
index 0a1855f4e5..8e1874984b 100644
--- a/phpBB/phpbb/install/controller/installer_index.php
+++ b/phpBB/phpbb/install/controller/installer_index.php
@@ -74,6 +74,6 @@ class installer_index
 			'BODY'	=> $body,
 		));
 
-		return $this->helper->render('install_main.html', $title, true);
+		return $this->helper->render('installer_main.html', $title, true);
 	}
 }
-- 
cgit v1.2.1


From 495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 26 Jul 2015 22:20:32 +0200
Subject: [ticket/13740] Move handle_language_select calls to the controllers

PHPBB3-13740
---
 phpBB/phpbb/install/controller/installer_index.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb/install/controller/installer_index.php')

diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
index 8e1874984b..c2d9572284 100644
--- a/phpBB/phpbb/install/controller/installer_index.php
+++ b/phpBB/phpbb/install/controller/installer_index.php
@@ -53,6 +53,8 @@ class installer_index
 
 	public function handle($mode)
 	{
+		$this->helper->handle_language_select();
+
 		switch ($mode)
 		{
 			case "intro":
-- 
cgit v1.2.1