Merge pull request #24 from Crizz0/issue/23

Fix preview display of Privacy Policy and overwrite of default phpBBs PP and ToU

Author: Crizz0

adm/style/acp_tou_ppsetup.html

@@ -33,10 +33,10 @@ <h1>{{ lang('ACP_TOU_PPSETUP_TITLE') }}</h1>
 
 	</fieldset>
 
-	{% if ACP_TOU_TOU_PREVIEW %}
+	{% if ACP_TOU_PREVIEW_PP %}
 	<fieldset>
 		<legend>{{ lang('ACP_TOU_INFO_PREVIEW_PP') }}</legend>
-		<p>{{ ACP_TOU_PREVIEW_OUTPUT }}</p>
+		<p>{{ ACP_TOU_PREVIEW_PP }}</p>
 	</fieldset>
 	{% endif %}
 

config/services.yml

@@ -8,6 +8,7 @@ services:
             - '@controller.helper'
             - '@user'
             - '@language'
+            - '@request'
             - '@template'
             - '%core.root_path%'
             - '%core.php_ext%'

controller/main.php

@@ -19,6 +19,9 @@ class main
 	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
+	/** @var \phpbb\request\request */
+	protected $request;
+
 	/** @var \phpbb\template\template */
 	protected $template;
 

event/main.php

@@ -24,6 +24,7 @@ static public function getSubscribedEvents()
 		return array(
 			'core.page_header'			=> 'page_header',
 			'core.user_add_modify_data' => 'user_add_modify',
+			'core.page_footer'			=> 'page_footer',
 		);
 	}
 
@@ -36,6 +37,9 @@ static public function getSubscribedEvents()
 	/** @var \phpbb\config\db_text */
 	protected $config_text;
 
+	/** @var \phpbb\request\request */
+	protected $request;
+
 	/** @var \phpbb\template\template */
 	protected $template;
 
@@ -63,6 +67,7 @@ static public function getSubscribedEvents()
 	 * @param \phpbb\auth\auth					$auth		Auth object
 	 * @param \phpbb\config\config 				$config
 	 * @param \phpbb\config\db_text				$config_text
+	 * @param \phpbb\request\request 			$request
 	 * @param \phpbb\template\template			$template	Template object
 	 * @param \phpbb\controller\helper			$helper 	Helper
 	 * @param \phpbb\language\language			$language
@@ -77,6 +82,7 @@ public function __construct(
 		\phpbb\controller\helper $helper,
 		\phpbb\user $user,
 		\phpbb\language\language $language,
+		\phpbb\request\request $request,
 		\phpbb\template\template $template,
 		$phpbb_root_path,
 		$php_ext)
@@ -90,6 +96,7 @@ public function __construct(
 		$this->user = $user;
 		$this->language =$language;
 		$this->template = $template;
+		$this->request = $request;
 	}
 
 	public function page_header($event)
@@ -163,6 +170,51 @@ public function page_header($event)
 		redirect($this->helper->route('phpbbde_tou_main_controller', [], false, false, \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_URL));
 	}
 
+	// Overwrite AGREEMENT_TEXT for ToU or PP
+	public function page_footer()
+	{
+		$mode = $this->request->variable('mode', '');
+		if (($mode == 'terms') && ($this->config['tou_use_custom_tou']))
+		{
+			$tou_data = $this->config_text->get_array(array(
+				'tou_custom_tou_text',
+				'tou_custom_tou_uid',
+				'tou_custom_tou_bitfield',
+				'tou_custom_tou_flags',
+			));
+
+			$tou_custom_tou_text = generate_text_for_display(
+				$tou_data['tou_custom_tou_text'],
+				$tou_data['tou_custom_tou_uid'],
+				$tou_data['tou_custom_tou_bitfield'],
+				$tou_data['tou_custom_tou_flags']
+			);
+			$this->template->assign_vars(array(
+				'AGREEMENT_TEXT'	=> sprintf($tou_custom_tou_text, $this->config['sitename'], generate_board_url()),
+			));
+		}
+		else if (($mode == 'privacy') && ($this->config['tou_use_custom_pp']))
+		{
+			$pp_data = $this->config_text->get_array(array(
+				'tou_custom_pp_text',
+				'tou_custom_pp_uid',
+				'tou_custom_pp_bitfield',
+				'tou_custom_pp_flags',
+			));
+
+			$tou_custom_pp_text = generate_text_for_display(
+				$pp_data['tou_custom_pp_text'],
+				$pp_data['tou_custom_pp_uid'],
+				$pp_data['tou_custom_pp_bitfield'],
+				$pp_data['tou_custom_pp_flags']
+			);
+			$this->template->assign_vars(array(
+				'AGREEMENT_TEXT'	=> sprintf($tou_custom_pp_text, $this->config['sitename'], generate_board_url()),
+			));
+		}
+	}
+
+
 	public function user_add_modify($event)
 	{
 		$sql_ary = $event['sql_ary'];