Ajout du FR

Ajout du FR + correction du "functions.php"

includes/acp/acp_ban.php

@@ -0,0 +1,298 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_ban
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $user, $template, $request, $phpbb_dispatcher;
+		global $phpbb_root_path, $phpEx;
+
+		if (!function_exists('user_ban'))
+		{
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		}
+
+		$bansubmit	= $request->is_set_post('bansubmit');
+		$unbansubmit = $request->is_set_post('unbansubmit');
+
+		$user->add_lang(array('acp/ban', 'acp/users'));
+		$this->tpl_name = 'acp_ban';
+		$form_key = 'acp_ban';
+		add_form_key($form_key);
+
+		if (($bansubmit || $unbansubmit) && !check_form_key($form_key))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		// Ban submitted?
+		if ($bansubmit)
+		{
+			// Grab the list of entries
+			$ban				= $request->variable('ban', '', true);
+			$ban_length			= $request->variable('banlength', 0);
+			$ban_length_other	= $request->variable('banlengthother', '');
+			$ban_exclude		= $request->variable('banexclude', 0);
+			$ban_reason			= $request->variable('banreason', '', true);
+			$ban_give_reason	= $request->variable('bangivereason', '', true);
+
+			if ($ban)
+			{
+				$abort_ban = false;
+				/**
+				* Use this event to modify the ban details before the ban is performed
+				*
+				* @event core.acp_ban_before
+				* @var	string	mode				One of the following: user, ip, email
+				* @var	string	ban					Either string or array with usernames, ips or email addresses
+				* @var	int		ban_length			Ban length in minutes
+				* @var	string	ban_length_other	Ban length as a date (YYYY-MM-DD)
+				* @var	bool	ban_exclude			Are we banning or excluding from another ban
+				* @var	string	ban_reason			Ban reason displayed to moderators
+				* @var	string	ban_give_reason		Ban reason displayed to the banned user
+				* @var	mixed	abort_ban			Either false, or an error message that is displayed to the user.
+				*									If a string is given the bans are not issued.
+				* @since 3.1.0-RC5
+				*/
+				$vars = array(
+					'mode',
+					'ban',
+					'ban_length',
+					'ban_length_other',
+					'ban_exclude',
+					'ban_reason',
+					'ban_give_reason',
+					'abort_ban',
+				);
+				extract($phpbb_dispatcher->trigger_event('core.acp_ban_before', compact($vars)));
+
+				if ($abort_ban)
+				{
+					trigger_error($abort_ban . adm_back_link($this->u_action));
+				}
+				user_ban($mode, $ban, $ban_length, $ban_length_other, $ban_exclude, $ban_reason, $ban_give_reason);
+
+				/**
+				* Use this event to perform actions after the ban has been performed
+				*
+				* @event core.acp_ban_after
+				* @var	string	mode				One of the following: user, ip, email
+				* @var	string	ban					Either string or array with usernames, ips or email addresses
+				* @var	int		ban_length			Ban length in minutes
+				* @var	string	ban_length_other	Ban length as a date (YYYY-MM-DD)
+				* @var	bool	ban_exclude			Are we banning or excluding from another ban
+				* @var	string	ban_reason			Ban reason displayed to moderators
+				* @var	string	ban_give_reason		Ban reason displayed to the banned user
+				* @since 3.1.0-RC5
+				*/
+				$vars = array(
+					'mode',
+					'ban',
+					'ban_length',
+					'ban_length_other',
+					'ban_exclude',
+					'ban_reason',
+					'ban_give_reason',
+				);
+				extract($phpbb_dispatcher->trigger_event('core.acp_ban_after', compact($vars)));
+
+				trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
+			}
+		}
+		else if ($unbansubmit)
+		{
+			$ban = $request->variable('unban', array(''));
+
+			if ($ban)
+			{
+				user_unban($mode, $ban);
+
+				trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
+			}
+		}
+
+		// Define language vars
+		$this->page_title = $user->lang[strtoupper($mode) . '_BAN'];
+
+		$l_ban_explain = $user->lang[strtoupper($mode) . '_BAN_EXPLAIN'];
+		$l_ban_exclude_explain = $user->lang[strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN'];
+		$l_unban_title = $user->lang[strtoupper($mode) . '_UNBAN'];
+		$l_unban_explain = $user->lang[strtoupper($mode) . '_UNBAN_EXPLAIN'];
+		$l_no_ban_cell = $user->lang[strtoupper($mode) . '_NO_BANNED'];
+
+		switch ($mode)
+		{
+			case 'user':
+				$l_ban_cell = $user->lang['USERNAME'];
+			break;
+
+			case 'ip':
+				$l_ban_cell = $user->lang['IP_HOSTNAME'];
+			break;
+
+			case 'email':
+				$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
+			break;
+		}
+
+		self::display_ban_options($mode);
+
+		$template->assign_vars(array(
+			'L_TITLE'				=> $this->page_title,
+			'L_EXPLAIN'				=> $l_ban_explain,
+			'L_UNBAN_TITLE'			=> $l_unban_title,
+			'L_UNBAN_EXPLAIN'		=> $l_unban_explain,
+			'L_BAN_CELL'			=> $l_ban_cell,
+			'L_BAN_EXCLUDE_EXPLAIN'	=> $l_ban_exclude_explain,
+			'L_NO_BAN_CELL'			=> $l_no_ban_cell,
+
+			'S_USERNAME_BAN'	=> ($mode == 'user') ? true : false,
+
+			'U_ACTION'			=> $this->u_action,
+			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_ban&amp;field=ban'),
+		));
+	}
+
+	/**
+	* Display ban options
+	*/
+	static public function display_ban_options($mode)
+	{
+		global $user, $db, $template;
+
+		// Ban length options
+		$ban_end_text = array(0 => $user->lang['PERMANENT'], 30 => $user->lang['30_MINS'], 60 => $user->lang['1_HOUR'], 360 => $user->lang['6_HOURS'], 1440 => $user->lang['1_DAY'], 10080 => $user->lang['7_DAYS'], 20160 => $user->lang['2_WEEKS'], 40320 => $user->lang['1_MONTH'], -1 => $user->lang['UNTIL'] . ' -&gt; ');
+
+		$ban_end_options = '';
+		foreach ($ban_end_text as $length => $text)
+		{
+			$ban_end_options .= '<option value="' . $length . '">' . $text . '</option>';
+		}
+
+		switch ($mode)
+		{
+			case 'user':
+
+				$field = 'username';
+
+				$sql = 'SELECT b.*, u.user_id, u.username, u.username_clean
+					FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u
+					WHERE (b.ban_end >= ' . time() . '
+							OR b.ban_end = 0)
+						AND u.user_id = b.ban_userid
+					ORDER BY u.username_clean ASC';
+			break;
+
+			case 'ip':
+
+				$field = 'ban_ip';
+
+				$sql = 'SELECT *
+					FROM ' . BANLIST_TABLE . '
+					WHERE (ban_end >= ' . time() . "
+							OR ban_end = 0)
+						AND ban_ip <> ''
+					ORDER BY ban_ip";
+			break;
+
+			case 'email':
+
+				$field = 'ban_email';
+
+				$sql = 'SELECT *
+					FROM ' . BANLIST_TABLE . '
+					WHERE (ban_end >= ' . time() . "
+							OR ban_end = 0)
+						AND ban_email <> ''
+					ORDER BY ban_email";
+			break;
+		}
+		$result = $db->sql_query($sql);
+
+		$banned_options = $excluded_options = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$option = '<option value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
+
+			if ($row['ban_exclude'])
+			{
+				$excluded_options[] = $option;
+			}
+			else
+			{
+				$banned_options[] = $option;
+			}
+
+			$time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
+
+			if ($time_length == 0)
+			{
+				// Banned permanently
+				$ban_length = $user->lang['PERMANENT'];
+			}
+			else if (isset($ban_end_text[$time_length]))
+			{
+				// Banned for a given duration
+				$ban_length = $user->lang('BANNED_UNTIL_DURATION', $ban_end_text[$time_length], $user->format_date($row['ban_end'], false, true));
+			}
+			else
+			{
+				// Banned until given date
+				$ban_length = $user->lang('BANNED_UNTIL_DATE', $user->format_date($row['ban_end'], false, true));
+			}
+
+			$template->assign_block_vars('bans', array(
+				'BAN_ID'		=> (int) $row['ban_id'],
+				'LENGTH'		=> $ban_length,
+				'A_LENGTH'		=> addslashes($ban_length),
+				'REASON'		=> $row['ban_reason'],
+				'A_REASON'		=> addslashes($row['ban_reason']),
+				'GIVE_REASON'	=> $row['ban_give_reason'],
+				'A_GIVE_REASON'	=> addslashes($row['ban_give_reason']),
+			));
+		}
+		$db->sql_freeresult($result);
+
+		$options = '';
+		if ($excluded_options)
+		{
+			$options .= '<optgroup label="' . $user->lang['OPTIONS_EXCLUDED'] . '">';
+			$options .= implode('', $excluded_options);
+			$options .= '</optgroup>';
+		}
+
+		if ($banned_options)
+		{
+			$options .= '<optgroup label="' . $user->lang['OPTIONS_BANNED'] . '">';
+			$options .= implode('', $banned_options);
+			$options .= '</optgroup>';
+		}
+
+		$template->assign_vars(array(
+			'S_BAN_END_OPTIONS'	=> $ban_end_options,
+			'S_BANNED_OPTIONS'	=> ($banned_options || $excluded_options) ? true : false,
+			'BANNED_OPTIONS'	=> $options,
+		));
+	}
+}

includes/acp/acp_bbcodes.php

@@ -0,0 +1,620 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_bbcodes
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
+		global $phpbb_log;
+
+		$user->add_lang('acp/posting');
+
+		// Set up general vars
+		$action	= $request->variable('action', '');
+		$bbcode_id = $request->variable('bbcode', 0);
+		$submit = $request->is_set_post('submit');
+
+		$this->tpl_name = 'acp_bbcodes';
+		$this->page_title = 'ACP_BBCODES';
+		$form_key = 'acp_bbcodes';
+
+		add_form_key($form_key);
+
+		if ($submit && !check_form_key($form_key))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		// Set up mode-specific vars
+		switch ($action)
+		{
+			case 'add':
+				$bbcode_match = $bbcode_tpl = $bbcode_helpline = '';
+				$display_on_posting = 0;
+			break;
+
+			case 'edit':
+				$sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline
+					FROM ' . BBCODES_TABLE . '
+					WHERE bbcode_id = ' . $bbcode_id;
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					trigger_error($user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$bbcode_match = $row['bbcode_match'];
+				$bbcode_tpl = htmlspecialchars($row['bbcode_tpl']);
+				$display_on_posting = $row['display_on_posting'];
+				$bbcode_helpline = $row['bbcode_helpline'];
+			break;
+
+			case 'modify':
+				$sql = 'SELECT bbcode_id, bbcode_tag
+					FROM ' . BBCODES_TABLE . '
+					WHERE bbcode_id = ' . $bbcode_id;
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					trigger_error($user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+			// No break here
+
+			case 'create':
+				$display_on_posting = $request->variable('display_on_posting', 0);
+
+				$bbcode_match = $request->variable('bbcode_match', '');
+				$bbcode_tpl = htmlspecialchars_decode($request->variable('bbcode_tpl', '', true));
+				$bbcode_helpline = $request->variable('bbcode_helpline', '', true);
+			break;
+		}
+
+		// Do major work
+		switch ($action)
+		{
+			case 'edit':
+			case 'add':
+
+				$tpl_ary = array(
+					'S_EDIT_BBCODE'		=> true,
+					'U_BACK'			=> $this->u_action,
+					'U_ACTION'			=> $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&amp;bbcode=$bbcode_id" : ''),
+
+					'L_BBCODE_USAGE_EXPLAIN'=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'),
+					'BBCODE_MATCH'			=> $bbcode_match,
+					'BBCODE_TPL'			=> $bbcode_tpl,
+					'BBCODE_HELPLINE'		=> $bbcode_helpline,
+					'DISPLAY_ON_POSTING'	=> $display_on_posting,
+				);
+
+				$bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR');
+
+				/**
+				* Modify custom bbcode template data before we display the add/edit form
+				*
+				* @event core.acp_bbcodes_edit_add
+				* @var	string	action			Type of the action: add|edit
+				* @var	array	tpl_ary			Array with custom bbcode add/edit data
+				* @var	int		bbcode_id		When editing: the bbcode id,
+				*								when creating: 0
+				* @var	array	bbcode_tokens	Array of bbcode tokens
+				* @since 3.1.0-a3
+				*/
+				$vars = array('action', 'tpl_ary', 'bbcode_id', 'bbcode_tokens');
+				extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_edit_add', compact($vars)));
+
+				$template->assign_vars($tpl_ary);
+
+				foreach ($bbcode_tokens as $token)
+				{
+					$template->assign_block_vars('token', array(
+						'TOKEN'		=> '{' . $token . '}',
+						'EXPLAIN'	=> ($token === 'LOCAL_URL') ? $user->lang(array('tokens', $token), generate_board_url() . '/') : $user->lang(array('tokens', $token)),
+					));
+				}
+
+				return;
+
+			break;
+
+			case 'modify':
+			case 'create':
+
+				$sql_ary = $hidden_fields = array();
+
+				/**
+				* Modify custom bbcode data before the modify/create action
+				*
+				* @event core.acp_bbcodes_modify_create
+				* @var	string	action				Type of the action: modify|create
+				* @var	array	sql_ary				Array with new bbcode data
+				* @var	int		bbcode_id			When editing: the bbcode id,
+				*									when creating: 0
+				* @var	bool	display_on_posting	Display bbcode on posting form
+				* @var	string	bbcode_match		The bbcode usage string to match
+				* @var	string	bbcode_tpl			The bbcode HTML replacement string
+				* @var	string	bbcode_helpline		The bbcode help line string
+				* @var	array	hidden_fields		Array of hidden fields for use when
+				*									submitting form when $warn_text is true
+				* @since 3.1.0-a3
+				*/
+				$vars = array(
+					'action',
+					'sql_ary',
+					'bbcode_id',
+					'display_on_posting',
+					'bbcode_match',
+					'bbcode_tpl',
+					'bbcode_helpline',
+					'hidden_fields',
+				);
+				extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars)));
+
+				$warn_text = preg_match('%<[^>]*\{text[\d]*\}[^>]*>%i', $bbcode_tpl);
+				if (!$warn_text || confirm_box(true))
+				{
+					$data = $this->build_regexp($bbcode_match, $bbcode_tpl);
+
+					// Make sure the user didn't pick a "bad" name for the BBCode tag.
+					$hard_coded = array('code', 'quote', 'quote=', 'attachment', 'attachment=', 'b', 'i', 'url', 'url=', 'img', 'size', 'size=', 'color', 'color=', 'u', 'list', 'list=', 'email', 'email=', 'flash', 'flash=');
+
+					if (($action == 'modify' && strtolower($data['bbcode_tag']) !== strtolower($row['bbcode_tag'])) || ($action == 'create'))
+					{
+						$sql = 'SELECT 1 as test
+							FROM ' . BBCODES_TABLE . "
+							WHERE LOWER(bbcode_tag) = '" . $db->sql_escape(strtolower($data['bbcode_tag'])) . "'";
+						$result = $db->sql_query($sql);
+						$info = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						// Grab the end, interrogate the last closing tag
+						if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded) || (preg_match('#\[/([^[]*)]$#', $bbcode_match, $regs) && in_array(strtolower($regs[1]), $hard_coded)))
+						{
+							trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+					}
+
+					if (substr($data['bbcode_tag'], -1) === '=')
+					{
+						$test = substr($data['bbcode_tag'], 0, -1);
+					}
+					else
+					{
+						$test = $data['bbcode_tag'];
+					}
+
+					if (!preg_match('%\\[' . $test . '[^]]*].*?\\[/' . $test . ']%s', $bbcode_match))
+					{
+						trigger_error($user->lang['BBCODE_OPEN_ENDED_TAG'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (strlen($data['bbcode_tag']) > 16)
+					{
+						trigger_error($user->lang['BBCODE_TAG_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (strlen($bbcode_match) > 4000)
+					{
+						trigger_error($user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (strlen($bbcode_helpline) > 255)
+					{
+						trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					$sql_ary = array_merge($sql_ary, array(
+						'bbcode_tag'				=> $data['bbcode_tag'],
+						'bbcode_match'				=> $bbcode_match,
+						'bbcode_tpl'				=> $bbcode_tpl,
+						'display_on_posting'		=> $display_on_posting,
+						'bbcode_helpline'			=> $bbcode_helpline,
+						'first_pass_match'			=> $data['first_pass_match'],
+						'first_pass_replace'		=> $data['first_pass_replace'],
+						'second_pass_match'			=> $data['second_pass_match'],
+						'second_pass_replace'		=> $data['second_pass_replace']
+					));
+
+					if ($action == 'create')
+					{
+						$sql = 'SELECT MAX(bbcode_id) as max_bbcode_id
+							FROM ' . BBCODES_TABLE;
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if ($row)
+						{
+							$bbcode_id = (int) $row['max_bbcode_id'] + 1;
+
+							// Make sure it is greater than the core bbcode ids...
+							if ($bbcode_id <= NUM_CORE_BBCODES)
+							{
+								$bbcode_id = NUM_CORE_BBCODES + 1;
+							}
+						}
+						else
+						{
+							$bbcode_id = NUM_CORE_BBCODES + 1;
+						}
+
+						if ($bbcode_id > BBCODE_LIMIT)
+						{
+							trigger_error($user->lang['TOO_MANY_BBCODES'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						$sql_ary['bbcode_id'] = (int) $bbcode_id;
+
+						$db->sql_query('INSERT INTO ' . BBCODES_TABLE . $db->sql_build_array('INSERT', $sql_ary));
+						$cache->destroy('sql', BBCODES_TABLE);
+						$phpbb_container->get('text_formatter.cache')->invalidate();
+
+						$lang = 'BBCODE_ADDED';
+						$log_action = 'LOG_BBCODE_ADD';
+					}
+					else
+					{
+						$sql = 'UPDATE ' . BBCODES_TABLE . '
+							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+							WHERE bbcode_id = ' . $bbcode_id;
+						$db->sql_query($sql);
+						$cache->destroy('sql', BBCODES_TABLE);
+						$phpbb_container->get('text_formatter.cache')->invalidate();
+
+						$lang = 'BBCODE_EDITED';
+						$log_action = 'LOG_BBCODE_EDIT';
+					}
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, $log_action, false, array($data['bbcode_tag']));
+
+					/**
+					* Event after a BBCode has been added or updated
+					*
+					* @event core.acp_bbcodes_modify_create_after
+					* @var	string	action		Type of the action: modify|create
+					* @var	int		bbcode_id	The id of the added or updated bbcode
+					* @var	array	sql_ary		Array with bbcode data (read only)
+					* @since 3.2.4-RC1
+					*/
+					$vars = array(
+						'action',
+						'bbcode_id',
+						'sql_ary',
+					);
+					extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create_after', compact($vars)));
+
+					trigger_error($user->lang[$lang] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					confirm_box(false, $user->lang['BBCODE_DANGER'], build_hidden_fields(array_merge($hidden_fields, array(
+						'action'				=> $action,
+						'bbcode'				=> $bbcode_id,
+						'bbcode_match'			=> $bbcode_match,
+						'bbcode_tpl'			=> htmlspecialchars($bbcode_tpl),
+						'bbcode_helpline'		=> $bbcode_helpline,
+						'display_on_posting'	=> $display_on_posting,
+						)))
+					, 'confirm_bbcode.html');
+				}
+
+			break;
+
+			case 'delete':
+
+				$sql = 'SELECT bbcode_tag
+					FROM ' . BBCODES_TABLE . "
+					WHERE bbcode_id = $bbcode_id";
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if ($row)
+				{
+					if (confirm_box(true))
+					{
+						$bbcode_tag = $row['bbcode_tag'];
+
+						$db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id");
+						$cache->destroy('sql', BBCODES_TABLE);
+						$phpbb_container->get('text_formatter.cache')->invalidate();
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_BBCODE_DELETE', false, array($bbcode_tag));
+
+						/**
+						* Event after a BBCode has been deleted
+						*
+						* @event core.acp_bbcodes_delete_after
+						* @var	string	action		Type of the action: delete
+						* @var	int		bbcode_id	The id of the deleted bbcode
+						* @var	string	bbcode_tag	The tag of the deleted bbcode
+						* @since 3.2.4-RC1
+						*/
+						$vars = array(
+							'action',
+							'bbcode_id',
+							'bbcode_tag',
+						);
+						extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_delete_after', compact($vars)));
+
+						if ($request->is_ajax())
+						{
+							$json_response = new \phpbb\json_response;
+							$json_response->send(array(
+								'MESSAGE_TITLE'	=> $user->lang['INFORMATION'],
+								'MESSAGE_TEXT'	=> $user->lang['BBCODE_DELETED'],
+								'REFRESH_DATA'	=> array(
+									'time'	=> 3
+								)
+							));
+						}
+					}
+					else
+					{
+						confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+							'bbcode'	=> $bbcode_id,
+							'i'			=> $id,
+							'mode'		=> $mode,
+							'action'	=> $action))
+						);
+					}
+				}
+
+			break;
+		}
+
+		$u_action = $this->u_action;
+
+		$template_data = array(
+			'U_ACTION'		=> $this->u_action . '&amp;action=add',
+		);
+
+		$sql_ary = array(
+			'SELECT'	=> 'b.*',
+			'FROM'		=> array(BBCODES_TABLE => 'b'),
+			'ORDER_BY'	=> 'b.bbcode_tag',
+		);
+
+		/**
+		*  Modify custom bbcode template data before we display the form
+		*
+		* @event core.acp_bbcodes_display_form
+		* @var	string	action			Type of the action: modify|create
+		* @var	array	sql_ary			The SQL array to get custom bbcode data
+		* @var	array	template_data	Array with form template data
+		* @var	string	u_action		The u_action link
+		* @since 3.1.0-a3
+		*/
+		$vars = array('action', 'sql_ary', 'template_data', 'u_action');
+		extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_display_form', compact($vars)));
+
+		$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
+
+		$template->assign_vars($template_data);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$bbcodes_array = array(
+				'BBCODE_TAG'		=> $row['bbcode_tag'],
+				'U_EDIT'			=> $u_action . '&amp;action=edit&amp;bbcode=' . $row['bbcode_id'],
+				'U_DELETE'			=> $u_action . '&amp;action=delete&amp;bbcode=' . $row['bbcode_id'],
+			);
+
+			/**
+			*  Modify display of custom bbcodes in the form
+			*
+			* @event core.acp_bbcodes_display_bbcodes
+			* @var	array	row				Array with current bbcode data
+			* @var	array	bbcodes_array	Array of bbcodes template data
+			* @var	string	u_action		The u_action link
+			* @since 3.1.0-a3
+			*/
+			$vars = array('bbcodes_array', 'row', 'u_action');
+			extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_display_bbcodes', compact($vars)));
+
+			$template->assign_block_vars('bbcodes', $bbcodes_array);
+
+		}
+		$db->sql_freeresult($result);
+	}
+
+	/*
+	* Build regular expression for custom bbcode
+	*/
+	function build_regexp(&$bbcode_match, &$bbcode_tpl)
+	{
+		$bbcode_match = trim($bbcode_match);
+		$bbcode_tpl = trim($bbcode_tpl);
+
+		// Allow unicode characters for URL|LOCAL_URL|RELATIVE_URL|INTTEXT tokens
+		$utf8 = preg_match('/(URL|LOCAL_URL|RELATIVE_URL|INTTEXT)/', $bbcode_match);
+
+		$fp_match = preg_quote($bbcode_match, '!');
+		$fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $bbcode_match);
+		$fp_replace = preg_replace('#\[/(.*?)\]$#', '[/$1:$uid]', $fp_replace);
+
+		$sp_match = preg_quote($bbcode_match, '!');
+		$sp_match = preg_replace('#^\\\\\[(.*?)\\\\\]#', '\[$1:$uid\]', $sp_match);
+		$sp_match = preg_replace('#\\\\\[/(.*?)\\\\\]$#', '\[/$1:$uid\]', $sp_match);
+		$sp_replace = $bbcode_tpl;
+
+		// @todo Make sure to change this too if something changed in message parsing
+		$tokens = array(
+			'URL'	 => array(
+				'!(?:(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))!ie'	=>	"\$this->bbcode_specialchars(('\$1') ? '\$1' : 'http://\$2')"
+			),
+			'LOCAL_URL'	 => array(
+				'!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e'	=>	"\$this->bbcode_specialchars('$1')"
+			),
+			'RELATIVE_URL'	=> array(
+				'!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e'	=>	"\$this->bbcode_specialchars('$1')"
+			),
+			'EMAIL' => array(
+				'!(' . get_preg_expression('email') . ')!ie'	=>	"\$this->bbcode_specialchars('$1')"
+			),
+			'TEXT' => array(
+				'!(.*?)!es'	 =>	"str_replace(array(\"\\r\\n\", '\\\"', '\\'', '(', ')'), array(\"\\n\", '\"', '&#39;', '&#40;', '&#41;'), trim('\$1'))"
+			),
+			'SIMPLETEXT' => array(
+				'!([a-zA-Z0-9-+.,_ ]+)!'	 =>	"$1"
+			),
+			'INTTEXT' => array(
+				'!([\p{L}\p{N}\-+,_. ]+)!u'	 =>	"$1"
+			),
+			'IDENTIFIER' => array(
+				'!([a-zA-Z0-9-_]+)!'	 =>	"$1"
+			),
+			'COLOR' => array(
+				'!([a-z]+|#[0-9abcdef]+)!i'	=>	'$1'
+			),
+			'NUMBER' => array(
+				'!([0-9]+)!'	=>	'$1'
+			)
+		);
+
+		$sp_tokens = array(
+			'URL'	 => '(?i)((?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))(?-i)',
+			'LOCAL_URL'	 => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
+			'RELATIVE_URL'	 => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
+			'EMAIL' => '(' . get_preg_expression('email') . ')',
+			'TEXT' => '(.*?)',
+			'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)',
+			'INTTEXT' => '([\p{L}\p{N}\-+,_. ]+)',
+			'IDENTIFIER' => '([a-zA-Z0-9-_]+)',
+			'COLOR' => '([a-zA-Z]+|#[0-9abcdefABCDEF]+)',
+			'NUMBER' => '([0-9]+)',
+		);
+
+		$pad = 0;
+		$modifiers = 'i';
+		$modifiers .= ($utf8) ? 'u' : '';
+
+		if (preg_match_all('/\{(' . implode('|', array_keys($tokens)) . ')[0-9]*\}/i', $bbcode_match, $m))
+		{
+			foreach ($m[0] as $n => $token)
+			{
+				$token_type = $m[1][$n];
+
+				reset($tokens[strtoupper($token_type)]);
+				list($match, $replace) = each($tokens[strtoupper($token_type)]);
+
+				// Pad backreference numbers from tokens
+				if (preg_match_all('/(?<!\\\\)\$([0-9]+)/', $replace, $repad))
+				{
+					$repad = $pad + count(array_unique($repad[0]));
+					$replace = preg_replace_callback('/(?<!\\\\)\$([0-9]+)/', function ($match) use ($pad) {
+						return '${' . ($match[1] + $pad) . '}';
+					}, $replace);
+					$pad = $repad;
+				}
+
+				// Obtain pattern modifiers to use and alter the regex accordingly
+				$regex = preg_replace('/!(.*)!([a-z]*)/', '$1', $match);
+				$regex_modifiers = preg_replace('/!(.*)!([a-z]*)/', '$2', $match);
+
+				for ($i = 0, $size = strlen($regex_modifiers); $i < $size; ++$i)
+				{
+					if (strpos($modifiers, $regex_modifiers[$i]) === false)
+					{
+						$modifiers .= $regex_modifiers[$i];
+
+						if ($regex_modifiers[$i] == 'e')
+						{
+							$fp_replace = "'" . str_replace("'", "\\'", $fp_replace) . "'";
+						}
+					}
+
+					if ($regex_modifiers[$i] == 'e')
+					{
+						$replace = "'.$replace.'";
+					}
+				}
+
+				$fp_match = str_replace(preg_quote($token, '!'), $regex, $fp_match);
+				$fp_replace = str_replace($token, $replace, $fp_replace);
+
+				$sp_match = str_replace(preg_quote($token, '!'), $sp_tokens[$token_type], $sp_match);
+
+				// Prepend the board url to local relative links
+				$replace_prepend = ($token_type === 'LOCAL_URL') ? generate_board_url() . '/' : '';
+
+				$sp_replace = str_replace($token, $replace_prepend . '${' . ($n + 1) . '}', $sp_replace);
+			}
+
+			$fp_match = '!' . $fp_match . '!' . $modifiers;
+			$sp_match = '!' . $sp_match . '!s' . (($utf8) ? 'u' : '');
+
+			if (strpos($fp_match, 'e') !== false)
+			{
+				$fp_replace = str_replace("'.'", '', $fp_replace);
+				$fp_replace = str_replace(".''.", '.', $fp_replace);
+			}
+		}
+		else
+		{
+			// No replacement is present, no need for a second-pass pattern replacement
+			// A simple str_replace will suffice
+			$fp_match = '!' . $fp_match . '!' . $modifiers;
+			$sp_match = $fp_replace;
+			$sp_replace = '';
+		}
+
+		// Lowercase tags
+		$bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+).*/i', '$1', $bbcode_match);
+		$bbcode_search = preg_replace('/.*?\[([a-z0-9_-]+).*/i', '$1', $bbcode_match);
+
+		if (!preg_match('/^[a-zA-Z0-9_-]+$/', $bbcode_tag))
+		{
+			global $user;
+			trigger_error($user->lang['BBCODE_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		$fp_match = preg_replace_callback('#\[/?' . $bbcode_search . '#i', function ($match) {
+			return strtolower($match[0]);
+		}, $fp_match);
+		$fp_replace = preg_replace_callback('#\[/?' . $bbcode_search . '#i', function ($match) {
+			return strtolower($match[0]);
+		}, $fp_replace);
+		$sp_match = preg_replace_callback('#\[/?' . $bbcode_search . '#i', function ($match) {
+			return strtolower($match[0]);
+		}, $sp_match);
+		$sp_replace = preg_replace_callback('#\[/?' . $bbcode_search . '#i', function ($match) {
+			return strtolower($match[0]);
+		}, $sp_replace);
+
+		return array(
+			'bbcode_tag'				=> $bbcode_tag,
+			'first_pass_match'			=> $fp_match,
+			'first_pass_replace'		=> $fp_replace,
+			'second_pass_match'			=> $sp_match,
+			'second_pass_replace'		=> $sp_replace
+		);
+	}
+}

includes/acp/acp_bots.php

@@ -0,0 +1,427 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_bots
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $template, $cache, $request, $phpbb_log;
+		global $phpbb_root_path, $phpEx;
+
+		$action = $request->variable('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
+		$mark	= $request->variable('mark', array(0));
+		$bot_id	= $request->variable('id', 0);
+
+		if (isset($_POST['add']))
+		{
+			$action = 'add';
+		}
+
+		$error = array();
+
+		$user->add_lang('acp/bots');
+		$this->tpl_name = 'acp_bots';
+		$this->page_title = 'ACP_BOTS';
+		$form_key = 'acp_bots';
+		add_form_key($form_key);
+
+		if ($submit && !check_form_key($form_key))
+		{
+			$error[] = $user->lang['FORM_INVALID'];
+		}
+
+		// User wants to do something, how inconsiderate of them!
+		switch ($action)
+		{
+			case 'activate':
+				if ($bot_id || count($mark))
+				{
+					$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
+
+					$sql = 'UPDATE ' . BOTS_TABLE . "
+						SET bot_active = 1
+						WHERE bot_id $sql_id";
+					$db->sql_query($sql);
+				}
+
+				$cache->destroy('_bots');
+			break;
+
+			case 'deactivate':
+				if ($bot_id || count($mark))
+				{
+					$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
+
+					$sql = 'UPDATE ' . BOTS_TABLE . "
+						SET bot_active = 0
+						WHERE bot_id $sql_id";
+					$db->sql_query($sql);
+				}
+
+				$cache->destroy('_bots');
+			break;
+
+			case 'delete':
+				if ($bot_id || count($mark))
+				{
+					if (confirm_box(true))
+					{
+						// We need to delete the relevant user, usergroup and bot entries ...
+						$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
+
+						$sql = 'SELECT bot_name, user_id
+							FROM ' . BOTS_TABLE . "
+							WHERE bot_id $sql_id";
+						$result = $db->sql_query($sql);
+
+						$user_id_ary = $bot_name_ary = array();
+						while ($row = $db->sql_fetchrow($result))
+						{
+							$user_id_ary[] = (int) $row['user_id'];
+							$bot_name_ary[] = $row['bot_name'];
+						}
+						$db->sql_freeresult($result);
+
+						$db->sql_transaction('begin');
+
+						$sql = 'DELETE FROM ' . BOTS_TABLE . "
+							WHERE bot_id $sql_id";
+						$db->sql_query($sql);
+
+						if (count($user_id_ary))
+						{
+							$_tables = array(USERS_TABLE, USER_GROUP_TABLE);
+							foreach ($_tables as $table)
+							{
+								$sql = "DELETE FROM $table
+									WHERE " . $db->sql_in_set('user_id', $user_id_ary);
+								$db->sql_query($sql);
+							}
+						}
+
+						$db->sql_transaction('commit');
+
+						$cache->destroy('_bots');
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_BOT_DELETE', false, array(implode(', ', $bot_name_ary)));
+						trigger_error($user->lang['BOT_DELETED'] . adm_back_link($this->u_action));
+					}
+					else
+					{
+						confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+							'mark'		=> $mark,
+							'id'		=> $bot_id,
+							'mode'		=> $mode,
+							'action'	=> $action))
+						);
+					}
+				}
+			break;
+
+			case 'edit':
+			case 'add':
+
+				if (!function_exists('user_update_name'))
+				{
+					include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+				}
+
+				$bot_row = array(
+					'bot_name'		=> $request->variable('bot_name', '', true),
+					'bot_agent'		=> $request->variable('bot_agent', ''),
+					'bot_ip'		=> $request->variable('bot_ip', ''),
+					'bot_active'	=> $request->variable('bot_active', true),
+					'bot_lang'		=> $request->variable('bot_lang', $config['default_lang']),
+					'bot_style'		=> $request->variable('bot_style' , $config['default_style']),
+				);
+
+				if ($submit)
+				{
+					if (!$bot_row['bot_agent'] && !$bot_row['bot_ip'])
+					{
+						$error[] = $user->lang['ERR_BOT_NO_MATCHES'];
+					}
+
+					if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip']))
+					{
+						if (!$ip_list = gethostbynamel($bot_row['bot_ip']))
+						{
+							$error[] = $user->lang['ERR_BOT_NO_IP'];
+						}
+						else
+						{
+							$bot_row['bot_ip'] = implode(',', $ip_list);
+						}
+					}
+					$bot_row['bot_ip'] = str_replace(' ', '', $bot_row['bot_ip']);
+
+					// Make sure the admin is not adding a bot with an user agent similar to his one
+					if ($bot_row['bot_agent'] && substr($user->data['session_browser'], 0, 149) === substr($bot_row['bot_agent'], 0, 149))
+					{
+						$error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA'];
+					}
+
+					$bot_name = false;
+					if ($bot_id)
+					{
+						$sql = 'SELECT u.username_clean
+							FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u
+							WHERE b.bot_id = $bot_id
+								AND u.user_id = b.user_id";
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if (!$bot_row)
+						{
+							$error[] = $user->lang['NO_BOT'];
+						}
+						else
+						{
+							$bot_name = $row['username_clean'];
+						}
+					}
+					if (!$this->validate_botname($bot_row['bot_name'], $bot_name))
+					{
+						$error[] = $user->lang['BOT_NAME_TAKEN'];
+					}
+
+					if (!count($error))
+					{
+						// New bot? Create a new user and group entry
+						if ($action == 'add')
+						{
+							$sql = 'SELECT group_id, group_colour
+								FROM ' . GROUPS_TABLE . "
+								WHERE group_name = 'BOTS'
+									AND group_type = " . GROUP_SPECIAL;
+							$result = $db->sql_query($sql);
+							$group_row = $db->sql_fetchrow($result);
+							$db->sql_freeresult($result);
+
+							if (!$group_row)
+							{
+								trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
+							}
+
+							$user_id = user_add(array(
+								'user_type'				=> (int) USER_IGNORE,
+								'group_id'				=> (int) $group_row['group_id'],
+								'username'				=> (string) $bot_row['bot_name'],
+								'user_regdate'			=> time(),
+								'user_password'			=> '',
+								'user_colour'			=> (string) $group_row['group_colour'],
+								'user_email'			=> '',
+								'user_lang'				=> (string) $bot_row['bot_lang'],
+								'user_style'			=> (int) $bot_row['bot_style'],
+								'user_allow_massemail'	=> 0,
+							));
+
+							$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								'user_id'		=> (int) $user_id,
+								'bot_name'		=> (string) $bot_row['bot_name'],
+								'bot_active'	=> (int) $bot_row['bot_active'],
+								'bot_agent'		=> (string) $bot_row['bot_agent'],
+								'bot_ip'		=> (string) $bot_row['bot_ip'])
+							);
+							$db->sql_query($sql);
+
+							$log = 'ADDED';
+						}
+						else if ($bot_id)
+						{
+							$sql = 'SELECT user_id, bot_name
+								FROM ' . BOTS_TABLE . "
+								WHERE bot_id = $bot_id";
+							$result = $db->sql_query($sql);
+							$row = $db->sql_fetchrow($result);
+							$db->sql_freeresult($result);
+
+							if (!$row)
+							{
+								trigger_error($user->lang['NO_BOT'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
+							}
+
+							$sql_ary = array(
+								'user_style'	=> (int) $bot_row['bot_style'],
+								'user_lang'		=> (string) $bot_row['bot_lang'],
+							);
+
+							if ($bot_row['bot_name'] !== $row['bot_name'])
+							{
+								$sql_ary['username'] = (string) $bot_row['bot_name'];
+								$sql_ary['username_clean'] = (string) utf8_clean_string($bot_row['bot_name']);
+							}
+
+							$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE user_id = {$row['user_id']}";
+							$db->sql_query($sql);
+
+							$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+								'bot_name'		=> (string) $bot_row['bot_name'],
+								'bot_active'	=> (int) $bot_row['bot_active'],
+								'bot_agent'		=> (string) $bot_row['bot_agent'],
+								'bot_ip'		=> (string) $bot_row['bot_ip'])
+							) . " WHERE bot_id = $bot_id";
+							$db->sql_query($sql);
+
+							// Updated username?
+							if ($bot_row['bot_name'] !== $row['bot_name'])
+							{
+								user_update_name($row['bot_name'], $bot_row['bot_name']);
+							}
+
+							$log = 'UPDATED';
+						}
+
+						$cache->destroy('_bots');
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_BOT_' . $log, false, array($bot_row['bot_name']));
+						trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action));
+
+					}
+				}
+				else if ($bot_id)
+				{
+					$sql = 'SELECT b.*, u.user_lang, u.user_style
+						FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u
+						WHERE b.bot_id = $bot_id
+							AND u.user_id = b.user_id";
+					$result = $db->sql_query($sql);
+					$bot_row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$bot_row)
+					{
+						trigger_error($user->lang['NO_BOT'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
+					}
+
+					$bot_row['bot_lang'] = $bot_row['user_lang'];
+					$bot_row['bot_style'] = $bot_row['user_style'];
+					unset($bot_row['user_lang'], $bot_row['user_style']);
+				}
+
+				$s_active_options = '';
+				$_options = array('0' => 'NO', '1' => 'YES');
+				foreach ($_options as $value => $lang)
+				{
+					$selected = ($bot_row['bot_active'] == $value) ? ' selected="selected"' : '';
+					$s_active_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
+				}
+
+				$style_select = style_select($bot_row['bot_style'], true);
+				$lang_select = language_select($bot_row['bot_lang']);
+
+				$l_title = ($action == 'edit') ? 'EDIT' : 'ADD';
+
+				$template->assign_vars(array(
+					'L_TITLE'		=> $user->lang['BOT_' . $l_title],
+					'U_ACTION'		=> $this->u_action . "&amp;id=$bot_id&amp;action=$action",
+					'U_BACK'		=> $this->u_action,
+					'ERROR_MSG'		=> (count($error)) ? implode('<br />', $error) : '',
+
+					'BOT_NAME'		=> $bot_row['bot_name'],
+					'BOT_IP'		=> $bot_row['bot_ip'],
+					'BOT_AGENT'		=> $bot_row['bot_agent'],
+
+					'S_EDIT_BOT'		=> true,
+					'S_ACTIVE_OPTIONS'	=> $s_active_options,
+					'S_STYLE_OPTIONS'	=> $style_select,
+					'S_LANG_OPTIONS'	=> $lang_select,
+					'S_ERROR'			=> (count($error)) ? true : false,
+					)
+				);
+
+				return;
+
+			break;
+		}
+
+		if ($request->is_ajax() && ($action == 'activate' || $action == 'deactivate'))
+		{
+			$json_response = new \phpbb\json_response;
+			$json_response->send(array(
+				'text'	=> $user->lang['BOT_' . (($action == 'activate') ? 'DE' : '') . 'ACTIVATE'],
+			));
+		}
+
+		$s_options = '';
+		$_options = array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE');
+		foreach ($_options as $value => $lang)
+		{
+			$s_options .= '<option value="' . $value . '">' . $user->lang[$lang] . '</option>';
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'		=> $this->u_action,
+			'S_BOT_OPTIONS'	=> $s_options)
+		);
+
+		$sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit
+			FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . ' u
+			WHERE u.user_id = b.user_id
+			ORDER BY u.user_lastvisit DESC, b.bot_name ASC';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$active_lang = (!$row['bot_active']) ? 'BOT_ACTIVATE' : 'BOT_DEACTIVATE';
+			$active_value = (!$row['bot_active']) ? 'activate' : 'deactivate';
+
+			$template->assign_block_vars('bots', array(
+				'BOT_NAME'		=> $row['bot_name'],
+				'BOT_ID'		=> $row['bot_id'],
+				'LAST_VISIT'	=> ($row['user_lastvisit']) ? $user->format_date($row['user_lastvisit']) : $user->lang['BOT_NEVER'],
+
+				'U_ACTIVATE_DEACTIVATE'	=> $this->u_action . "&amp;id={$row['bot_id']}&amp;action=$active_value",
+				'L_ACTIVATE_DEACTIVATE'	=> $user->lang[$active_lang],
+				'U_EDIT'				=> $this->u_action . "&amp;id={$row['bot_id']}&amp;action=edit",
+				'U_DELETE'				=> $this->u_action . "&amp;id={$row['bot_id']}&amp;action=delete")
+			);
+		}
+		$db->sql_freeresult($result);
+	}
+
+	/**
+	* Validate bot name against username table
+	*/
+	function validate_botname($newname, $oldname = false)
+	{
+		global $db;
+
+		if ($oldname && utf8_clean_string($newname) === $oldname)
+		{
+			return true;
+		}
+
+		// Admins might want to use names otherwise forbidden, thus we only check for duplicates.
+		$sql = 'SELECT username
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($newname)) . "'";
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		return ($row) ? false : true;
+	}
+}

includes/acp/acp_captcha.php

@@ -0,0 +1,190 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_captcha
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $user, $template, $phpbb_log, $request;
+		global $config, $phpbb_container;
+
+		$user->add_lang('acp/board');
+
+		/* @var $factory \phpbb\captcha\factory */
+		$factory = $phpbb_container->get('captcha.factory');
+		$captchas = $factory->get_captcha_types();
+
+		$selected = $request->variable('select_captcha', $config['captcha_plugin']);
+		$selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin'];
+		$configure = $request->variable('configure', false);
+
+		// Oh, they are just here for the view
+		if (isset($_GET['captcha_demo']))
+		{
+			$this->deliver_demo($selected);
+		}
+
+		// Delegate
+		if ($configure)
+		{
+			$config_captcha = $factory->get_instance($selected);
+			$config_captcha->acp_page($id, $this);
+		}
+		else
+		{
+			$config_vars = array(
+				'enable_confirm'		=> array(
+					'tpl'		=> 'REG_ENABLE',
+					'default'	=> false,
+					'validate'	=> 'bool',
+					'lang'		=> 'VISUAL_CONFIRM_REG',
+				),
+				'enable_post_confirm'	=> array(
+					'tpl'		=> 'POST_ENABLE',
+					'default'	=> false,
+					'validate'	=> 'bool',
+					'lang'		=> 'VISUAL_CONFIRM_POST',
+				),
+				'confirm_refresh'		=> array(
+					'tpl'		=> 'CONFIRM_REFRESH',
+					'default'	=> false,
+					'validate'	=> 'bool',
+					'lang'		=> 'VISUAL_CONFIRM_REFRESH',
+				),
+				'max_reg_attempts'		=> array(
+					'tpl'		=> 'REG_LIMIT',
+					'default'	=> 0,
+					'validate'	=> 'int:0:99999',
+					'lang'		=> 'REG_LIMIT',
+				),
+				'max_login_attempts'	=> array(
+					'tpl'		=> 'MAX_LOGIN_ATTEMPTS',
+					'default'	=> 0,
+					'validate'	=> 'int:0:99999',
+					'lang'		=> 'MAX_LOGIN_ATTEMPTS',
+				),
+			);
+
+			$this->tpl_name = 'acp_captcha';
+			$this->page_title = 'ACP_VC_SETTINGS';
+			$form_key = 'acp_captcha';
+			add_form_key($form_key);
+
+			$submit = $request->variable('main_submit', false);
+			$error = $cfg_array = array();
+
+			if ($submit)
+			{
+				foreach ($config_vars as $config_var => $options)
+				{
+					$cfg_array[$config_var] = $request->variable($config_var, $options['default']);
+				}
+				validate_config_vars($config_vars, $cfg_array, $error);
+
+				if (!check_form_key($form_key))
+				{
+					$error[] = $user->lang['FORM_INVALID'];
+				}
+				if ($error)
+				{
+					$submit = false;
+				}
+			}
+
+			if ($submit)
+			{
+				foreach ($cfg_array as $key => $value)
+				{
+					$config->set($key, $value);
+				}
+
+				if ($selected !== $config['captcha_plugin'])
+				{
+					// sanity check
+					if (isset($captchas['available'][$selected]))
+					{
+						$old_captcha = $factory->get_instance($config['captcha_plugin']);
+						$old_captcha->uninstall();
+
+						$config->set('captcha_plugin', $selected);
+						$new_captcha = $factory->get_instance($config['captcha_plugin']);
+						$new_captcha->install();
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_VISUAL');
+					}
+					else
+					{
+						trigger_error($user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+				}
+				trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
+			}
+			else
+			{
+				$captcha_select = '';
+				foreach ($captchas['available'] as $value => $title)
+				{
+					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
+					$captcha_select .= '<option value="' . $value . '"' . $current . '>' . $user->lang($title) . '</option>';
+				}
+
+				foreach ($captchas['unavailable'] as $value => $title)
+				{
+					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
+					$captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option">' . $user->lang($title) . '</option>';
+				}
+
+				$demo_captcha = $factory->get_instance($selected);
+
+				foreach ($config_vars as $config_var => $options)
+				{
+					$template->assign_var($options['tpl'], (isset($_POST[$config_var])) ? $request->variable($config_var, $options['default']) : $config[$config_var]) ;
+				}
+
+				$template->assign_vars(array(
+					'CAPTCHA_PREVIEW_TPL'	=> $demo_captcha->get_demo_template($id),
+					'S_CAPTCHA_HAS_CONFIG'	=> $demo_captcha->has_config(),
+					'CAPTCHA_SELECT'		=> $captcha_select,
+					'ERROR_MSG'				=> implode('<br />', $error),
+
+					'U_ACTION'				=> $this->u_action,
+				));
+			}
+		}
+	}
+
+	/**
+	* Entry point for delivering image CAPTCHAs in the ACP.
+	*/
+	function deliver_demo($selected)
+	{
+		global $phpbb_container;
+
+		$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
+		$captcha->init(CONFIRM_REG);
+		$captcha->execute_demo();
+
+		garbage_collection();
+		exit_handler();
+	}
+}

includes/acp/acp_contact.php

@@ -0,0 +1,138 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @package acp
+*/
+class acp_contact
+{
+	public $u_action;
+
+	public function main($id, $mode)
+	{
+		global $user, $request, $template;
+		global $config, $phpbb_root_path, $phpEx, $phpbb_container;
+
+		$user->add_lang(array('acp/board', 'posting'));
+
+		$this->tpl_name = 'acp_contact';
+		$this->page_title = 'ACP_CONTACT_SETTINGS';
+		$form_name = 'acp_contact';
+		add_form_key($form_name);
+		$error = '';
+
+		if (!function_exists('display_custom_bbcodes'))
+		{
+			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+		}
+		if (!class_exists('parse_message'))
+		{
+			include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
+		}
+
+		/* @var $config_text \phpbb\config\db_text */
+		$config_text = $phpbb_container->get('config_text');
+
+		$contact_admin_data			= $config_text->get_array(array(
+			'contact_admin_info',
+			'contact_admin_info_uid',
+			'contact_admin_info_bitfield',
+			'contact_admin_info_flags',
+		));
+
+		$contact_admin_info			= $contact_admin_data['contact_admin_info'];
+		$contact_admin_info_uid		= $contact_admin_data['contact_admin_info_uid'];
+		$contact_admin_info_bitfield= $contact_admin_data['contact_admin_info_bitfield'];
+		$contact_admin_info_flags	= $contact_admin_data['contact_admin_info_flags'];
+
+		if ($request->is_set_post('submit') || $request->is_set_post('preview'))
+		{
+			if (!check_form_key($form_name))
+			{
+				$error = $user->lang('FORM_INVALID');
+			}
+
+			$contact_admin_info = $request->variable('contact_admin_info', '', true);
+
+			generate_text_for_storage(
+				$contact_admin_info,
+				$contact_admin_info_uid,
+				$contact_admin_info_bitfield,
+				$contact_admin_info_flags,
+				!$request->variable('disable_bbcode', false),
+				!$request->variable('disable_magic_url', false),
+				!$request->variable('disable_smilies', false)
+			);
+
+			if (empty($error) && $request->is_set_post('submit'))
+			{
+				$config->set('contact_admin_form_enable', $request->variable('contact_admin_form_enable', false));
+
+				$config_text->set_array(array(
+					'contact_admin_info'			=> $contact_admin_info,
+					'contact_admin_info_uid'		=> $contact_admin_info_uid,
+					'contact_admin_info_bitfield'	=> $contact_admin_info_bitfield,
+					'contact_admin_info_flags'		=> $contact_admin_info_flags,
+				));
+
+				trigger_error($user->lang['CONTACT_US_INFO_UPDATED'] . adm_back_link($this->u_action));
+			}
+		}
+
+		$contact_admin_info_preview = '';
+		if ($request->is_set_post('preview'))
+		{
+			$contact_admin_info_preview = generate_text_for_display($contact_admin_info, $contact_admin_info_uid, $contact_admin_info_bitfield, $contact_admin_info_flags);
+		}
+
+		$contact_admin_edit = generate_text_for_edit($contact_admin_info, $contact_admin_info_uid, $contact_admin_info_flags);
+
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
+		$template->assign_vars(array(
+			'ERRORS'			=> $error,
+			'CONTACT_ENABLED'	=> $config['contact_admin_form_enable'],
+
+			'CONTACT_US_INFO'			=> $contact_admin_edit['text'],
+			'CONTACT_US_INFO_PREVIEW'	=> $contact_admin_info_preview,
+
+			'S_BBCODE_DISABLE_CHECKED'		=> !$contact_admin_edit['allow_bbcode'],
+			'S_SMILIES_DISABLE_CHECKED'		=> !$contact_admin_edit['allow_smilies'],
+			'S_MAGIC_URL_DISABLE_CHECKED'	=> !$contact_admin_edit['allow_urls'],
+
+			'BBCODE_STATUS'			=> $user->lang('BBCODE_IS_ON', '<a href="' . $controller_helper->route('phpbb_help_bbcode_controller') . '">', '</a>'),
+			'SMILIES_STATUS'		=> $user->lang['SMILIES_ARE_ON'],
+			'IMG_STATUS'			=> $user->lang['IMAGES_ARE_ON'],
+			'FLASH_STATUS'			=> $user->lang['FLASH_IS_ON'],
+			'URL_STATUS'			=> $user->lang['URL_IS_ON'],
+
+			'S_BBCODE_ALLOWED'		=> true,
+			'S_SMILIES_ALLOWED'		=> true,
+			'S_BBCODE_IMG'			=> true,
+			'S_BBCODE_FLASH'		=> true,
+			'S_LINKS_ALLOWED'		=> true,
+		));
+
+		// Assigning custom bbcodes
+		display_custom_bbcodes();
+	}
+}

includes/acp/acp_database.php

@@ -0,0 +1,622 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_database
+{
+	var $db_tools;
+	var $u_action;
+	public $page_title;
+
+	function main($id, $mode)
+	{
+		global $cache, $db, $user, $template, $table_prefix, $request;
+		global $phpbb_root_path, $phpbb_container, $phpbb_log;
+
+		$this->db_tools = $phpbb_container->get('dbal.tools');
+
+		$user->add_lang('acp/database');
+
+		$this->tpl_name = 'acp_database';
+		$this->page_title = 'ACP_DATABASE';
+
+		$action	= $request->variable('action', '');
+
+		$form_key = 'acp_database';
+		add_form_key($form_key);
+
+		$template->assign_vars(array(
+			'MODE'	=> $mode
+		));
+
+		switch ($mode)
+		{
+			case 'backup':
+
+				$this->page_title = 'ACP_BACKUP';
+
+				switch ($action)
+				{
+					case 'download':
+						$type	= $request->variable('type', '');
+						$table	= array_intersect($this->db_tools->sql_list_tables(), $request->variable('table', array('')));
+						$format	= $request->variable('method', '');
+						$where	= $request->variable('where', '');
+
+						if (!count($table))
+						{
+							trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						if (!check_form_key($form_key))
+						{
+							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						$store = $structure = $schema_data = false;
+
+						if ($where == 'store')
+						{
+							$store = true;
+						}
+
+						if ($type == 'full' || $type == 'structure')
+						{
+							$structure = true;
+						}
+
+						if ($type == 'full' || $type == 'data')
+						{
+							$schema_data = true;
+						}
+
+						@set_time_limit(1200);
+						@set_time_limit(0);
+
+						$time = time();
+
+						$filename = 'backup_' . $time . '_' . unique_id();
+
+						/** @var phpbb\db\extractor\extractor_interface $extractor Database extractor */
+						$extractor = $phpbb_container->get('dbal.extractor');
+						$extractor->init_extractor($format, $filename, $time, false, $store);
+
+						$extractor->write_start($table_prefix);
+
+						foreach ($table as $table_name)
+						{
+							// Get the table structure
+							if ($structure)
+							{
+								$extractor->write_table($table_name);
+							}
+							else
+							{
+								// We might wanna empty out all that junk :D
+								switch ($db->get_sql_layer())
+								{
+									case 'sqlite3':
+										$extractor->flush('DELETE FROM ' . $table_name . ";\n");
+									break;
+
+									case 'mssql_odbc':
+									case 'mssqlnative':
+										$extractor->flush('TRUNCATE TABLE ' . $table_name . "GO\n");
+									break;
+
+									case 'oracle':
+										$extractor->flush('TRUNCATE TABLE ' . $table_name . "/\n");
+									break;
+
+									default:
+										$extractor->flush('TRUNCATE TABLE ' . $table_name . ";\n");
+									break;
+								}
+							}
+
+							// Data
+							if ($schema_data)
+							{
+								$extractor->write_data($table_name);
+							}
+						}
+
+						$extractor->write_end();
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_DB_BACKUP');
+
+						trigger_error($user->lang['BACKUP_SUCCESS'] . adm_back_link($this->u_action));
+					break;
+
+					default:
+						$tables = $this->db_tools->sql_list_tables();
+						asort($tables);
+						foreach ($tables as $table_name)
+						{
+							if (strlen($table_prefix) === 0 || stripos($table_name, $table_prefix) === 0)
+							{
+								$template->assign_block_vars('tables', array(
+									'TABLE'	=> $table_name
+								));
+							}
+						}
+						unset($tables);
+
+						$template->assign_vars(array(
+							'U_ACTION'	=> $this->u_action . '&amp;action=download'
+						));
+
+						$available_methods = array('gzip' => 'zlib', 'bzip2' => 'bz2');
+
+						foreach ($available_methods as $type => $module)
+						{
+							if (!@extension_loaded($module))
+							{
+								continue;
+							}
+
+							$template->assign_block_vars('methods', array(
+								'TYPE'	=> $type
+							));
+						}
+
+						$template->assign_block_vars('methods', array(
+							'TYPE'	=> 'text'
+						));
+					break;
+				}
+			break;
+
+			case 'restore':
+
+				$this->page_title = 'ACP_RESTORE';
+
+				switch ($action)
+				{
+					case 'submit':
+						$delete = $request->variable('delete', '');
+						$file = $request->variable('file', '');
+
+						$backup_info = $this->get_backup_file($phpbb_root_path . 'store/', $file);
+
+						if (empty($backup_info) || !is_readable($backup_info['file_name']))
+						{
+							trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						if ($delete)
+						{
+							if (confirm_box(true))
+							{
+								unlink($backup_info['file_name']);
+								$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_DB_DELETE');
+								trigger_error($user->lang['BACKUP_DELETE'] . adm_back_link($this->u_action));
+							}
+							else
+							{
+								confirm_box(false, $user->lang['DELETE_SELECTED_BACKUP'], build_hidden_fields(array('delete' => $delete, 'file' => $file)));
+							}
+						}
+						else if (confirm_box(true))
+						{
+							switch ($backup_info['extensions'])
+							{
+								case 'sql':
+									$fp = fopen($backup_info['file_name'], 'rb');
+									$read = 'fread';
+									$seek = 'fseek';
+									$eof = 'feof';
+									$close = 'fclose';
+									$fgetd = 'fgetd';
+								break;
+
+								case 'sql.bz2':
+									$fp = bzopen($backup_info['file_name'], 'r');
+									$read = 'bzread';
+									$seek = '';
+									$eof = 'feof';
+									$close = 'bzclose';
+									$fgetd = 'fgetd_seekless';
+								break;
+
+								case 'sql.gz':
+									$fp = gzopen($backup_info['file_name'], 'rb');
+									$read = 'gzread';
+									$seek = 'gzseek';
+									$eof = 'gzeof';
+									$close = 'gzclose';
+									$fgetd = 'fgetd';
+								break;
+
+								default:
+									trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+									return;
+							}
+
+							switch ($db->get_sql_layer())
+							{
+								case 'mysql':
+								case 'mysql4':
+								case 'mysqli':
+								case 'sqlite3':
+									while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false)
+									{
+										$db->sql_query($sql);
+									}
+								break;
+
+								case 'postgres':
+									$delim = ";\n";
+									while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false)
+									{
+										$query = trim($sql);
+
+										if (substr($query, 0, 13) == 'CREATE DOMAIN')
+										{
+											list(, , $domain) = explode(' ', $query);
+											$sql = "SELECT domain_name
+												FROM information_schema.domains
+												WHERE domain_name = '$domain';";
+											$result = $db->sql_query($sql);
+											if (!$db->sql_fetchrow($result))
+											{
+												$db->sql_query($query);
+											}
+											$db->sql_freeresult($result);
+										}
+										else
+										{
+											$db->sql_query($query);
+										}
+
+										if (substr($query, 0, 4) == 'COPY')
+										{
+											while (($sub = $fgetd($fp, "\n", $read, $seek, $eof)) !== '\.')
+											{
+												if ($sub === false)
+												{
+													trigger_error($user->lang['RESTORE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
+												}
+												pg_put_line($db->get_db_connect_id(), $sub . "\n");
+											}
+											pg_put_line($db->get_db_connect_id(), "\\.\n");
+											pg_end_copy($db->get_db_connect_id());
+										}
+									}
+								break;
+
+								case 'oracle':
+									while (($sql = $fgetd($fp, "/\n", $read, $seek, $eof)) !== false)
+									{
+										$db->sql_query($sql);
+									}
+								break;
+
+								case 'mssql_odbc':
+								case 'mssqlnative':
+									while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
+									{
+										$db->sql_query($sql);
+									}
+								break;
+							}
+
+							$close($fp);
+
+							// Purge the cache due to updated data
+							$cache->purge();
+
+							$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_DB_RESTORE');
+							trigger_error($user->lang['RESTORE_SUCCESS'] . adm_back_link($this->u_action));
+							break;
+						}
+						else
+						{
+							confirm_box(false, $user->lang['RESTORE_SELECTED_BACKUP'], build_hidden_fields(array('file' => $file)));
+						}
+
+					default:
+						$backup_files = $this->get_file_list($phpbb_root_path . 'store/');
+
+						if (!empty($backup_files))
+						{
+							krsort($backup_files);
+
+							foreach ($backup_files as $name => $file)
+							{
+								$template->assign_block_vars('files', array(
+									'FILE'		=> sha1($file),
+									'NAME'		=> $user->format_date($name, 'd-m-Y H:i', true),
+									'SUPPORTED'	=> true,
+								));
+							}
+						}
+
+						$template->assign_vars(array(
+							'U_ACTION'	=> $this->u_action . '&amp;action=submit'
+						));
+					break;
+				}
+			break;
+		}
+	}
+
+	/**
+	 * Get backup file from file hash
+	 *
+	 * @param string $directory Relative path to directory
+	 * @param string $file_hash Hash of selected file
+	 *
+	 * @return array Backup file data or empty array if unable to find file
+	 */
+	protected function get_backup_file($directory, $file_hash)
+	{
+		$backup_data = [];
+
+		$file_list = $this->get_file_list($directory);
+		$supported_extensions = $this->get_supported_extensions();
+
+		foreach ($file_list as $file)
+		{
+			preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches);
+			if (sha1($file) === $file_hash && in_array($matches[2], $supported_extensions))
+			{
+				$backup_data = [
+					'file_name' => $directory . $file,
+					'extension' => $matches[2],
+				];
+				break;
+			}
+		}
+
+		return $backup_data;
+	}
+
+	/**
+	 * Get backup file list for directory
+	 *
+	 * @param string $directory Relative path to backup directory
+	 *
+	 * @return array List of backup files in specified directory
+	 */
+	protected function get_file_list($directory)
+	{
+		$supported_extensions = $this->get_supported_extensions();
+
+		$dh = @opendir($directory);
+
+		$backup_files = [];
+
+		if ($dh)
+		{
+			while (($file = readdir($dh)) !== false)
+			{
+				if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
+				{
+					if (in_array($matches[2], $supported_extensions))
+					{
+						$backup_files[(int) $matches[1]] = $file;
+					}
+				}
+			}
+			closedir($dh);
+		}
+
+		return $backup_files;
+	}
+
+	/**
+	 * Get supported extensions for backup
+	 *
+	 * @return array List of supported extensions
+	 */
+	protected function get_supported_extensions()
+	{
+		$extensions = ['sql'];
+		$available_methods = ['sql.gz' => 'zlib', 'sql.bz2' => 'bz2'];
+
+		foreach ($available_methods as $type => $module)
+		{
+			if (!@extension_loaded($module))
+			{
+				continue;
+			}
+			$extensions[] = $type;
+		}
+
+		return $extensions;
+	}
+}
+
+// get how much space we allow for a chunk of data, very similar to phpMyAdmin's way of doing things ;-) (hey, we only do this for MySQL anyway :P)
+function get_usable_memory()
+{
+	$val = trim(@ini_get('memory_limit'));
+
+	if (preg_match('/(\\d+)([mkg]?)/i', $val, $regs))
+	{
+		$memory_limit = (int) $regs[1];
+		switch ($regs[2])
+		{
+
+			case 'k':
+			case 'K':
+				$memory_limit *= 1024;
+			break;
+
+			case 'm':
+			case 'M':
+				$memory_limit *= 1048576;
+			break;
+
+			case 'g':
+			case 'G':
+				$memory_limit *= 1073741824;
+			break;
+		}
+
+		// how much memory PHP requires at the start of export (it is really a little less)
+		if ($memory_limit > 6100000)
+		{
+			$memory_limit -= 6100000;
+		}
+
+		// allow us to consume half of the total memory available
+		$memory_limit /= 2;
+	}
+	else
+	{
+		// set the buffer to 1M if we have no clue how much memory PHP will give us :P
+		$memory_limit = 1048576;
+	}
+
+	return $memory_limit;
+}
+
+function sanitize_data_mssql($text)
+{
+	$data = preg_split('/[\n\t\r\b\f]/', $text);
+	preg_match_all('/[\n\t\r\b\f]/', $text, $matches);
+
+	$val = array();
+
+	foreach ($data as $value)
+	{
+		if (strlen($value))
+		{
+			$val[] = "'" . $value . "'";
+		}
+		if (count($matches[0]))
+		{
+			$val[] = 'char(' . ord(array_shift($matches[0])) . ')';
+		}
+	}
+
+	return implode('+', $val);
+}
+
+function sanitize_data_oracle($text)
+{
+//	$data = preg_split('/[\0\n\t\r\b\f\'"\/\\\]/', $text);
+//	preg_match_all('/[\0\n\t\r\b\f\'"\/\\\]/', $text, $matches);
+	$data = preg_split('/[\0\b\f\'\/]/', $text);
+	preg_match_all('/[\0\r\b\f\'\/]/', $text, $matches);
+
+	$val = array();
+
+	foreach ($data as $value)
+	{
+		if (strlen($value))
+		{
+			$val[] = "'" . $value . "'";
+		}
+		if (count($matches[0]))
+		{
+			$val[] = 'chr(' . ord(array_shift($matches[0])) . ')';
+		}
+	}
+
+	return implode('||', $val);
+}
+
+function sanitize_data_generic($text)
+{
+	$data = preg_split('/[\n\t\r\b\f]/', $text);
+	preg_match_all('/[\n\t\r\b\f]/', $text, $matches);
+
+	$val = array();
+
+	foreach ($data as $value)
+	{
+		if (strlen($value))
+		{
+			$val[] = "'" . $value . "'";
+		}
+		if (count($matches[0]))
+		{
+			$val[] = "'" . array_shift($matches[0]) . "'";
+		}
+	}
+
+	return implode('||', $val);
+}
+
+// modified from PHP.net
+function fgetd(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
+{
+	$record = '';
+	$delim_len = strlen($delim);
+
+	while (!$eof($fp))
+	{
+		$pos = strpos($record, $delim);
+		if ($pos === false)
+		{
+			$record .= $read($fp, $buffer);
+			if ($eof($fp) && ($pos = strpos($record, $delim)) !== false)
+			{
+				$seek($fp, $pos + $delim_len - strlen($record), SEEK_CUR);
+				return substr($record, 0, $pos);
+			}
+		}
+		else
+		{
+			$seek($fp, $pos + $delim_len - strlen($record), SEEK_CUR);
+			return substr($record, 0, $pos);
+		}
+	}
+
+	return false;
+}
+
+function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
+{
+	static $array = array();
+	static $record = '';
+
+	if (!count($array))
+	{
+		while (!$eof($fp))
+		{
+			if (strpos($record, $delim) !== false)
+			{
+				$array = explode($delim, $record);
+				$record = array_pop($array);
+				break;
+			}
+			else
+			{
+				$record .= $read($fp, $buffer);
+			}
+		}
+		if ($eof($fp) && strpos($record, $delim) !== false)
+		{
+			$array = explode($delim, $record);
+			$record = array_pop($array);
+		}
+	}
+
+	if (count($array))
+	{
+		return array_shift($array);
+	}
+
+	return false;
+}

includes/acp/acp_disallow.php

@@ -0,0 +1,115 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_disallow
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $cache, $phpbb_log, $request;
+
+		$user->add_lang('acp/posting');
+
+		// Set up general vars
+		$this->tpl_name = 'acp_disallow';
+		$this->page_title = 'ACP_DISALLOW_USERNAMES';
+
+		$form_key = 'acp_disallow';
+		add_form_key($form_key);
+
+		$disallow = (isset($_POST['disallow'])) ? true : false;
+		$allow = (isset($_POST['allow'])) ? true : false;
+
+		if (($allow || $disallow) && !check_form_key($form_key))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		if ($disallow)
+		{
+			$disallowed_user = str_replace('*', '%', $request->variable('disallowed_user', '', true));
+
+			if (!$disallowed_user)
+			{
+				trigger_error($user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$sql = 'SELECT disallow_id
+				FROM ' . DISALLOW_TABLE . "
+				WHERE disallow_username = '" . $db->sql_escape($disallowed_user) . "'";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($row)
+			{
+				trigger_error($user->lang['DISALLOWED_ALREADY'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$sql = 'INSERT INTO ' . DISALLOW_TABLE . ' ' . $db->sql_build_array('INSERT', array('disallow_username' => $disallowed_user));
+			$db->sql_query($sql);
+
+			$cache->destroy('_disallowed_usernames');
+
+			$message = $user->lang['DISALLOW_SUCCESSFUL'];
+			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_DISALLOW_ADD', false, array(str_replace('%', '*', $disallowed_user)));
+
+			trigger_error($message . adm_back_link($this->u_action));
+		}
+		else if ($allow)
+		{
+			$disallowed_id = $request->variable('disallowed_id', 0);
+
+			if (!$disallowed_id)
+			{
+				trigger_error($user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$sql = 'DELETE FROM ' . DISALLOW_TABLE . '
+				WHERE disallow_id = ' . $disallowed_id;
+			$db->sql_query($sql);
+
+			$cache->destroy('_disallowed_usernames');
+
+			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_DISALLOW_DELETE');
+
+			trigger_error($user->lang['DISALLOWED_DELETED'] . adm_back_link($this->u_action));
+		}
+
+		// Grab the current list of disallowed usernames...
+		$sql = 'SELECT *
+			FROM ' . DISALLOW_TABLE;
+		$result = $db->sql_query($sql);
+
+		$disallow_select = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$disallow_select .= '<option value="' . $row['disallow_id'] . '">' . str_replace('%', '*', $row['disallow_username']) . '</option>';
+		}
+		$db->sql_freeresult($result);
+
+		$template->assign_vars(array(
+			'U_ACTION'				=> $this->u_action,
+			'S_DISALLOWED_NAMES'	=> $disallow_select)
+		);
+	}
+}

includes/acp/acp_email.php

@@ -0,0 +1,351 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_email
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $template, $phpbb_log, $request;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_dispatcher;
+
+		$user->add_lang('acp/email');
+		$this->tpl_name = 'acp_email';
+		$this->page_title = 'ACP_MASS_EMAIL';
+
+		$form_key = 'acp_email';
+		add_form_key($form_key);
+
+		// Set some vars
+		$submit = (isset($_POST['submit'])) ? true : false;
+		$error = array();
+
+		$usernames	= $request->variable('usernames', '', true);
+		$usernames	= (!empty($usernames)) ? explode("\n", $usernames) : array();
+		$group_id	= $request->variable('g', 0);
+		$subject	= $request->variable('subject', '', true);
+		$message	= $request->variable('message', '', true);
+
+		// Do the job ...
+		if ($submit)
+		{
+			// Error checking needs to go here ... if no subject and/or no message then skip
+			// over the send and return to the form
+			$use_queue		= (isset($_POST['send_immediately'])) ? false : true;
+			$priority		= $request->variable('mail_priority_flag', MAIL_NORMAL_PRIORITY);
+
+			if (!check_form_key($form_key))
+			{
+				$error[] = $user->lang['FORM_INVALID'];
+			}
+
+			if (!$subject)
+			{
+				$error[] = $user->lang['NO_EMAIL_SUBJECT'];
+			}
+
+			if (!$message)
+			{
+				$error[] = $user->lang['NO_EMAIL_MESSAGE'];
+			}
+
+			if (!count($error))
+			{
+				if (!empty($usernames))
+				{
+					// If giving usernames the admin is able to email inactive users too...
+					$sql_ary = array(
+						'SELECT'	=> 'username, user_email, user_jabber, user_notify_type, user_lang',
+						'FROM'		=> array(
+							USERS_TABLE		=> '',
+						),
+						'WHERE'		=> $db->sql_in_set('username_clean', array_map('utf8_clean_string', $usernames)) . '
+							AND user_allow_massemail = 1',
+						'ORDER_BY'	=> 'user_lang, user_notify_type',
+					);
+				}
+				else
+				{
+					if ($group_id)
+					{
+						$sql_ary = array(
+							'SELECT'	=> 'u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type',
+							'FROM'		=> array(
+								USERS_TABLE			=> 'u',
+								USER_GROUP_TABLE	=> 'ug',
+							),
+							'WHERE'		=> 'ug.group_id = ' . $group_id . '
+								AND ug.user_pending = 0
+								AND u.user_id = ug.user_id
+								AND u.user_allow_massemail = 1
+								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')',
+							'ORDER_BY'	=> 'u.user_lang, u.user_notify_type',
+						);
+					}
+					else
+					{
+						$sql_ary = array(
+							'SELECT'	=> 'u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type',
+							'FROM'		=> array(
+								USERS_TABLE	=> 'u',
+							),
+							'WHERE'		=> 'u.user_allow_massemail = 1
+								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')',
+							'ORDER_BY'	=> 'u.user_lang, u.user_notify_type',
+						);
+					}
+
+					// Mail banned or not
+					if (!isset($_REQUEST['mail_banned_flag']))
+					{
+						$sql_ary['WHERE'] .= ' AND (b.ban_id IS NULL
+						        OR b.ban_exclude = 1)';
+						$sql_ary['LEFT_JOIN'] = array(
+							array(
+								'FROM'	=> array(
+									BANLIST_TABLE	=> 'b',
+								),
+								'ON'	=> 'u.user_id = b.ban_userid',
+							),
+						);
+					}
+				}
+				/**
+				* Modify sql query to change the list of users the email is sent to
+				*
+				* @event core.acp_email_modify_sql
+				* @var	array	sql_ary		Array which is used to build the sql query
+				* @since 3.1.2-RC1
+				*/
+				$vars = array('sql_ary');
+				extract($phpbb_dispatcher->trigger_event('core.acp_email_modify_sql', compact($vars)));
+
+				$sql = $db->sql_build_query('SELECT', $sql_ary);
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+
+				if (!$row)
+				{
+					$db->sql_freeresult($result);
+					trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$i = $j = 0;
+
+				// Send with BCC
+				// Maximum number of bcc recipients
+				$max_chunk_size = (int) $config['email_max_chunk_size'];
+				$email_list = array();
+				$old_lang = $row['user_lang'];
+				$old_notify_type = $row['user_notify_type'];
+
+				do
+				{
+					if (($row['user_notify_type'] == NOTIFY_EMAIL && $row['user_email']) ||
+						($row['user_notify_type'] == NOTIFY_IM && $row['user_jabber']) ||
+						($row['user_notify_type'] == NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber'])))
+					{
+						if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type)
+						{
+							$i = 0;
+
+							if (count($email_list))
+							{
+								$j++;
+							}
+
+							$old_lang = $row['user_lang'];
+							$old_notify_type = $row['user_notify_type'];
+						}
+
+						$email_list[$j][$i]['lang']		= $row['user_lang'];
+						$email_list[$j][$i]['method']	= $row['user_notify_type'];
+						$email_list[$j][$i]['email']	= $row['user_email'];
+						$email_list[$j][$i]['name']		= $row['username'];
+						$email_list[$j][$i]['jabber']	= $row['user_jabber'];
+						$i++;
+					}
+				}
+				while ($row = $db->sql_fetchrow($result));
+				$db->sql_freeresult($result);
+
+				// Send the messages
+				if (!class_exists('messenger'))
+				{
+					include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+				}
+
+				if (!function_exists('get_group_name'))
+				{
+					include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+				}
+				$messenger = new messenger($use_queue);
+
+				$errored = false;
+
+				$email_template = 'admin_send_email';
+				$template_data = array(
+					'CONTACT_EMAIL' => phpbb_get_board_contact($config, $phpEx),
+					'MESSAGE'		=> htmlspecialchars_decode($message),
+				);
+				$generate_log_entry = true;
+
+				/**
+				* Modify email template data before the emails are sent
+				*
+				* @event core.acp_email_send_before
+				* @var	string	email_template		The template to be used for sending the email
+				* @var	string	subject				The subject of the email
+				* @var	array	template_data		Array with template data assigned to email template
+				* @var	bool	generate_log_entry	If false, no log entry will be created
+				* @var	array	usernames			Usernames which will be displayed in log entry, if it will be created
+				* @var	int		group_id			The group this email will be sent to
+				* @var	bool	use_queue			If true, email queue will be used for sending
+				* @var	int		priority			Priority of sent emails
+				* @since 3.1.3-RC1
+				*/
+				$vars = array(
+					'email_template',
+					'subject',
+					'template_data',
+					'generate_log_entry',
+					'usernames',
+					'group_id',
+					'use_queue',
+					'priority',
+				);
+				extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars)));
+
+				for ($i = 0, $size = count($email_list); $i < $size; $i++)
+				{
+					$used_lang = $email_list[$i][0]['lang'];
+					$used_method = $email_list[$i][0]['method'];
+
+					for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++)
+					{
+						$email_row = $email_list[$i][$j];
+
+						$messenger->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
+						$messenger->im($email_row['jabber'], $email_row['name']);
+					}
+
+					$messenger->template($email_template, $used_lang);
+
+					$messenger->anti_abuse_headers($config, $user);
+
+					$messenger->subject(htmlspecialchars_decode($subject));
+					$messenger->set_mail_priority($priority);
+
+					$messenger->assign_vars($template_data);
+
+					if (!($messenger->send($used_method)))
+					{
+						$errored = true;
+					}
+				}
+				unset($email_list);
+
+				$messenger->save_queue();
+
+				if ($generate_log_entry)
+				{
+					if (!empty($usernames))
+					{
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MASS_EMAIL', false, array(implode(', ', utf8_normalize_nfc($usernames))));
+					}
+					else
+					{
+						if ($group_id)
+						{
+							$group_name = get_group_name($group_id);
+						}
+						else
+						{
+							// Not great but the logging routine doesn't cope well with localising on the fly
+							$group_name = $user->lang['ALL_USERS'];
+						}
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MASS_EMAIL', false, array($group_name));
+					}
+				}
+
+				if (!$errored)
+				{
+					$message = ($use_queue) ? $user->lang['EMAIL_SENT_QUEUE'] : $user->lang['EMAIL_SENT'];
+					trigger_error($message . adm_back_link($this->u_action));
+				}
+				else
+				{
+					$message = sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=critical') . '">', '</a>');
+					trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+			}
+		}
+
+		// Exclude bots and guests...
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name IN ('BOTS', 'GUESTS')";
+		$result = $db->sql_query($sql);
+
+		$exclude = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$exclude[] = $row['group_id'];
+		}
+		$db->sql_freeresult($result);
+
+		$select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>';
+		$select_list .= group_select_options($group_id, $exclude);
+
+		$s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>';
+		$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';
+		$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>';
+
+		$template_data = array(
+			'S_WARNING'				=> (count($error)) ? true : false,
+			'WARNING_MSG'			=> (count($error)) ? implode('<br />', $error) : '',
+			'U_ACTION'				=> $this->u_action,
+			'S_GROUP_OPTIONS'		=> $select_list,
+			'USERNAMES'				=> implode("\n", $usernames),
+			'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_email&amp;field=usernames'),
+			'SUBJECT'				=> $subject,
+			'MESSAGE'				=> $message,
+			'S_PRIORITY_OPTIONS'	=> $s_priority_options,
+		);
+
+		/**
+		* Modify custom email template data before we display the form
+		*
+		* @event core.acp_email_display
+		* @var	array	template_data		Array with template data assigned to email template
+		* @var	array	exclude				Array with groups which are excluded from group selection
+		* @var	array	usernames			Usernames which will be displayed in form
+		*
+		* @since 3.1.4-RC1
+		*/
+		$vars = array('template_data', 'exclude', 'usernames');
+		extract($phpbb_dispatcher->trigger_event('core.acp_email_display', compact($vars)));
+
+		$template->assign_vars($template_data);
+	}
+}

includes/acp/acp_extensions.php

@@ -0,0 +1,665 @@
+<?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.
+*
+*/
+
+use phpbb\exception\exception_interface;
+use phpbb\exception\version_check_exception;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_extensions
+{
+	var $u_action;
+	var $tpl_name;
+	var $page_title;
+
+	private $config;
+	private $template;
+	private $user;
+	private $log;
+	private $request;
+	private $phpbb_dispatcher;
+	private $ext_manager;
+	private $phpbb_container;
+	private $php_ini;
+
+	function main()
+	{
+		// Start the page
+		global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher, $phpbb_container;
+
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->request = $request;
+		$this->log = $phpbb_log;
+		$this->phpbb_dispatcher = $phpbb_dispatcher;
+		$this->ext_manager = $phpbb_extension_manager;
+		$this->phpbb_container = $phpbb_container;
+		$this->php_ini = $this->phpbb_container->get('php_ini');
+
+		$this->user->add_lang(array('install', 'acp/extensions', 'migrator'));
+
+		$this->page_title = 'ACP_EXTENSIONS';
+
+		$action = $this->request->variable('action', 'list');
+		$ext_name = $this->request->variable('ext_name', '');
+
+		// What is a safe limit of execution time? Half the max execution time should be safe.
+		$safe_time_limit = ($this->php_ini->getNumeric('max_execution_time') / 2);
+		$start_time = time();
+
+		// Cancel action
+		if ($this->request->is_set_post('cancel'))
+		{
+			$action = 'list';
+			$ext_name = '';
+		}
+
+		if (in_array($action, array('enable', 'disable', 'delete_data')) && !check_link_hash($this->request->variable('hash', ''), $action . '.' . $ext_name))
+		{
+			trigger_error('FORM_INVALID', E_USER_WARNING);
+		}
+
+		/**
+		* Event to run a specific action on extension
+		*
+		* @event core.acp_extensions_run_action_before
+		* @var	string	action			Action to run; if the event completes execution of the action, should be set to 'none'
+		* @var	string	u_action		Url we are at
+		* @var	string	ext_name		Extension name from request
+		* @var	int		safe_time_limit	Safe limit of execution time
+		* @var	int		start_time		Start time
+		* @var	string	tpl_name		Template file to load
+		* @since 3.1.11-RC1
+		* @changed 3.2.1-RC1			Renamed to core.acp_extensions_run_action_before, added tpl_name, added action 'none'
+		*/
+		$u_action = $this->u_action;
+		$tpl_name = '';
+		$vars = array('action', 'u_action', 'ext_name', 'safe_time_limit', 'start_time', 'tpl_name');
+		extract($this->phpbb_dispatcher->trigger_event('core.acp_extensions_run_action_before', compact($vars)));
+
+		// In case they have been updated by the event
+		$this->u_action = $u_action;
+		$this->tpl_name = $tpl_name;
+
+		// If they've specified an extension, let's load the metadata manager and validate it.
+		if ($ext_name)
+		{
+			$md_manager = $this->ext_manager->create_extension_metadata_manager($ext_name);
+
+			try
+			{
+				$md_manager->get_metadata('all');
+			}
+			catch (exception_interface $e)
+			{
+				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+				trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+		}
+
+		// What are we doing?
+		switch ($action)
+		{
+			case 'none':
+				// Intentionally empty, used by extensions that execute additional actions in the prior event
+				break;
+
+			case 'set_config_version_check_force_unstable':
+				$force_unstable = $this->request->variable('force_unstable', false);
+
+				if ($force_unstable)
+				{
+					$s_hidden_fields = build_hidden_fields(array(
+						'force_unstable'	=> $force_unstable,
+					));
+
+					confirm_box(false, $this->user->lang('EXTENSION_FORCE_UNSTABLE_CONFIRM'), $s_hidden_fields);
+				}
+				else
+				{
+					$this->config->set('extension_force_unstable', false);
+					trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
+				}
+				break;
+
+			case 'list':
+			default:
+				if (confirm_box(true))
+				{
+					$this->config->set('extension_force_unstable', true);
+					trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
+				}
+
+				$this->list_enabled_exts();
+				$this->list_disabled_exts();
+				$this->list_available_exts();
+
+				$this->template->assign_vars(array(
+					'U_VERSIONCHECK_FORCE' 	=> $this->u_action . '&amp;action=list&amp;versioncheck_force=1',
+					'FORCE_UNSTABLE'		=> $this->config['extension_force_unstable'],
+					'U_ACTION' 				=> $this->u_action,
+				));
+
+				$this->tpl_name = 'acp_ext_list';
+			break;
+
+			case 'enable_pre':
+				try
+				{
+					$md_manager->validate_enable();
+				}
+				catch (exception_interface $e)
+				{
+					$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+					trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$extension = $this->ext_manager->get_extension($ext_name);
+				if (!$extension->is_enableable())
+				{
+					trigger_error($this->user->lang['EXTENSION_NOT_ENABLEABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if ($this->ext_manager->is_enabled($ext_name))
+				{
+					redirect($this->u_action);
+				}
+
+				$this->tpl_name = 'acp_ext_enable';
+
+				$this->template->assign_vars(array(
+					'PRE'				=> true,
+					'L_CONFIRM_MESSAGE'	=> $this->user->lang('EXTENSION_ENABLE_CONFIRM', $md_manager->get_metadata('display-name')),
+					'U_ENABLE'			=> $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('enable.' . $ext_name),
+				));
+			break;
+
+			case 'enable':
+				try
+				{
+					$md_manager->validate_enable();
+				}
+				catch (exception_interface $e)
+				{
+					$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+					trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$extension = $this->ext_manager->get_extension($ext_name);
+				if (!$extension->is_enableable())
+				{
+					trigger_error($this->user->lang['EXTENSION_NOT_ENABLEABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				try
+				{
+					while ($this->ext_manager->enable_step($ext_name))
+					{
+						// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+						if ((time() - $start_time) >= $safe_time_limit)
+						{
+							$this->template->assign_var('S_NEXT_STEP', true);
+
+							meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('enable.' . $ext_name));
+						}
+					}
+
+					// Update custom style for admin area
+					$this->template->set_custom_style(array(
+						array(
+							'name' 		=> 'adm',
+							'ext_path' 	=> 'adm/style/',
+						),
+					), array($phpbb_root_path . 'adm/style'));
+
+					$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_EXT_ENABLE', time(), array($ext_name));
+				}
+				catch (\phpbb\db\migration\exception $e)
+				{
+					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
+				}
+
+				$this->tpl_name = 'acp_ext_enable';
+
+				$this->template->assign_vars(array(
+					'U_RETURN'		=> $this->u_action . '&amp;action=list',
+				));
+			break;
+
+			case 'disable_pre':
+				if (!$this->ext_manager->is_enabled($ext_name))
+				{
+					redirect($this->u_action);
+				}
+
+				$this->tpl_name = 'acp_ext_disable';
+
+				$this->template->assign_vars(array(
+					'PRE'				=> true,
+					'L_CONFIRM_MESSAGE'	=> $this->user->lang('EXTENSION_DISABLE_CONFIRM', $md_manager->get_metadata('display-name')),
+					'U_DISABLE'			=> $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('disable.' . $ext_name),
+				));
+			break;
+
+			case 'disable':
+				if (!$this->ext_manager->is_enabled($ext_name))
+				{
+					redirect($this->u_action);
+				}
+
+				while ($this->ext_manager->disable_step($ext_name))
+				{
+					// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+					if ((time() - $start_time) >= $safe_time_limit)
+					{
+						$this->template->assign_var('S_NEXT_STEP', true);
+
+						meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('disable.' . $ext_name));
+					}
+				}
+				$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_EXT_DISABLE', time(), array($ext_name));
+
+				$this->tpl_name = 'acp_ext_disable';
+
+				$this->template->assign_vars(array(
+					'U_RETURN'	=> $this->u_action . '&amp;action=list',
+				));
+			break;
+
+			case 'delete_data_pre':
+				if ($this->ext_manager->is_enabled($ext_name))
+				{
+					redirect($this->u_action);
+				}
+				$this->tpl_name = 'acp_ext_delete_data';
+
+				$this->template->assign_vars(array(
+					'PRE'				=> true,
+					'L_CONFIRM_MESSAGE'	=> $this->user->lang('EXTENSION_DELETE_DATA_CONFIRM', $md_manager->get_metadata('display-name')),
+					'U_PURGE'			=> $this->u_action . '&amp;action=delete_data&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('delete_data.' . $ext_name),
+				));
+			break;
+
+			case 'delete_data':
+				if ($this->ext_manager->is_enabled($ext_name))
+				{
+					redirect($this->u_action);
+				}
+
+				try
+				{
+					while ($this->ext_manager->purge_step($ext_name))
+					{
+						// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+						if ((time() - $start_time) >= $safe_time_limit)
+						{
+							$this->template->assign_var('S_NEXT_STEP', true);
+
+							meta_refresh(0, $this->u_action . '&amp;action=delete_data&amp;ext_name=' . urlencode($ext_name) . '&amp;hash=' . generate_link_hash('delete_data.' . $ext_name));
+						}
+					}
+					$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_EXT_PURGE', time(), array($ext_name));
+				}
+				catch (\phpbb\db\migration\exception $e)
+				{
+					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
+				}
+
+				$this->tpl_name = 'acp_ext_delete_data';
+
+				$this->template->assign_vars(array(
+					'U_RETURN'	=> $this->u_action . '&amp;action=list',
+				));
+			break;
+
+			case 'details':
+				// Output it to the template
+				$meta = $md_manager->get_metadata('all');
+				$this->output_metadata_to_template($meta);
+
+				if (isset($meta['extra']['version-check']))
+				{
+					try
+					{
+						$updates_available = $this->ext_manager->version_check($md_manager, $this->request->variable('versioncheck_force', false), false, $this->config['extension_force_unstable'] ? 'unstable' : null);
+
+						$this->template->assign_vars(array(
+							'S_UP_TO_DATE' => empty($updates_available),
+							'UP_TO_DATE_MSG' => $this->user->lang(empty($updates_available) ? 'UP_TO_DATE' : 'NOT_UP_TO_DATE', $md_manager->get_metadata('display-name')),
+						));
+
+						$this->template->assign_block_vars('updates_available', $updates_available);
+					}
+					catch (exception_interface $e)
+					{
+						$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+
+						$this->template->assign_vars(array(
+							'S_VERSIONCHECK_FAIL' => true,
+							'VERSIONCHECK_FAIL_REASON' => ($e->getMessage() !== 'VERSIONCHECK_FAIL') ? $message : '',
+						));
+					}
+					$this->template->assign_var('S_VERSIONCHECK', true);
+				}
+				else
+				{
+					$this->template->assign_var('S_VERSIONCHECK', false);
+				}
+
+				$this->template->assign_vars(array(
+					'U_BACK'				=> $this->u_action . '&amp;action=list',
+					'U_VERSIONCHECK_FORCE'	=> $this->u_action . '&amp;action=details&amp;versioncheck_force=1&amp;ext_name=' . urlencode($md_manager->get_metadata('name')),
+				));
+
+				$this->tpl_name = 'acp_ext_details';
+			break;
+		}
+
+		/**
+		* Event to run after a specific action on extension has completed
+		*
+		* @event core.acp_extensions_run_action_after
+		* @var	string	action			Action that has run
+		* @var	string	u_action		Url we are at
+		* @var	string	ext_name		Extension name from request
+		* @var	int		safe_time_limit	Safe limit of execution time
+		* @var	int		start_time		Start time
+		* @var	string	tpl_name		Template file to load
+		* @since 3.1.11-RC1
+		*/
+		$u_action = $this->u_action;
+		$tpl_name = $this->tpl_name;
+		$vars = array('action', 'u_action', 'ext_name', 'safe_time_limit', 'start_time', 'tpl_name');
+		extract($this->phpbb_dispatcher->trigger_event('core.acp_extensions_run_action_after', compact($vars)));
+
+		// In case they have been updated by the event
+		$this->u_action = $u_action;
+		$this->tpl_name = $tpl_name;
+	}
+
+	/**
+	* Lists all the enabled extensions and dumps to the template
+	*
+	* @return null
+	*/
+	public function list_enabled_exts()
+	{
+		$enabled_extension_meta_data = array();
+
+		foreach ($this->ext_manager->all_enabled() as $name => $location)
+		{
+			$md_manager = $this->ext_manager->create_extension_metadata_manager($name);
+
+			try
+			{
+				$meta = $md_manager->get_metadata('all');
+				$enabled_extension_meta_data[$name] = array(
+					'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'),
+					'META_VERSION' => $meta['version'],
+				);
+
+				if (isset($meta['extra']['version-check']))
+				{
+					try
+					{
+						$force_update = $this->request->variable('versioncheck_force', false);
+						$updates = $this->ext_manager->version_check($md_manager, $force_update, !$force_update);
+
+						$enabled_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates);
+						$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
+						$enabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&amp;action=details&amp;versioncheck_force=1&amp;ext_name=' . urlencode($md_manager->get_metadata('name'));
+					}
+					catch (exception_interface $e)
+					{
+						// Ignore exceptions due to the version check
+					}
+				}
+				else
+				{
+					$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+				}
+			}
+			catch (exception_interface $e)
+			{
+				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+				$this->template->assign_block_vars('disabled', array(
+					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $message),
+					'S_VERSIONCHECK'		=> false,
+				));
+			}
+			catch (\RuntimeException $e)
+			{
+				$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+			}
+		}
+
+		uasort($enabled_extension_meta_data, array($this, 'sort_extension_meta_data_table'));
+
+		foreach ($enabled_extension_meta_data as $name => $block_vars)
+		{
+			$block_vars['NAME'] = $name;
+			$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
+
+			$this->template->assign_block_vars('enabled', $block_vars);
+
+			$this->output_actions('enabled', array(
+				'DISABLE'		=> $this->u_action . '&amp;action=disable_pre&amp;ext_name=' . urlencode($name),
+			));
+		}
+	}
+
+	/**
+	* Lists all the disabled extensions and dumps to the template
+	*
+	* @return null
+	*/
+	public function list_disabled_exts()
+	{
+		$disabled_extension_meta_data = array();
+
+		foreach ($this->ext_manager->all_disabled() as $name => $location)
+		{
+			$md_manager = $this->ext_manager->create_extension_metadata_manager($name);
+
+			try
+			{
+				$meta = $md_manager->get_metadata('all');
+				$disabled_extension_meta_data[$name] = array(
+					'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'),
+					'META_VERSION' => $meta['version'],
+				);
+
+				if (isset($meta['extra']['version-check']))
+				{
+					$force_update = $this->request->variable('versioncheck_force', false);
+					$updates = $this->ext_manager->version_check($md_manager, $force_update, !$force_update);
+
+					$disabled_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates);
+					$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
+					$disabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&amp;action=details&amp;versioncheck_force=1&amp;ext_name=' . urlencode($md_manager->get_metadata('name'));
+				}
+				else
+				{
+					$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+				}
+			}
+			catch (version_check_exception $e)
+			{
+				$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+			}
+			catch (exception_interface $e)
+			{
+				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+				$this->template->assign_block_vars('disabled', array(
+					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $message),
+					'S_VERSIONCHECK'		=> false,
+				));
+			}
+			catch (\RuntimeException $e)
+			{
+				$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+			}
+		}
+
+		uasort($disabled_extension_meta_data, array($this, 'sort_extension_meta_data_table'));
+
+		foreach ($disabled_extension_meta_data as $name => $block_vars)
+		{
+			$block_vars['NAME'] = $name;
+			$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
+
+			$this->template->assign_block_vars('disabled', $block_vars);
+
+			$this->output_actions('disabled', array(
+				'ENABLE'		=> $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
+				'DELETE_DATA'	=> $this->u_action . '&amp;action=delete_data_pre&amp;ext_name=' . urlencode($name),
+			));
+		}
+	}
+
+	/**
+	* Lists all the available extensions and dumps to the template
+	*
+	* @return null
+	*/
+	public function list_available_exts()
+	{
+		$uninstalled = array_diff_key($this->ext_manager->all_available(), $this->ext_manager->all_configured());
+
+		$available_extension_meta_data = array();
+
+		foreach ($uninstalled as $name => $location)
+		{
+			$md_manager = $this->ext_manager->create_extension_metadata_manager($name);
+
+			try
+			{
+				$meta = $md_manager->get_metadata('all');
+				$available_extension_meta_data[$name] = array(
+					'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'),
+					'META_VERSION' => $meta['version'],
+				);
+
+				if (isset($meta['extra']['version-check']))
+				{
+					$force_update = $this->request->variable('versioncheck_force', false);
+					$updates = $this->ext_manager->version_check($md_manager, $force_update, !$force_update);
+
+					$available_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates);
+					$available_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
+					$available_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&amp;action=details&amp;versioncheck_force=1&amp;ext_name=' . urlencode($md_manager->get_metadata('name'));
+				}
+				else
+				{
+					$available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+				}
+			}
+			catch (version_check_exception $e)
+			{
+				$available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+			}
+			catch (exception_interface $e)
+			{
+				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+				$this->template->assign_block_vars('disabled', array(
+					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $message),
+					'S_VERSIONCHECK'		=> false,
+				));
+			}
+		}
+
+		uasort($available_extension_meta_data, array($this, 'sort_extension_meta_data_table'));
+
+		foreach ($available_extension_meta_data as $name => $block_vars)
+		{
+			$block_vars['NAME'] = $name;
+			$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
+
+			$this->template->assign_block_vars('disabled', $block_vars);
+
+			$this->output_actions('disabled', array(
+				'ENABLE'		=> $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
+			));
+		}
+	}
+
+	/**
+	* Output actions to a block
+	*
+	* @param string $block
+	* @param array $actions
+	*/
+	private function output_actions($block, $actions)
+	{
+		foreach ($actions as $lang => $url)
+		{
+			$this->template->assign_block_vars($block . '.actions', array(
+				'L_ACTION'			=> $this->user->lang('EXTENSION_' . $lang),
+				'L_ACTION_EXPLAIN'	=> (isset($this->user->lang['EXTENSION_' . $lang . '_EXPLAIN'])) ? $this->user->lang('EXTENSION_' . $lang . '_EXPLAIN') : '',
+				'U_ACTION'			=> $url,
+			));
+		}
+	}
+
+	/**
+	* Sort helper for the table containing the metadata about the extensions.
+	*/
+	protected function sort_extension_meta_data_table($val1, $val2)
+	{
+		return strnatcasecmp($val1['META_DISPLAY_NAME'], $val2['META_DISPLAY_NAME']);
+	}
+
+	/**
+	* Outputs extension metadata into the template
+	*
+	* @param array $metadata Array with all metadata for the extension
+	* @return null
+	*/
+	public function output_metadata_to_template($metadata)
+	{
+		$this->template->assign_vars(array(
+			'META_NAME'			=> $metadata['name'],
+			'META_TYPE'			=> $metadata['type'],
+			'META_DESCRIPTION'	=> (isset($metadata['description'])) ? $metadata['description'] : '',
+			'META_HOMEPAGE'		=> (isset($metadata['homepage'])) ? $metadata['homepage'] : '',
+			'META_VERSION'		=> $metadata['version'],
+			'META_TIME'			=> (isset($metadata['time'])) ? $metadata['time'] : '',
+			'META_LICENSE'		=> $metadata['license'],
+
+			'META_REQUIRE_PHP'		=> (isset($metadata['require']['php'])) ? $metadata['require']['php'] : '',
+			'META_REQUIRE_PHP_FAIL'	=> (isset($metadata['require']['php'])) ? false : true,
+
+			'META_REQUIRE_PHPBB'		=> (isset($metadata['extra']['soft-require']['phpbb/phpbb'])) ? $metadata['extra']['soft-require']['phpbb/phpbb'] : '',
+			'META_REQUIRE_PHPBB_FAIL'	=> (isset($metadata['extra']['soft-require']['phpbb/phpbb'])) ? false : true,
+
+			'META_DISPLAY_NAME'	=> (isset($metadata['extra']['display-name'])) ? $metadata['extra']['display-name'] : '',
+		));
+
+		foreach ($metadata['authors'] as $author)
+		{
+			$this->template->assign_block_vars('meta_authors', array(
+				'AUTHOR_NAME'		=> $author['name'],
+				'AUTHOR_EMAIL'		=> (isset($author['email'])) ? $author['email'] : '',
+				'AUTHOR_HOMEPAGE'	=> (isset($author['homepage'])) ? $author['homepage'] : '',
+				'AUTHOR_ROLE'		=> (isset($author['role'])) ? $author['role'] : '',
+			));
+		}
+	}
+}

includes/acp/acp_help_phpbb.php

@@ -0,0 +1,143 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_help_phpbb
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $config, $request, $template, $user, $phpbb_dispatcher, $phpbb_admin_path, $phpbb_root_path, $phpEx;
+
+		if (!class_exists('phpbb_questionnaire_data_collector'))
+		{
+			include($phpbb_root_path . 'includes/questionnaire/questionnaire.' . $phpEx);
+		}
+
+		$collect_url = "https://www.phpbb.com/stats/receive_stats.php";
+
+		$this->tpl_name = 'acp_help_phpbb';
+		$this->page_title = 'ACP_HELP_PHPBB';
+
+		$submit = ($request->is_set_post('submit')) ? true : false;
+
+		$form_key = 'acp_help_phpbb';
+		add_form_key($form_key);
+		$error = array();
+
+		if ($submit && !check_form_key($form_key))
+		{
+			$error[] = $user->lang['FORM_INVALID'];
+		}
+		// Do not write values if there is an error
+		if (count($error))
+		{
+			$submit = false;
+		}
+
+		// generate a unique id if necessary
+		if (!isset($config['questionnaire_unique_id']))
+		{
+			$install_id = unique_id();
+			$config->set('questionnaire_unique_id', $install_id);
+		}
+		else
+		{
+			$install_id = $config['questionnaire_unique_id'];
+		}
+
+		$collector = new phpbb_questionnaire_data_collector($install_id);
+
+		// Add data provider
+		$collector->add_data_provider(new phpbb_questionnaire_php_data_provider());
+		$collector->add_data_provider(new phpbb_questionnaire_system_data_provider());
+		$collector->add_data_provider(new phpbb_questionnaire_phpbb_data_provider($config));
+
+		/**
+		 * Event to modify ACP help phpBB page and/or listen to submit
+		 *
+		 * @event core.acp_help_phpbb_submit_before
+		 * @var	boolean	submit			Do we display the form or process the submission
+		 * @since 3.2.0-RC2
+		 */
+		$vars = array('submit');
+		extract($phpbb_dispatcher->trigger_event('core.acp_help_phpbb_submit_before', compact($vars)));
+
+		if ($submit)
+		{
+			$config->set('help_send_statistics', $request->variable('help_send_statistics', false));
+			$response = $request->variable('send_statistics_response', '');
+
+			$config->set('help_send_statistics_time', time());
+
+			if (!empty($response))
+			{
+				if ((strpos($response, 'Thank you') !== false || strpos($response, 'Flood protection') !== false))
+				{
+					trigger_error($user->lang('THANKS_SEND_STATISTICS') . adm_back_link($this->u_action));
+				}
+				else
+				{
+					trigger_error($user->lang('FAIL_SEND_STATISTICS') . adm_back_link($this->u_action));
+				}
+			}
+
+			trigger_error($user->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
+		}
+
+		$template->assign_vars(array(
+			'U_COLLECT_STATS'		=> $collect_url,
+			'S_COLLECT_STATS'		=> (!empty($config['help_send_statistics'])) ? true : false,
+			'RAW_DATA'				=> $collector->get_data_for_form(),
+			'U_ACP_MAIN'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
+			'U_ACTION'				=> $this->u_action,
+			// Pass earliest time we should try to send stats again
+			'COLLECT_STATS_TIME'	=> intval($config['help_send_statistics_time']) + 86400,
+		));
+
+		$raw = $collector->get_data_raw();
+
+		foreach ($raw as $provider => $data)
+		{
+			if ($provider == 'install_id')
+			{
+				$data = array($provider => $data);
+			}
+
+			$template->assign_block_vars('providers', array(
+				'NAME'	=> htmlspecialchars($provider),
+			));
+
+			foreach ($data as $key => $value)
+			{
+				if (is_array($value))
+				{
+					$value = utf8_wordwrap(serialize($value), 75, "\n", true);
+				}
+
+				$template->assign_block_vars('providers.values', array(
+					'KEY'	=> utf8_htmlspecialchars($key),
+					'VALUE'	=> utf8_htmlspecialchars($value),
+				));
+			}
+		}
+	}
+}

includes/acp/acp_icons.php

@@ -0,0 +1,999 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @todo [smilies] check regular expressions for special char replacements (stored specialchared in db)
+*/
+class acp_icons
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $cache;
+		global $config, $phpbb_root_path;
+		global $request, $phpbb_container;
+
+		$user->add_lang('acp/posting');
+
+		// Set up general vars
+		$action = $request->variable('action', '');
+		$action = (isset($_POST['add'])) ? 'add' : $action;
+		$action = (isset($_POST['edit'])) ? 'edit' : $action;
+		$action = (isset($_POST['import'])) ? 'import' : $action;
+		$icon_id = $request->variable('id', 0);
+		$submit = $request->is_set_post('submit', false);
+
+		$form_key = 'acp_icons';
+		add_form_key($form_key);
+
+		$mode = ($mode == 'smilies') ? 'smilies' : 'icons';
+
+		$this->tpl_name = 'acp_icons';
+
+		// What are we working on?
+		switch ($mode)
+		{
+			case 'smilies':
+				$table = SMILIES_TABLE;
+				$lang = 'SMILIES';
+				$fields = 'smiley';
+				$img_path = $config['smilies_path'];
+			break;
+
+			case 'icons':
+				$table = ICONS_TABLE;
+				$lang = 'ICONS';
+				$fields = 'icons';
+				$img_path = $config['icons_path'];
+			break;
+		}
+
+		$this->page_title = 'ACP_' . $lang;
+
+		// Clear some arrays
+		$_images = $_paks = array();
+		$notice = '';
+
+		// Grab file list of paks and images
+		if ($action == 'edit' || $action == 'add' || $action == 'import')
+		{
+			$imglist = filelist($phpbb_root_path . $img_path, '');
+
+			foreach ($imglist as $path => $img_ary)
+			{
+				if (empty($img_ary))
+				{
+					continue;
+				}
+
+				asort($img_ary, SORT_STRING);
+
+				foreach ($img_ary as $img)
+				{
+					$img_size = getimagesize($phpbb_root_path . $img_path . '/' . $path . $img);
+
+					if (!$img_size[0] || !$img_size[1] || strlen($img) > 255)
+					{
+						continue;
+					}
+
+					// adjust the width and height to be lower than 128px while perserving the aspect ratio (for icons)
+					if ($mode == 'icons')
+					{
+						if ($img_size[0] > 127 && $img_size[0] > $img_size[1])
+						{
+							$img_size[1] = (int) ($img_size[1] * (127 / $img_size[0]));
+							$img_size[0] = 127;
+						}
+						else if ($img_size[1] > 127)
+						{
+							$img_size[0] = (int) ($img_size[0] * (127 / $img_size[1]));
+							$img_size[1] = 127;
+						}
+					}
+
+					$_images[$path . $img]['file'] = $path . $img;
+					$_images[$path . $img]['width'] = $img_size[0];
+					$_images[$path . $img]['height'] = $img_size[1];
+				}
+			}
+			unset($imglist);
+
+			if ($dir = @opendir($phpbb_root_path . $img_path))
+			{
+				while (($file = readdir($dir)) !== false)
+				{
+					if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file))
+					{
+						$_paks[] = $file;
+					}
+				}
+				closedir($dir);
+
+				if (!empty($_paks))
+				{
+					asort($_paks, SORT_STRING);
+				}
+			}
+		}
+
+		// What shall we do today? Oops, I believe that's trademarked ...
+		switch ($action)
+		{
+			case 'edit':
+				unset($_images);
+				$_images = array();
+
+			// no break;
+
+			case 'add':
+
+				$smilies = $default_row = array();
+				$smiley_options = $order_list = $add_order_list = '';
+
+				if ($action == 'add' && $mode == 'smilies')
+				{
+					$sql = 'SELECT *
+						FROM ' . SMILIES_TABLE . '
+						ORDER BY smiley_order';
+					$result = $db->sql_query($sql);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						if (empty($smilies[$row['smiley_url']]))
+						{
+							$smilies[$row['smiley_url']] = $row;
+						}
+					}
+					$db->sql_freeresult($result);
+
+					if (count($smilies))
+					{
+						foreach ($smilies as $row)
+						{
+							$selected = false;
+
+							if (!$smiley_options)
+							{
+								$selected = true;
+								$default_row = $row;
+							}
+							$smiley_options .= '<option value="' . $row['smiley_url'] . '"' . (($selected) ? ' selected="selected"' : '') . '>' . $row['smiley_url'] . '</option>';
+
+							$template->assign_block_vars('smile', array(
+								'SMILEY_URL'	=> addslashes($row['smiley_url']),
+								'CODE'			=> addslashes($row['code']),
+								'EMOTION'		=> addslashes($row['emotion']),
+								'WIDTH'			=> $row['smiley_width'],
+								'HEIGHT'		=> $row['smiley_height'],
+								'ORDER'			=> $row['smiley_order'] + 1,
+							));
+						}
+					}
+				}
+
+				$sql = "SELECT *
+					FROM $table
+					ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC');
+				$result = $db->sql_query($sql);
+
+				$data = array();
+				$after = false;
+				$order_lists = array('', '');
+				$add_order_lists = array('', '');
+				$display_count = 0;
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					if ($action == 'add')
+					{
+						unset($_images[$row[$fields . '_url']]);
+					}
+
+					if ($row[$fields . '_id'] == $icon_id)
+					{
+						$after = true;
+						$data[$row[$fields . '_url']] = $row;
+					}
+					else
+					{
+						if ($action == 'edit' && !$icon_id)
+						{
+							$data[$row[$fields . '_url']] = $row;
+						}
+
+						$selected = '';
+						if (!empty($after))
+						{
+							$selected = ' selected="selected"';
+							$after = false;
+						}
+						if ($row['display_on_posting'])
+						{
+							$display_count++;
+						}
+						$after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url'];
+						$order_lists[$row['display_on_posting']] = '<option value="' . ($row[$fields . '_order'] + 1) . '"' . $selected . '>' . sprintf($user->lang['AFTER_' . $lang], ' -&gt; ' . $after_txt) . '</option>' . $order_lists[$row['display_on_posting']];
+
+						if (!empty($default_row))
+						{
+							$add_order_lists[$row['display_on_posting']] = '<option value="' . ($row[$fields . '_order'] + 1) . '"' . (($row[$fields . '_id'] == $default_row['smiley_id']) ? ' selected="selected"' : '') . '>' . sprintf($user->lang['AFTER_' . $lang], ' -&gt; ' . $after_txt) . '</option>' . $add_order_lists[$row['display_on_posting']];
+						}
+					}
+				}
+				$db->sql_freeresult($result);
+
+				$order_list = '<option value="1"' . ((!isset($after)) ? ' selected="selected"' : '') . '>' . $user->lang['FIRST'] . '</option>';
+				$add_order_list = '<option value="1">' . $user->lang['FIRST'] . '</option>';
+
+				if ($action == 'add')
+				{
+					$data = $_images;
+				}
+
+				$colspan = (($mode == 'smilies') ? 7 : 6);
+				$colspan += ($icon_id) ? 1 : 0;
+				$colspan += ($action == 'add') ? 2 : 0;
+
+				$template->assign_vars(array(
+					'S_EDIT'		=> true,
+					'S_SMILIES'		=> ($mode == 'smilies') ? true : false,
+					'S_ADD'			=> ($action == 'add') ? true : false,
+
+					'S_ORDER_LIST_DISPLAY'		=> $order_list . $order_lists[1],
+					'S_ORDER_LIST_UNDISPLAY'	=> $order_list . $order_lists[0],
+					'S_ORDER_LIST_DISPLAY_COUNT'	=> $display_count + 1,
+
+					'L_TITLE'		=> $user->lang['ACP_' . $lang],
+					'L_EXPLAIN'		=> $user->lang['ACP_' . $lang . '_EXPLAIN'],
+					'L_CONFIG'		=> $user->lang[$lang . '_CONFIG'],
+					'L_URL'			=> $user->lang[$lang . '_URL'],
+					'L_LOCATION'	=> $user->lang[$lang . '_LOCATION'],
+					'L_WIDTH'		=> $user->lang[$lang . '_WIDTH'],
+					'L_HEIGHT'		=> $user->lang[$lang . '_HEIGHT'],
+					'L_ORDER'		=> $user->lang[$lang . '_ORDER'],
+					'L_NO_ICONS'	=> $user->lang['NO_' . $lang . '_' . strtoupper($action)],
+
+					'COLSPAN'		=> $colspan,
+					'ID'			=> $icon_id,
+
+					'U_BACK'		=> $this->u_action,
+					'U_ACTION'		=> $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify'),
+				));
+
+				foreach ($data as $img => $img_row)
+				{
+					$template->assign_block_vars('items', array(
+						'IMG'		=> $img,
+						'A_IMG'		=> addslashes($img),
+						'IMG_SRC'	=> $phpbb_root_path . $img_path . '/' . $img,
+
+						'CODE'		=> ($mode == 'smilies' && isset($img_row['code'])) ? $img_row['code'] : '',
+						'EMOTION'	=> ($mode == 'smilies' && isset($img_row['emotion'])) ? $img_row['emotion'] : '',
+
+						'S_ID'				=> (isset($img_row[$fields . '_id'])) ? true : false,
+						'ID'				=> (isset($img_row[$fields . '_id'])) ? $img_row[$fields . '_id'] : 0,
+						'WIDTH'				=> (!empty($img_row[$fields .'_width'])) ? $img_row[$fields .'_width'] : $img_row['width'],
+						'HEIGHT'			=> (!empty($img_row[$fields .'_height'])) ? $img_row[$fields .'_height'] : $img_row['height'],
+						'TEXT_ALT'		    => ($mode == 'icons' && !empty($img_row['icons_alt'])) ? $img_row['icons_alt'] : $img,
+						'ALT'			    => ($mode == 'icons' && !empty($img_row['icons_alt'])) ? $img_row['icons_alt'] : '',
+						'POSTING_CHECKED'	=> (!empty($img_row['display_on_posting']) || $action == 'add') ? ' checked="checked"' : '',
+					));
+				}
+
+				// Ok, another row for adding an addition code for a pre-existing image...
+				if ($action == 'add' && $mode == 'smilies' && count($smilies))
+				{
+					$template->assign_vars(array(
+						'S_ADD_CODE'		=> true,
+
+						'S_IMG_OPTIONS'		=> $smiley_options,
+
+						'S_ADD_ORDER_LIST_DISPLAY'		=> $add_order_list . $add_order_lists[1],
+						'S_ADD_ORDER_LIST_UNDISPLAY'	=> $add_order_list . $add_order_lists[0],
+
+						'IMG_SRC'			=> $phpbb_root_path . $img_path . '/' . $default_row['smiley_url'],
+						'IMG_PATH'			=> $img_path,
+
+						'CODE'				=> $default_row['code'],
+						'EMOTION'			=> $default_row['emotion'],
+
+						'WIDTH'				=> $default_row['smiley_width'],
+						'HEIGHT'			=> $default_row['smiley_height'],
+					));
+				}
+
+				return;
+
+			break;
+
+			case 'create':
+			case 'modify':
+
+				if (!check_form_key($form_key))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Get items to create/modify
+				$images = (isset($_POST['image'])) ? array_keys($request->variable('image', array('' => 0))) : array();
+
+				// Now really get the items
+				$image_id		= (isset($_POST['id'])) ? $request->variable('id', array('' => 0)) : array();
+				$image_order	= (isset($_POST['order'])) ? $request->variable('order', array('' => 0)) : array();
+				$image_width	= (isset($_POST['width'])) ? $request->variable('width', array('' => 0)) : array();
+				$image_height	= (isset($_POST['height'])) ? $request->variable('height', array('' => 0)) : array();
+				$image_add		= (isset($_POST['add_img'])) ? $request->variable('add_img', array('' => 0)) : array();
+				$image_emotion	= $request->variable('emotion', array('' => ''), true);
+				$image_code		= $request->variable('code', array('' => ''), true);
+				$image_alt		= ($request->is_set_post('alt')) ? $request->variable('alt', array('' => ''), true) : array();
+				$image_display_on_posting = (isset($_POST['display_on_posting'])) ? $request->variable('display_on_posting', array('' => 0)) : array();
+
+				// Ok, add the relevant bits if we are adding new codes to existing emoticons...
+				if ($request->variable('add_additional_code', false, false, \phpbb\request\request_interface::POST))
+				{
+					$add_image			= $request->variable('add_image', '');
+					$add_code			= $request->variable('add_code', '', true);
+					$add_emotion		= $request->variable('add_emotion', '', true);
+
+					if ($add_image && $add_emotion && $add_code)
+					{
+						$images[] = $add_image;
+						$image_add[$add_image] = true;
+
+						$image_code[$add_image] = $add_code;
+						$image_emotion[$add_image] = $add_emotion;
+						$image_width[$add_image] = $request->variable('add_width', 0);
+						$image_height[$add_image] = $request->variable('add_height', 0);
+
+						if ($request->variable('add_display_on_posting', false, false, \phpbb\request\request_interface::POST))
+						{
+							$image_display_on_posting[$add_image] = 1;
+						}
+
+						$image_order[$add_image] = $request->variable('add_order', 0);
+					}
+				}
+
+				if ($mode == 'smilies' && $action == 'create')
+				{
+					$smiley_count = $this->item_count($table);
+
+					$addable_smileys_count = count($images);
+					foreach ($images as $image)
+					{
+						if (!isset($image_add[$image]))
+						{
+							--$addable_smileys_count;
+						}
+					}
+
+					if ($smiley_count + $addable_smileys_count > SMILEY_LIMIT)
+					{
+						trigger_error($user->lang('TOO_MANY_SMILIES', SMILEY_LIMIT) . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+				}
+
+				$icons_updated = 0;
+				$errors = array();
+				foreach ($images as $image)
+				{
+					if ($mode == 'smilies' && ($image_emotion[$image] == '' || $image_code[$image] == ''))
+					{
+						$errors[$image] = 'SMILIE_NO_' . (($image_emotion[$image] == '') ? 'EMOTION' : 'CODE');
+					}
+					else if ($action == 'create' && !isset($image_add[$image]))
+					{
+						// skip images where add wasn't checked
+					}
+					else if (!file_exists($phpbb_root_path . $img_path . '/' . $image))
+					{
+						$errors[$image] = 'SMILIE_NO_FILE';
+					}
+					else
+					{
+						if ($image_width[$image] == 0 || $image_height[$image] == 0)
+						{
+							$img_size = getimagesize($phpbb_root_path . $img_path . '/' . $image);
+							$image_width[$image] = $img_size[0];
+							$image_height[$image] = $img_size[1];
+						}
+
+						// Adjust image width/height for icons
+						if ($mode == 'icons')
+						{
+							if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image])
+							{
+								$image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image]));
+								$image_width[$image] = 127;
+							}
+							else if ($image_height[$image] > 127)
+							{
+								$image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image]));
+								$image_height[$image] = 127;
+							}
+						}
+
+						$img_sql = array(
+							$fields . '_url'		=> $image,
+							$fields . '_width'		=> $image_width[$image],
+							$fields . '_height'		=> $image_height[$image],
+							'display_on_posting'	=> (isset($image_display_on_posting[$image])) ? 1 : 0,
+						);
+
+						if ($mode == 'smilies')
+						{
+							$img_sql = array_merge($img_sql, array(
+								'emotion'	=> $image_emotion[$image],
+								'code'		=> $image_code[$image])
+							);
+						}
+
+						if ($mode == 'icons')
+						{
+							$img_sql = array_merge($img_sql, array(
+								'icons_alt'	=> $image_alt[$image])
+							);
+						}
+
+						// Image_order holds the 'new' order value
+						if (!empty($image_order[$image]))
+						{
+							$img_sql = array_merge($img_sql, array(
+								$fields . '_order'	=>	$image_order[$image])
+							);
+
+							// Since we always add 'after' an item, we just need to increase all following + the current by one
+							$sql = "UPDATE $table
+								SET {$fields}_order = {$fields}_order + 1
+								WHERE {$fields}_order >= {$image_order[$image]}";
+							$db->sql_query($sql);
+
+							// If we adjust the order, we need to adjust all other orders too - they became inaccurate...
+							foreach ($image_order as $_image => $_order)
+							{
+								if ($_image == $image)
+								{
+									continue;
+								}
+
+								if ($_order >= $image_order[$image])
+								{
+									$image_order[$_image]++;
+								}
+							}
+						}
+
+						if ($action == 'modify'  && !empty($image_id[$image]))
+						{
+							$sql = "UPDATE $table
+								SET " . $db->sql_build_array('UPDATE', $img_sql) . "
+								WHERE {$fields}_id = " . $image_id[$image];
+							$db->sql_query($sql);
+							$icons_updated++;
+						}
+						else if ($action !== 'modify')
+						{
+							$sql = "INSERT INTO $table " . $db->sql_build_array('INSERT', $img_sql);
+							$db->sql_query($sql);
+							$icons_updated++;
+						}
+
+					}
+				}
+
+				$cache->destroy('_icons');
+				$cache->destroy('sql', $table);
+				$phpbb_container->get('text_formatter.cache')->invalidate();
+
+				$level = ($icons_updated) ? E_USER_NOTICE : E_USER_WARNING;
+				$errormsgs = '';
+				foreach ($errors as $img => $error)
+				{
+					$errormsgs .= '<br />' . sprintf($user->lang[$error], $img);
+				}
+				if ($action == 'modify')
+				{
+					trigger_error($user->lang($lang . '_EDITED', $icons_updated) . $errormsgs . adm_back_link($this->u_action), $level);
+				}
+				else
+				{
+					trigger_error($user->lang($lang . '_ADDED', $icons_updated) . $errormsgs . adm_back_link($this->u_action), $level);
+				}
+
+			break;
+
+			case 'import':
+
+				$pak = $request->variable('pak', '');
+				$current = $request->variable('current', '');
+
+				if ($pak != '')
+				{
+					$order = 0;
+
+					if (!check_form_key($form_key))
+					{
+						trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak)))
+					{
+						trigger_error($user->lang['PAK_FILE_NOT_READABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					// Make sure the pak_ary is valid
+					foreach ($pak_ary as $pak_entry)
+					{
+						if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
+						{
+							if ((count($data[1]) != 4 && $mode == 'icons') ||
+								((count($data[1]) != 6 || (empty($data[1][4]) || empty($data[1][5]))) && $mode == 'smilies' ))
+							{
+								trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
+							}
+						}
+						else
+						{
+							trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+					}
+
+					// The user has already selected a smilies_pak file
+					if ($current == 'delete')
+					{
+						switch ($db->get_sql_layer())
+						{
+							case 'sqlite3':
+								$db->sql_query('DELETE FROM ' . $table);
+							break;
+
+							default:
+								$db->sql_query('TRUNCATE TABLE ' . $table);
+							break;
+						}
+
+						switch ($mode)
+						{
+							case 'smilies':
+							break;
+
+							case 'icons':
+								// Reset all icon_ids
+								$db->sql_query('UPDATE ' . TOPICS_TABLE . ' SET icon_id = 0');
+								$db->sql_query('UPDATE ' . POSTS_TABLE . ' SET icon_id = 0');
+							break;
+						}
+					}
+					else
+					{
+						$cur_img = array();
+
+						$field_sql = ($mode == 'smilies') ? 'code' : 'icons_url';
+
+						$sql = "SELECT $field_sql
+							FROM $table";
+						$result = $db->sql_query($sql);
+
+						while ($row = $db->sql_fetchrow($result))
+						{
+							++$order;
+							$cur_img[$row[$field_sql]] = 1;
+						}
+						$db->sql_freeresult($result);
+					}
+
+					if ($mode == 'smilies')
+					{
+						$smiley_count = $this->item_count($table);
+						if ($smiley_count + count($pak_ary) > SMILEY_LIMIT)
+						{
+							trigger_error($user->lang('TOO_MANY_SMILIES', SMILEY_LIMIT) . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+					}
+
+					foreach ($pak_ary as $pak_entry)
+					{
+						$data = array();
+						if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
+						{
+							if ((count($data[1]) != 4 && $mode == 'icons') ||
+								(count($data[1]) != 6 && $mode == 'smilies'))
+							{
+								trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
+							}
+
+							// Stripslash here because it got addslashed before... (on export)
+							$img = stripslashes($data[1][0]);
+							$width = stripslashes($data[1][1]);
+							$height = stripslashes($data[1][2]);
+							$display_on_posting = stripslashes($data[1][3]);
+
+							if (isset($data[1][4]) && isset($data[1][5]))
+							{
+								$emotion = stripslashes($data[1][4]);
+								$code = stripslashes($data[1][5]);
+							}
+
+							if ($current == 'replace' &&
+								(($mode == 'smilies' && !empty($cur_img[$code])) ||
+								($mode == 'icons' && !empty($cur_img[$img]))))
+							{
+								$replace_sql = ($mode == 'smilies') ? $code : $img;
+								$sql = array(
+									$fields . '_url'		=> $img,
+									$fields . '_height'		=> (int) $height,
+									$fields . '_width'		=> (int) $width,
+									'display_on_posting'	=> (int) $display_on_posting,
+								);
+
+								if ($mode == 'smilies')
+								{
+									$sql = array_merge($sql, array(
+										'emotion'				=> $emotion,
+									));
+								}
+
+								$sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . "
+									WHERE $field_sql = '" . $db->sql_escape($replace_sql) . "'";
+								$db->sql_query($sql);
+							}
+							else
+							{
+								++$order;
+
+								$sql = array(
+									$fields . '_url'	=> $img,
+									$fields . '_height'	=> (int) $height,
+									$fields . '_width'	=> (int) $width,
+									$fields . '_order'	=> (int) $order,
+									'display_on_posting'=> (int) $display_on_posting,
+								);
+
+								if ($mode == 'smilies')
+								{
+									$sql = array_merge($sql, array(
+										'code'				=> $code,
+										'emotion'			=> $emotion,
+									));
+								}
+								$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql));
+							}
+						}
+					}
+
+					$cache->destroy('_icons');
+					$cache->destroy('sql', $table);
+					$phpbb_container->get('text_formatter.cache')->invalidate();
+
+					trigger_error($user->lang[$lang . '_IMPORT_SUCCESS'] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					$pak_options = '';
+
+					foreach ($_paks as $pak)
+					{
+						$pak_options .= '<option value="' . $pak . '">' . htmlspecialchars($pak) . '</option>';
+					}
+
+					$template->assign_vars(array(
+						'S_CHOOSE_PAK'		=> true,
+						'S_PAK_OPTIONS'		=> $pak_options,
+
+						'L_TITLE'			=> $user->lang['ACP_' . $lang],
+						'L_EXPLAIN'			=> $user->lang['ACP_' . $lang . '_EXPLAIN'],
+						'L_NO_PAK_OPTIONS'	=> $user->lang['NO_' . $lang . '_PAK'],
+						'L_CURRENT'			=> $user->lang['CURRENT_' . $lang],
+						'L_CURRENT_EXPLAIN'	=> $user->lang['CURRENT_' . $lang . '_EXPLAIN'],
+						'L_IMPORT_SUBMIT'	=> $user->lang['IMPORT_' . $lang],
+
+						'U_BACK'		=> $this->u_action,
+						'U_ACTION'		=> $this->u_action . '&amp;action=import',
+						)
+					);
+				}
+			break;
+
+			case 'export':
+
+				$this->page_title = 'EXPORT_' . $lang;
+				$this->tpl_name = 'message_body';
+
+				$template->assign_vars(array(
+					'MESSAGE_TITLE'		=> $user->lang['EXPORT_' . $lang],
+					'MESSAGE_TEXT'		=> sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="' . $this->u_action . '&amp;action=send&amp;hash=' . generate_link_hash('acp_icons') . '">', '</a>'),
+
+					'S_USER_NOTICE'		=> true,
+					)
+				);
+
+				return;
+
+			break;
+
+			case 'send':
+
+				if (!check_link_hash($request->variable('hash', ''), 'acp_icons'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql = "SELECT *
+					FROM $table
+					ORDER BY {$fields}_order";
+				$result = $db->sql_query($sql);
+
+				$pak = '';
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$pak .= "'" . addslashes($row[$fields . '_url']) . "', ";
+					$pak .= "'" . addslashes($row[$fields . '_width']) . "', ";
+					$pak .= "'" . addslashes($row[$fields . '_height']) . "', ";
+					$pak .= "'" . addslashes($row['display_on_posting']) . "', ";
+
+					if ($mode == 'smilies')
+					{
+						$pak .= "'" . addslashes($row['emotion']) . "', ";
+						$pak .= "'" . addslashes($row['code']) . "', ";
+					}
+
+					$pak .= "\n";
+				}
+				$db->sql_freeresult($result);
+
+				if ($pak != '')
+				{
+					garbage_collection();
+
+					header('Cache-Control: public');
+
+					// Send out the Headers
+					header('Content-Type: text/x-delimtext; name="' . $mode . '.pak"');
+					header('Content-Disposition: inline; filename="' . $mode . '.pak"');
+					echo $pak;
+
+					flush();
+					exit;
+				}
+				else
+				{
+					trigger_error($user->lang['NO_' . strtoupper($fields) . '_EXPORT'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+			break;
+
+			case 'delete':
+
+				if (confirm_box(true))
+				{
+					$sql = "DELETE FROM $table
+						WHERE {$fields}_id = $icon_id";
+					$db->sql_query($sql);
+
+					switch ($mode)
+					{
+						case 'smilies':
+						break;
+
+						case 'icons':
+							// Reset appropriate icon_ids
+							$db->sql_query('UPDATE ' . TOPICS_TABLE . "
+								SET icon_id = 0
+								WHERE icon_id = $icon_id");
+
+							$db->sql_query('UPDATE ' . POSTS_TABLE . "
+								SET icon_id = 0
+								WHERE icon_id = $icon_id");
+						break;
+					}
+
+					$notice = $user->lang[$lang . '_DELETED'];
+
+					$cache->destroy('_icons');
+					$cache->destroy('sql', $table);
+					$phpbb_container->get('text_formatter.cache')->invalidate();
+
+					if ($request->is_ajax())
+					{
+						$json_response = new \phpbb\json_response;
+						$json_response->send(array(
+							'MESSAGE_TITLE'	=> $user->lang['INFORMATION'],
+							'MESSAGE_TEXT'	=> $notice,
+							'REFRESH_DATA'	=> array(
+								'time'	=> 3
+							)
+						));
+					}
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'id'		=> $icon_id,
+						'action'	=> 'delete',
+					)));
+				}
+
+			break;
+
+			case 'move_up':
+			case 'move_down':
+
+				if (!check_link_hash($request->variable('hash', ''), 'acp_icons'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Get current order id...
+				$sql = "SELECT {$fields}_order as current_order
+					FROM $table
+					WHERE {$fields}_id = $icon_id";
+				$result = $db->sql_query($sql);
+				$current_order = (int) $db->sql_fetchfield('current_order');
+				$db->sql_freeresult($result);
+
+				if ($current_order == 0 && $action == 'move_up')
+				{
+					break;
+				}
+
+				// on move_down, switch position with next order_id...
+				// on move_up, switch position with previous order_id...
+				$switch_order_id = ($action == 'move_down') ? $current_order + 1 : $current_order - 1;
+
+				//
+				$sql = "UPDATE $table
+					SET {$fields}_order = $current_order
+					WHERE {$fields}_order = $switch_order_id
+						AND {$fields}_id <> $icon_id";
+				$db->sql_query($sql);
+				$move_executed = (bool) $db->sql_affectedrows();
+
+				// Only update the other entry too if the previous entry got updated
+				if ($move_executed)
+				{
+					$sql = "UPDATE $table
+						SET {$fields}_order = $switch_order_id
+						WHERE {$fields}_order = $current_order
+							AND {$fields}_id = $icon_id";
+					$db->sql_query($sql);
+				}
+
+				$cache->destroy('_icons');
+				$cache->destroy('sql', $table);
+				$phpbb_container->get('text_formatter.cache')->invalidate();
+
+				if ($request->is_ajax())
+				{
+					$json_response = new \phpbb\json_response;
+					$json_response->send(array(
+						'success'	=> $move_executed,
+					));
+				}
+
+			break;
+		}
+
+		// By default, check that image_order is valid and fix it if necessary
+		$sql = "SELECT {$fields}_id AS order_id, {$fields}_order AS fields_order
+			FROM $table
+			ORDER BY display_on_posting DESC, {$fields}_order";
+		$result = $db->sql_query($sql);
+
+		if ($row = $db->sql_fetchrow($result))
+		{
+			$order = 0;
+			do
+			{
+				++$order;
+				if ($row['fields_order'] != $order)
+				{
+					$db->sql_query("UPDATE $table
+						SET {$fields}_order = $order
+						WHERE {$fields}_id = " . $row['order_id']);
+				}
+			}
+			while ($row = $db->sql_fetchrow($result));
+		}
+		$db->sql_freeresult($result);
+
+		$template->assign_vars(array(
+			'L_TITLE'			=> $user->lang['ACP_' . $lang],
+			'L_EXPLAIN'			=> $user->lang['ACP_' . $lang . '_EXPLAIN'],
+			'L_IMPORT'			=> $user->lang['IMPORT_' . $lang],
+			'L_EXPORT'			=> $user->lang['EXPORT_' . $lang],
+			'L_NOT_DISPLAYED'	=> $user->lang[$lang . '_NOT_DISPLAYED'],
+			'L_ICON_ADD'		=> $user->lang['ADD_' . $lang],
+			'L_ICON_EDIT'		=> $user->lang['EDIT_' . $lang],
+
+			'NOTICE'			=> $notice,
+			'COLSPAN'			=> ($mode == 'smilies') ? 5 : 3,
+
+			'S_SMILIES'			=> ($mode == 'smilies') ? true : false,
+
+			'U_ACTION'			=> $this->u_action,
+			'U_IMPORT'			=> $this->u_action . '&amp;action=import',
+			'U_EXPORT'			=> $this->u_action . '&amp;action=export',
+			)
+		);
+
+		/* @var $pagination \phpbb\pagination */
+		$pagination = $phpbb_container->get('pagination');
+		$pagination_start = $request->variable('start', 0);
+		$spacer = false;
+
+		$item_count = $this->item_count($table);
+
+		$sql = "SELECT *
+			FROM $table
+			ORDER BY {$fields}_order ASC";
+		$result = $db->sql_query_limit($sql, $config['smilies_per_page'], $pagination_start);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$alt_text = ($mode == 'smilies') ? $row['code'] : (($mode == 'icons' && !empty($row['icons_alt'])) ? $row['icons_alt'] : $row['icons_url']);
+
+			$template->assign_block_vars('items', array(
+				'S_SPACER'		=> (!$spacer && !$row['display_on_posting']) ? true : false,
+				'ALT_TEXT'		=> $alt_text,
+				'IMG_SRC'		=> $phpbb_root_path . $img_path . '/' . $row[$fields . '_url'],
+				'WIDTH'			=> $row[$fields . '_width'],
+				'HEIGHT'		=> $row[$fields . '_height'],
+				'CODE'			=> (isset($row['code'])) ? $row['code'] : '',
+				'EMOTION'		=> (isset($row['emotion'])) ? $row['emotion'] : '',
+				'U_EDIT'		=> $this->u_action . '&amp;action=edit&amp;id=' . $row[$fields . '_id'],
+				'U_DELETE'		=> $this->u_action . '&amp;action=delete&amp;id=' . $row[$fields . '_id'],
+				'U_MOVE_UP'		=> $this->u_action . '&amp;action=move_up&amp;id=' . $row[$fields . '_id'] . '&amp;start=' . $pagination_start . '&amp;hash=' . generate_link_hash('acp_icons'),
+				'U_MOVE_DOWN'	=> $this->u_action . '&amp;action=move_down&amp;id=' . $row[$fields . '_id'] . '&amp;start=' . $pagination_start . '&amp;hash=' . generate_link_hash('acp_icons'),
+			));
+
+			if (!$spacer && !$row['display_on_posting'])
+			{
+				$spacer = true;
+			}
+		}
+		$db->sql_freeresult($result);
+
+		$pagination->generate_template_pagination($this->u_action, 'pagination', 'start', $item_count, $config['smilies_per_page'], $pagination_start);
+	}
+
+	/**
+	 * Returns the count of smilies or icons in the database
+	 *
+	 * @param string $table The table of items to count.
+	 * @return int number of items
+	 */
+	/* private */ function item_count($table)
+	{
+		global $db;
+
+		$sql = "SELECT COUNT(*) AS item_count
+			FROM $table";
+		$result = $db->sql_query($sql);
+		$item_count = (int) $db->sql_fetchfield('item_count');
+		$db->sql_freeresult($result);
+
+		return $item_count;
+	}
+}

includes/acp/acp_inactive.php

@@ -0,0 +1,322 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_inactive
+{
+	var $u_action;
+	var $p_master;
+
+	function __construct($p_master)
+	{
+		$this->p_master = $p_master;
+	}
+
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $auth, $template, $phpbb_container, $phpbb_log, $request;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		if (!function_exists('user_active_flip'))
+		{
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		}
+
+		$user->add_lang('memberlist');
+
+		$action = $request->variable('action', '');
+		$mark	= (isset($_REQUEST['mark'])) ? $request->variable('mark', array(0)) : array();
+		$start	= $request->variable('start', 0);
+		$submit = isset($_POST['submit']);
+
+		// Sort keys
+		$sort_days	= $request->variable('st', 0);
+		$sort_key	= $request->variable('sk', 'i');
+		$sort_dir	= $request->variable('sd', 'd');
+
+		$form_key = 'acp_inactive';
+		add_form_key($form_key);
+
+		/* @var $pagination \phpbb\pagination */
+		$pagination = $phpbb_container->get('pagination');
+
+		// We build the sort key and per page settings here, because they may be needed later
+
+		// Number of entries to display
+		$per_page = $request->variable('users_per_page', (int) $config['topics_per_page']);
+
+		// Sorting
+		$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+		$sort_by_text = array('i' => $user->lang['SORT_INACTIVE'], 'j' => $user->lang['SORT_REG_DATE'], 'l' => $user->lang['SORT_LAST_VISIT'], 'd' => $user->lang['SORT_LAST_REMINDER'], 'r' => $user->lang['SORT_REASON'], 'u' => $user->lang['SORT_USERNAME'], 'p' => $user->lang['SORT_POSTS'], 'e' => $user->lang['SORT_REMINDER']);
+		$sort_by_sql = array('i' => 'user_inactive_time', 'j' => 'user_regdate', 'l' => 'user_lastvisit', 'd' => 'user_reminded_time', 'r' => 'user_inactive_reason', 'u' => 'username_clean', 'p' => 'user_posts', 'e' => 'user_reminded');
+
+		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
+		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
+
+		if ($submit && count($mark))
+		{
+			if ($action !== 'delete' && !check_form_key($form_key))
+			{
+				trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			switch ($action)
+			{
+				case 'activate':
+				case 'delete':
+
+					$sql = 'SELECT user_id, username
+						FROM ' . USERS_TABLE . '
+						WHERE ' . $db->sql_in_set('user_id', $mark);
+					$result = $db->sql_query($sql);
+
+					$user_affected = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$user_affected[$row['user_id']] = $row['username'];
+					}
+					$db->sql_freeresult($result);
+
+					if ($action == 'activate')
+					{
+						// Get those 'being activated'...
+						$sql = 'SELECT user_id, username' . (($config['require_activation'] == USER_ACTIVATION_ADMIN) ? ', user_email, user_lang' : '') . '
+							FROM ' . USERS_TABLE . '
+							WHERE ' . $db->sql_in_set('user_id', $mark) . '
+								AND user_type = ' . USER_INACTIVE;
+						$result = $db->sql_query($sql);
+
+						$inactive_users = array();
+						while ($row = $db->sql_fetchrow($result))
+						{
+							$inactive_users[] = $row;
+						}
+						$db->sql_freeresult($result);
+
+						user_active_flip('activate', $mark);
+
+						if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users))
+						{
+							if (!class_exists('messenger'))
+							{
+								include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+							}
+
+							$messenger = new messenger(false);
+
+							foreach ($inactive_users as $row)
+							{
+								$messenger->template('admin_welcome_activated', $row['user_lang']);
+
+								$messenger->set_addresses($row);
+
+								$messenger->anti_abuse_headers($config, $user);
+
+								$messenger->assign_vars(array(
+									'USERNAME'	=> htmlspecialchars_decode($row['username']))
+								);
+
+								$messenger->send(NOTIFY_EMAIL);
+							}
+
+							$messenger->save_queue();
+						}
+
+						if (!empty($inactive_users))
+						{
+							foreach ($inactive_users as $row)
+							{
+								$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_ACTIVE', false, array($row['username']));
+								$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_ACTIVE_USER', false, array(
+									'reportee_id' => $row['user_id']
+								));
+							}
+
+							trigger_error(sprintf($user->lang['LOG_INACTIVE_ACTIVATE'], implode($user->lang['COMMA_SEPARATOR'], $user_affected) . ' ' . adm_back_link($this->u_action)));
+						}
+
+						// For activate we really need to redirect, else a refresh can result in users being deactivated again
+						$u_action = $this->u_action . "&amp;$u_sort_param&amp;start=$start";
+						$u_action .= ($per_page != $config['topics_per_page']) ? "&amp;users_per_page=$per_page" : '';
+
+						redirect($u_action);
+					}
+					else if ($action == 'delete')
+					{
+						if (confirm_box(true))
+						{
+							if (!$auth->acl_get('a_userdel'))
+							{
+								send_status_line(403, 'Forbidden');
+								trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+							}
+
+							user_delete('retain', $mark, true);
+
+							$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_INACTIVE_' . strtoupper($action), false, array(implode(', ', $user_affected)));
+
+							trigger_error(sprintf($user->lang['LOG_INACTIVE_DELETE'], implode($user->lang['COMMA_SEPARATOR'], $user_affected) . ' ' . adm_back_link($this->u_action)));
+						}
+						else
+						{
+							$s_hidden_fields = array(
+								'mode'			=> $mode,
+								'action'		=> $action,
+								'mark'			=> $mark,
+								'submit'		=> 1,
+								'start'			=> $start,
+							);
+							confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields));
+						}
+					}
+
+				break;
+
+				case 'remind':
+					if (empty($config['email_enable']))
+					{
+						trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey
+						FROM ' . USERS_TABLE . '
+						WHERE ' . $db->sql_in_set('user_id', $mark) . '
+							AND user_inactive_reason';
+
+					$sql .= ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? ' = ' . INACTIVE_REMIND : ' <> ' . INACTIVE_MANUAL;
+
+					$result = $db->sql_query($sql);
+
+					if ($row = $db->sql_fetchrow($result))
+					{
+						// Send the messages
+						if (!class_exists('messenger'))
+						{
+							include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+						}
+
+						$messenger = new messenger();
+						$usernames = $user_ids = array();
+
+						do
+						{
+							$messenger->template('user_remind_inactive', $row['user_lang']);
+
+							$messenger->set_addresses($row);
+
+							$messenger->anti_abuse_headers($config, $user);
+
+							$messenger->assign_vars(array(
+								'USERNAME'		=> htmlspecialchars_decode($row['username']),
+								'REGISTER_DATE'	=> $user->format_date($row['user_regdate'], false, true),
+								'U_ACTIVATE'	=> generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'])
+							);
+
+							$messenger->send($row['user_notify_type']);
+
+							$usernames[] = $row['username'];
+							$user_ids[] = (int) $row['user_id'];
+						}
+						while ($row = $db->sql_fetchrow($result));
+
+						$messenger->save_queue();
+
+						// Add the remind state to the database
+						$sql = 'UPDATE ' . USERS_TABLE . '
+							SET user_reminded = user_reminded + 1,
+								user_reminded_time = ' . time() . '
+							WHERE ' . $db->sql_in_set('user_id', $user_ids);
+						$db->sql_query($sql);
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_INACTIVE_REMIND', false, array(implode(', ', $usernames)));
+
+						trigger_error(sprintf($user->lang['LOG_INACTIVE_REMIND'], implode($user->lang['COMMA_SEPARATOR'], $usernames) . ' ' . adm_back_link($this->u_action)));
+					}
+					$db->sql_freeresult($result);
+
+					// For remind we really need to redirect, else a refresh can result in more than one reminder
+					$u_action = $this->u_action . "&amp;$u_sort_param&amp;start=$start";
+					$u_action .= ($per_page != $config['topics_per_page']) ? "&amp;users_per_page=$per_page" : '';
+
+					redirect($u_action);
+
+				break;
+			}
+		}
+
+		// Define where and sort sql for use in displaying logs
+		$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
+		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
+
+		$inactive = array();
+		$inactive_count = 0;
+
+		$start = view_inactive_users($inactive, $inactive_count, $per_page, $start, $sql_where, $sql_sort);
+
+		foreach ($inactive as $row)
+		{
+			$template->assign_block_vars('inactive', array(
+				'INACTIVE_DATE'	=> $user->format_date($row['user_inactive_time']),
+				'REMINDED_DATE'	=> $user->format_date($row['user_reminded_time']),
+				'JOINED'		=> $user->format_date($row['user_regdate']),
+				'LAST_VISIT'	=> (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
+
+				'REASON'		=> $row['inactive_reason'],
+				'USER_ID'		=> $row['user_id'],
+				'POSTS'			=> ($row['user_posts']) ? $row['user_posts'] : 0,
+				'REMINDED'		=> $row['user_reminded'],
+
+				'REMINDED_EXPLAIN'	=> $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])),
+
+				'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview&amp;redirect=acp_inactive')),
+				'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+				'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+				'USER_EMAIL'		=> $row['user_email'],
+
+				'U_USER_ADMIN'	=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&amp;mode=overview&amp;u={$row['user_id']}"),
+				'U_SEARCH_USER'	=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&amp;sr=posts") : '',
+			));
+		}
+
+		$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
+		if ($config['email_enable'])
+		{
+			$option_ary += array('remind' => 'REMIND');
+		}
+
+		$base_url = $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page";
+		$pagination->generate_template_pagination($base_url, 'pagination', 'start', $inactive_count, $per_page, $start);
+
+		$template->assign_vars(array(
+			'S_INACTIVE_USERS'		=> true,
+			'S_INACTIVE_OPTIONS'	=> build_select($option_ary),
+
+			'S_LIMIT_DAYS'	=> $s_limit_days,
+			'S_SORT_KEY'	=> $s_sort_key,
+			'S_SORT_DIR'	=> $s_sort_dir,
+			'USERS_PER_PAGE'	=> $per_page,
+
+			'U_ACTION'		=> $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page&amp;start=$start",
+		));
+
+		$this->tpl_name = 'acp_inactive';
+		$this->page_title = 'ACP_INACTIVE_USERS';
+	}
+}

includes/acp/acp_jabber.php

@@ -0,0 +1,144 @@
+<?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.
+*
+*/
+
+/**
+* @todo Check/enter/update transport info
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_jabber
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpEx;
+
+		$user->add_lang('acp/board');
+
+		if (!class_exists('jabber'))
+		{
+			include($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
+		}
+
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		if ($mode != 'settings')
+		{
+			return;
+		}
+
+		$this->tpl_name = 'acp_jabber';
+		$this->page_title = 'ACP_JABBER_SETTINGS';
+
+		$jab_enable				= $request->variable('jab_enable',			(bool) $config['jab_enable']);
+		$jab_host				= $request->variable('jab_host',			(string) $config['jab_host']);
+		$jab_port				= $request->variable('jab_port',			(int) $config['jab_port']);
+		$jab_username			= $request->variable('jab_username',		(string) $config['jab_username']);
+		$jab_password			= $request->variable('jab_password',		(string) $config['jab_password']);
+		$jab_package_size		= $request->variable('jab_package_size',	(int) $config['jab_package_size']);
+		$jab_use_ssl			= $request->variable('jab_use_ssl',		(bool) $config['jab_use_ssl']);
+		$jab_verify_peer		= $request->variable('jab_verify_peer',		(bool) $config['jab_verify_peer']);
+		$jab_verify_peer_name	= $request->variable('jab_verify_peer_name',	(bool) $config['jab_verify_peer_name']);
+		$jab_allow_self_signed	= $request->variable('jab_allow_self_signed',	(bool) $config['jab_allow_self_signed']);
+
+		$form_name = 'acp_jabber';
+		add_form_key($form_name);
+
+		if ($submit)
+		{
+			if (!check_form_key($form_name))
+			{
+				trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$message = $user->lang['JAB_SETTINGS_CHANGED'];
+			$log = 'JAB_SETTINGS_CHANGED';
+
+			// Is this feature enabled? Then try to establish a connection
+			if ($jab_enable)
+			{
+				$jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password, $jab_use_ssl, $jab_verify_peer, $jab_verify_peer_name, $jab_allow_self_signed);
+
+				if (!$jabber->connect())
+				{
+					trigger_error($user->lang['ERR_JAB_CONNECT'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// We'll try to authorise using this account
+				if (!$jabber->login())
+				{
+					trigger_error($user->lang['ERR_JAB_AUTH'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$jabber->disconnect();
+			}
+			else
+			{
+				// This feature is disabled.
+				// We update the user table to be sure all users that have IM as notify type are set to both as notify type
+				// We set this to both because users still have their jabber address entered and may want to receive jabber notifications again once it is re-enabled.
+				$sql_ary = array(
+					'user_notify_type'		=> NOTIFY_BOTH,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_notify_type = ' . NOTIFY_IM;
+				$db->sql_query($sql);
+			}
+
+			$config->set('jab_enable', $jab_enable);
+			$config->set('jab_host', $jab_host);
+			$config->set('jab_port', $jab_port);
+			$config->set('jab_username', $jab_username);
+			if ($jab_password !== '********')
+			{
+				$config->set('jab_password', $jab_password);
+			}
+			$config->set('jab_package_size', $jab_package_size);
+			$config->set('jab_use_ssl', $jab_use_ssl);
+			$config->set('jab_verify_peer', $jab_verify_peer);
+			$config->set('jab_verify_peer_name', $jab_verify_peer_name);
+			$config->set('jab_allow_self_signed', $jab_allow_self_signed);
+
+			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_' . $log);
+			trigger_error($message . adm_back_link($this->u_action));
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'				=> $this->u_action,
+			'JAB_ENABLE'			=> $jab_enable,
+			'L_JAB_SERVER_EXPLAIN'	=> sprintf($user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/">', '</a>'),
+			'JAB_HOST'				=> $jab_host,
+			'JAB_PORT'				=> ($jab_port) ? $jab_port : '',
+			'JAB_USERNAME'			=> $jab_username,
+			'JAB_PASSWORD'			=> $jab_password !== '' ? '********' : '',
+			'JAB_PACKAGE_SIZE'		=> $jab_package_size,
+			'JAB_USE_SSL'			=> $jab_use_ssl,
+			'JAB_VERIFY_PEER'		=> $jab_verify_peer,
+			'JAB_VERIFY_PEER_NAME'	=> $jab_verify_peer_name,
+			'JAB_ALLOW_SELF_SIGNED'	=> $jab_allow_self_signed,
+			'S_CAN_USE_SSL'			=> jabber::can_use_ssl(),
+			'S_GTALK_NOTE'			=> (!@function_exists('dns_get_record')) ? true : false,
+		));
+	}
+}

includes/acp/acp_language.php

@@ -0,0 +1,461 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_language
+{
+	var $u_action;
+	var $main_files;
+	var $language_header = '';
+	var $lang_header = '';
+
+	var $language_file = '';
+	var $language_directory = '';
+
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $template, $phpbb_log, $phpbb_container;
+		global $phpbb_root_path, $phpEx, $request, $phpbb_dispatcher;
+
+		if (!function_exists('validate_language_iso_name'))
+		{
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		}
+
+		// Check and set some common vars
+		$action		= (isset($_POST['update_details'])) ? 'update_details' : '';
+		$action		= (isset($_POST['remove_store'])) ? 'details' : $action;
+
+		$submit = (empty($action) && !isset($_POST['update']) && !isset($_POST['test_connection'])) ? false : true;
+		$action = (empty($action)) ? $request->variable('action', '') : $action;
+
+		$form_name = 'acp_lang';
+		add_form_key('acp_lang');
+
+		$lang_id = $request->variable('id', 0);
+
+		$selected_lang_file = $request->variable('language_file', '|common.' . $phpEx);
+
+		list($this->language_directory, $this->language_file) = explode('|', $selected_lang_file);
+
+		$this->language_directory = basename($this->language_directory);
+		$this->language_file = basename($this->language_file);
+
+		$user->add_lang('acp/language');
+		$this->tpl_name = 'acp_language';
+		$this->page_title = 'ACP_LANGUAGE_PACKS';
+
+		switch ($action)
+		{
+			case 'update_details':
+
+				if (!$submit || !check_form_key($form_name))
+				{
+					trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (!$lang_id)
+				{
+					trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT *
+					FROM ' . LANG_TABLE . "
+					WHERE lang_id = $lang_id";
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				$sql_ary	= array(
+					'lang_english_name'		=> $request->variable('lang_english_name', $row['lang_english_name']),
+					'lang_local_name'		=> $request->variable('lang_local_name', $row['lang_local_name'], true),
+					'lang_author'			=> $request->variable('lang_author', $row['lang_author'], true),
+				);
+
+				$db->sql_query('UPDATE ' . LANG_TABLE . '
+					SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE lang_id = ' . $lang_id);
+
+				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_LANGUAGE_PACK_UPDATED', false, array($sql_ary['lang_english_name']));
+
+				trigger_error($user->lang['LANGUAGE_DETAILS_UPDATED'] . adm_back_link($this->u_action));
+			break;
+
+			case 'details':
+
+				if (!$lang_id)
+				{
+					trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$this->page_title = 'LANGUAGE_PACK_DETAILS';
+
+				$sql = 'SELECT *
+					FROM ' . LANG_TABLE . '
+					WHERE lang_id = ' . $lang_id;
+				$result = $db->sql_query($sql);
+				$lang_entries = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if (!$lang_entries)
+				{
+					trigger_error($user->lang['LANGUAGE_PACK_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$lang_iso = $lang_entries['lang_iso'];
+
+				$template->assign_vars(array(
+					'S_DETAILS'			=> true,
+					'U_ACTION'			=> $this->u_action . "&amp;action=details&amp;id=$lang_id",
+					'U_BACK'			=> $this->u_action,
+
+					'LANG_LOCAL_NAME'	=> $lang_entries['lang_local_name'],
+					'LANG_ENGLISH_NAME'	=> $lang_entries['lang_english_name'],
+					'LANG_ISO'			=> $lang_iso,
+					'LANG_AUTHOR'		=> $lang_entries['lang_author'],
+					'L_MISSING_FILES'			=> $user->lang('THOSE_MISSING_LANG_FILES', $lang_entries['lang_local_name']),
+					'L_MISSING_VARS_EXPLAIN'	=> $user->lang('THOSE_MISSING_LANG_VARIABLES', $lang_entries['lang_local_name']),
+				));
+
+				// If current lang is different from the default lang, then highlight missing files and variables
+				if ($lang_iso != $config['default_lang'])
+				{
+					try
+					{
+						$iterator = new \RecursiveIteratorIterator(
+							new \phpbb\recursive_dot_prefix_filter_iterator(
+								new \RecursiveDirectoryIterator(
+									$phpbb_root_path . 'language/' . $config['default_lang'] . '/',
+									\FilesystemIterator::SKIP_DOTS
+								)
+							),
+							\RecursiveIteratorIterator::LEAVES_ONLY
+						);
+					}
+					catch (\Exception $e)
+					{
+						return array();
+					}
+
+					foreach ($iterator as $file_info)
+					{
+						/** @var \RecursiveDirectoryIterator $file_info */
+						$relative_path = $iterator->getInnerIterator()->getSubPathname();
+						$relative_path = str_replace(DIRECTORY_SEPARATOR, '/', $relative_path);
+
+						if (file_exists($phpbb_root_path . 'language/' . $lang_iso . '/' . $relative_path))
+						{
+							if (substr($relative_path, 0 - strlen($phpEx)) === $phpEx)
+							{
+								$missing_vars = $this->compare_language_files($config['default_lang'], $lang_iso, $relative_path);
+
+								if (!empty($missing_vars))
+								{
+									$template->assign_block_vars('missing_varfile', array(
+										'FILE_NAME'			=> $relative_path,
+									));
+
+									foreach ($missing_vars as $var)
+									{
+										$template->assign_block_vars('missing_varfile.variable', array(
+												'VAR_NAME'			=> $var,
+										));
+									}
+								}
+							}
+						}
+						else
+						{
+							$template->assign_block_vars('missing_files', array(
+								'FILE_NAME' => $relative_path,
+							));
+						}
+					}
+				}
+				return;
+			break;
+
+			case 'delete':
+
+				if (!$lang_id)
+				{
+					trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT *
+					FROM ' . LANG_TABLE . '
+					WHERE lang_id = ' . $lang_id;
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if ($row['lang_iso'] == $config['default_lang'])
+				{
+					trigger_error($user->lang['NO_REMOVE_DEFAULT_LANG'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (confirm_box(true))
+				{
+					$db->sql_query('DELETE FROM ' . LANG_TABLE . ' WHERE lang_id = ' . $lang_id);
+
+					$sql = 'UPDATE ' . USERS_TABLE . "
+						SET user_lang = '" . $db->sql_escape($config['default_lang']) . "'
+						WHERE user_lang = '" . $db->sql_escape($row['lang_iso']) . "'";
+					$db->sql_query($sql);
+
+					// We also need to remove the translated entries for custom profile fields - we want clean tables, don't we?
+					$sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . ' WHERE lang_id = ' . $lang_id;
+					$db->sql_query($sql);
+
+					$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . ' WHERE lang_id = ' . $lang_id;
+					$db->sql_query($sql);
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_LANGUAGE_PACK_DELETED', false, array($row['lang_english_name']));
+
+					$delete_message = sprintf($user->lang['LANGUAGE_PACK_DELETED'], $row['lang_english_name']);
+					$lang_iso = $row['lang_iso'];
+					/**
+					 * Run code after language deleted
+					 *
+					 * @event core.acp_language_after_delete
+					 * @var	string 	lang_iso     	Language ISO code
+					 * @var	string  delete_message  Delete message appear to user
+					 * @since 3.2.2-RC1
+					 */
+					$vars = array('lang_iso', 'delete_message');
+					extract($phpbb_dispatcher->trigger_event('core.acp_language_after_delete', compact($vars)));
+
+					trigger_error($delete_message . adm_back_link($this->u_action));
+				}
+				else
+				{
+					$s_hidden_fields = array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action,
+						'id'		=> $lang_id,
+					);
+					confirm_box(false, $user->lang('DELETE_LANGUAGE_CONFIRM', $row['lang_english_name']), build_hidden_fields($s_hidden_fields));
+				}
+			break;
+
+			case 'install':
+				if (!check_link_hash($request->variable('hash', ''), 'acp_language'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$lang_iso = $request->variable('iso', '');
+				$lang_iso = basename($lang_iso);
+
+				if (!$lang_iso || !file_exists("{$phpbb_root_path}language/$lang_iso/iso.txt"))
+				{
+					trigger_error($user->lang['LANGUAGE_PACK_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$file = file("{$phpbb_root_path}language/$lang_iso/iso.txt");
+
+				$lang_pack = array(
+					'iso'		=> $lang_iso,
+					'name'		=> trim(htmlspecialchars($file[0])),
+					'local_name'=> trim(htmlspecialchars($file[1], ENT_COMPAT, 'UTF-8')),
+					'author'	=> trim(htmlspecialchars($file[2], ENT_COMPAT, 'UTF-8'))
+				);
+				unset($file);
+
+				$sql = 'SELECT lang_iso
+					FROM ' . LANG_TABLE . "
+					WHERE lang_iso = '" . $db->sql_escape($lang_iso) . "'";
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if ($row)
+				{
+					trigger_error($user->lang['LANGUAGE_PACK_ALREADY_INSTALLED'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (!$lang_pack['name'] || !$lang_pack['local_name'])
+				{
+					trigger_error($user->lang['INVALID_LANGUAGE_PACK'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Add language pack
+				$sql_ary = array(
+					'lang_iso'			=> $lang_pack['iso'],
+					'lang_dir'			=> $lang_pack['iso'],
+					'lang_english_name'	=> $lang_pack['name'],
+					'lang_local_name'	=> $lang_pack['local_name'],
+					'lang_author'		=> $lang_pack['author']
+				);
+
+				$db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
+				$lang_id = $db->sql_nextid();
+
+				// Now let's copy the default language entries for custom profile fields for this new language - makes admin's life easier.
+				$sql = 'SELECT lang_id
+					FROM ' . LANG_TABLE . "
+					WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
+				$result = $db->sql_query($sql);
+				$default_lang_id = (int) $db->sql_fetchfield('lang_id');
+				$db->sql_freeresult($result);
+
+				// We want to notify the admin that custom profile fields need to be updated for the new language.
+				$notify_cpf_update = false;
+
+				// From the mysql documentation:
+				// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
+				// Due to this we stay on the safe side if we do the insertion "the manual way"
+
+				$sql = 'SELECT field_id, lang_name, lang_explain, lang_default_value
+					FROM ' . PROFILE_LANG_TABLE . '
+					WHERE lang_id = ' . $default_lang_id;
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$row['lang_id'] = $lang_id;
+					$db->sql_query('INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row));
+					$notify_cpf_update = true;
+				}
+				$db->sql_freeresult($result);
+
+				$sql = 'SELECT field_id, option_id, field_type, lang_value
+					FROM ' . PROFILE_FIELDS_LANG_TABLE . '
+					WHERE lang_id = ' . $default_lang_id;
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$row['lang_id'] = $lang_id;
+					$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row));
+					$notify_cpf_update = true;
+				}
+				$db->sql_freeresult($result);
+
+				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_LANGUAGE_PACK_INSTALLED', false, array($lang_pack['name']));
+
+				$message = sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']);
+				$message .= ($notify_cpf_update) ? '<br /><br />' . $user->lang['LANGUAGE_PACK_CPF_UPDATE'] : '';
+				trigger_error($message . adm_back_link($this->u_action));
+
+			break;
+		}
+
+		$sql = 'SELECT user_lang, COUNT(user_lang) AS lang_count
+			FROM ' . USERS_TABLE . '
+			GROUP BY user_lang';
+		$result = $db->sql_query($sql);
+
+		$lang_count = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$lang_count[$row['user_lang']] = $row['lang_count'];
+		}
+		$db->sql_freeresult($result);
+
+		$sql = 'SELECT *
+			FROM ' . LANG_TABLE . '
+			ORDER BY lang_english_name';
+		$result = $db->sql_query($sql);
+
+		$installed = array();
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$installed[] = $row['lang_iso'];
+			$tagstyle = ($row['lang_iso'] == $config['default_lang']) ? '*' : '';
+
+			$template->assign_block_vars('lang', array(
+				'U_DETAILS'			=> $this->u_action . "&amp;action=details&amp;id={$row['lang_id']}",
+				'U_DOWNLOAD'		=> $this->u_action . "&amp;action=download&amp;id={$row['lang_id']}",
+				'U_DELETE'			=> $this->u_action . "&amp;action=delete&amp;id={$row['lang_id']}",
+
+				'ENGLISH_NAME'		=> $row['lang_english_name'],
+				'TAG'				=> $tagstyle,
+				'LOCAL_NAME'		=> $row['lang_local_name'],
+				'ISO'				=> $row['lang_iso'],
+				'USED_BY'			=> (isset($lang_count[$row['lang_iso']])) ? $lang_count[$row['lang_iso']] : 0,
+			));
+		}
+		$db->sql_freeresult($result);
+
+		$new_ary = $iso = array();
+
+		/** @var \phpbb\language\language_file_helper $language_helper */
+		$language_helper = $phpbb_container->get('language.helper.language_file');
+		$iso = $language_helper->get_available_languages();
+
+		foreach ($iso as $lang_array)
+		{
+			$lang_iso = $lang_array['iso'];
+
+			if (!in_array($lang_iso, $installed))
+			{
+				$new_ary[$lang_iso] = $lang_array;
+			}
+		}
+
+		unset($installed);
+
+		if (count($new_ary))
+		{
+			foreach ($new_ary as $iso => $lang_ary)
+			{
+				$template->assign_block_vars('notinst', array(
+					'ISO'			=> htmlspecialchars($lang_ary['iso']),
+					'LOCAL_NAME'	=> htmlspecialchars($lang_ary['local_name'], ENT_COMPAT, 'UTF-8'),
+					'NAME'			=> htmlspecialchars($lang_ary['name'], ENT_COMPAT, 'UTF-8'),
+					'U_INSTALL'		=> $this->u_action . '&amp;action=install&amp;iso=' . urlencode($lang_ary['iso']) . '&amp;hash=' . generate_link_hash('acp_language'))
+				);
+			}
+		}
+
+		unset($new_ary);
+	}
+
+	/**
+	* Compare two language files
+	*/
+	function compare_language_files($source_lang, $dest_lang, $file)
+	{
+		global $phpbb_root_path;
+
+		$source_file = $phpbb_root_path . 'language/' . $source_lang . '/' . $file;
+		$dest_file = $phpbb_root_path . 'language/' . $dest_lang . '/' . $file;
+
+		if (!file_exists($dest_file))
+		{
+			return array();
+		}
+
+		$lang = array();
+		include($source_file);
+		$lang_entry_src = $lang;
+
+		$lang = array();
+		include($dest_file);
+		$lang_entry_dst = $lang;
+
+		unset($lang);
+
+		return array_diff(array_keys($lang_entry_src), array_keys($lang_entry_dst));
+	}
+}

includes/acp/acp_logs.php

@@ -0,0 +1,176 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_logs
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $user, $auth, $template, $phpbb_container;
+		global $config;
+		global $request;
+
+		$user->add_lang('mcp');
+
+		// Set up general vars
+		$action		= $request->variable('action', '');
+		$forum_id	= $request->variable('f', 0);
+		$start		= $request->variable('start', 0);
+		$deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST);
+		$deleteall	= $request->variable('delall', false, false, \phpbb\request\request_interface::POST);
+		$marked		= $request->variable('mark', array(0));
+
+		// Sort keys
+		$sort_days	= $request->variable('st', 0);
+		$sort_key	= $request->variable('sk', 't');
+		$sort_dir	= $request->variable('sd', 'd');
+
+		$this->tpl_name = 'acp_logs';
+		$this->log_type = constant('LOG_' . strtoupper($mode));
+
+		/* @var $pagination \phpbb\pagination */
+		$pagination = $phpbb_container->get('pagination');
+
+		// Delete entries if requested and able
+		if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs'))
+		{
+			if (confirm_box(true))
+			{
+				$conditions = array();
+
+				if ($deletemark && count($marked))
+				{
+					$conditions['log_id'] = array('IN' => $marked);
+				}
+
+				if ($deleteall)
+				{
+					if ($sort_days)
+					{
+						$conditions['log_time'] = array('>=', time() - ($sort_days * 86400));
+					}
+
+					$keywords = $request->variable('keywords', '', true);
+					$conditions['keywords'] = $keywords;
+				}
+
+				/* @var $phpbb_log \phpbb\log\log_interface */
+				$phpbb_log = $phpbb_container->get('log');
+				$phpbb_log->delete($mode, $conditions);
+			}
+			else
+			{
+				confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+					'f'			=> $forum_id,
+					'start'		=> $start,
+					'delmarked'	=> $deletemark,
+					'delall'	=> $deleteall,
+					'mark'		=> $marked,
+					'st'		=> $sort_days,
+					'sk'		=> $sort_key,
+					'sd'		=> $sort_dir,
+					'i'			=> $id,
+					'mode'		=> $mode,
+					'action'	=> $action))
+				);
+			}
+		}
+
+		// Sorting
+		$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+		$sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']);
+		$sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
+
+		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
+		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
+
+		// Define where and sort sql for use in displaying logs
+		$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
+		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
+
+		$keywords = $request->variable('keywords', '', true);
+		$keywords_param = !empty($keywords) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
+
+		$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
+		$l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
+
+		$this->page_title = $l_title;
+
+		// Define forum list if we're looking @ mod logs
+		if ($mode == 'mod')
+		{
+			$forum_box = '<option value="0">' . $user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id);
+
+			$template->assign_vars(array(
+				'S_SHOW_FORUMS'			=> true,
+				'S_FORUM_BOX'			=> $forum_box)
+			);
+		}
+
+		// Grab log data
+		$log_data = array();
+		$log_count = 0;
+		$start = view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords);
+
+		$base_url = $this->u_action . "&amp;$u_sort_param$keywords_param";
+		$pagination->generate_template_pagination($base_url, 'pagination', 'start', $log_count, $config['topics_per_page'], $start);
+
+		$template->assign_vars(array(
+			'L_TITLE'		=> $l_title,
+			'L_EXPLAIN'		=> $l_title_explain,
+			'U_ACTION'		=> $this->u_action . "&amp;$u_sort_param$keywords_param&amp;start=$start",
+
+			'S_LIMIT_DAYS'	=> $s_limit_days,
+			'S_SORT_KEY'	=> $s_sort_key,
+			'S_SORT_DIR'	=> $s_sort_dir,
+			'S_CLEARLOGS'	=> $auth->acl_get('a_clearlogs'),
+			'S_KEYWORDS'	=> $keywords,
+			)
+		);
+
+		foreach ($log_data as $row)
+		{
+			$data = array();
+
+			$checks = array('viewpost', 'viewtopic', 'viewlogs', 'viewforum');
+			foreach ($checks as $check)
+			{
+				if (isset($row[$check]) && $row[$check])
+				{
+					$data[] = '<a href="' . $row[$check] . '">' . $user->lang['LOGVIEW_' . strtoupper($check)] . '</a>';
+				}
+			}
+
+			$template->assign_block_vars('log', array(
+				'USERNAME'			=> $row['username_full'],
+				'REPORTEE_USERNAME'	=> ($row['reportee_username'] && $row['user_id'] != $row['reportee_id']) ? $row['reportee_username_full'] : '',
+
+				'IP'				=> $row['ip'],
+				'DATE'				=> $user->format_date($row['time']),
+				'ACTION'			=> $row['action'],
+				'DATA'				=> (count($data)) ? implode(' | ', $data) : '',
+				'ID'				=> $row['id'],
+				)
+			);
+		}
+	}
+}

includes/acp/acp_main.php

@@ -0,0 +1,707 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_main
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $config, $db, $cache, $user, $auth, $template, $request, $phpbb_log;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container, $phpbb_dispatcher, $phpbb_filesystem;
+
+		// Show restore permissions notice
+		if ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm'))
+		{
+			$this->tpl_name = 'acp_main';
+			$this->page_title = 'ACP_MAIN';
+
+			$sql = 'SELECT user_id, username, user_colour
+				FROM ' . USERS_TABLE . '
+				WHERE user_id = ' . $user->data['user_perm_from'];
+			$result = $db->sql_query($sql);
+			$user_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			$perm_from = get_username_string('full', $user_row['user_id'], $user_row['username'], $user_row['user_colour']);
+
+			$template->assign_vars(array(
+				'S_RESTORE_PERMISSIONS'		=> true,
+				'U_RESTORE_PERMISSIONS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm'),
+				'PERM_FROM'					=> $perm_from,
+				'L_PERMISSIONS_TRANSFERRED_EXPLAIN'	=> sprintf($user->lang['PERMISSIONS_TRANSFERRED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')),
+			));
+
+			return;
+		}
+
+		$action = $request->variable('action', '');
+
+		if ($action)
+		{
+			if ($action === 'admlogout')
+			{
+				$user->unset_admin();
+				redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			}
+
+			if (!confirm_box(true))
+			{
+				switch ($action)
+				{
+					case 'online':
+						$confirm = true;
+						$confirm_lang = 'RESET_ONLINE_CONFIRM';
+					break;
+					case 'stats':
+						$confirm = true;
+						$confirm_lang = 'RESYNC_STATS_CONFIRM';
+					break;
+					case 'user':
+						$confirm = true;
+						$confirm_lang = 'RESYNC_POSTCOUNTS_CONFIRM';
+					break;
+					case 'date':
+						$confirm = true;
+						$confirm_lang = 'RESET_DATE_CONFIRM';
+					break;
+					case 'db_track':
+						$confirm = true;
+						$confirm_lang = 'RESYNC_POST_MARKING_CONFIRM';
+					break;
+					case 'purge_cache':
+						$confirm = true;
+						$confirm_lang = 'PURGE_CACHE_CONFIRM';
+					break;
+					case 'purge_sessions':
+						$confirm = true;
+						$confirm_lang = 'PURGE_SESSIONS_CONFIRM';
+					break;
+
+					default:
+						$confirm = true;
+						$confirm_lang = 'CONFIRM_OPERATION';
+				}
+
+				if ($confirm)
+				{
+					confirm_box(false, $user->lang[$confirm_lang], build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action,
+					)));
+				}
+			}
+			else
+			{
+				switch ($action)
+				{
+
+					case 'online':
+						if (!$auth->acl_get('a_board'))
+						{
+							send_status_line(403, 'Forbidden');
+							trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						$config->set('record_online_users', 1, false);
+						$config->set('record_online_date', time(), false);
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESET_ONLINE');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('RESET_ONLINE_SUCCESS');
+						}
+					break;
+
+					case 'stats':
+						if (!$auth->acl_get('a_board'))
+						{
+							send_status_line(403, 'Forbidden');
+							trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						$sql = 'SELECT COUNT(post_id) AS stat
+							FROM ' . POSTS_TABLE . '
+							WHERE post_visibility = ' . ITEM_APPROVED;
+						$result = $db->sql_query($sql);
+						$config->set('num_posts', (int) $db->sql_fetchfield('stat'), false);
+						$db->sql_freeresult($result);
+
+						$sql = 'SELECT COUNT(topic_id) AS stat
+							FROM ' . TOPICS_TABLE . '
+							WHERE topic_visibility = ' . ITEM_APPROVED;
+						$result = $db->sql_query($sql);
+						$config->set('num_topics', (int) $db->sql_fetchfield('stat'), false);
+						$db->sql_freeresult($result);
+
+						$sql = 'SELECT COUNT(user_id) AS stat
+							FROM ' . USERS_TABLE . '
+							WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')';
+						$result = $db->sql_query($sql);
+						$config->set('num_users', (int) $db->sql_fetchfield('stat'), false);
+						$db->sql_freeresult($result);
+
+						$sql = 'SELECT COUNT(attach_id) as stat
+							FROM ' . ATTACHMENTS_TABLE . '
+							WHERE is_orphan = 0';
+						$result = $db->sql_query($sql);
+						$config->set('num_files', (int) $db->sql_fetchfield('stat'), false);
+						$db->sql_freeresult($result);
+
+						$sql = 'SELECT SUM(filesize) as stat
+							FROM ' . ATTACHMENTS_TABLE . '
+							WHERE is_orphan = 0';
+						$result = $db->sql_query($sql);
+						$config->set('upload_dir_size', (float) $db->sql_fetchfield('stat'), false);
+						$db->sql_freeresult($result);
+
+						if (!function_exists('update_last_username'))
+						{
+							include($phpbb_root_path . "includes/functions_user.$phpEx");
+						}
+						update_last_username();
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESYNC_STATS');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('RESYNC_STATS_SUCCESS');
+						}
+					break;
+
+					case 'user':
+						if (!$auth->acl_get('a_board'))
+						{
+							send_status_line(403, 'Forbidden');
+							trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						// Resync post counts
+						$start = $max_post_id = 0;
+
+						// Find the maximum post ID, we can only stop the cycle when we've reached it
+						$sql = 'SELECT MAX(forum_last_post_id) as max_post_id
+							FROM ' . FORUMS_TABLE;
+						$result = $db->sql_query($sql);
+						$max_post_id = (int) $db->sql_fetchfield('max_post_id');
+						$db->sql_freeresult($result);
+
+						// No maximum post id? :o
+						if (!$max_post_id)
+						{
+							$sql = 'SELECT MAX(post_id) as max_post_id
+								FROM ' . POSTS_TABLE;
+							$result = $db->sql_query($sql);
+							$max_post_id = (int) $db->sql_fetchfield('max_post_id');
+							$db->sql_freeresult($result);
+						}
+
+						// Still no maximum post id? Then we are finished
+						if (!$max_post_id)
+						{
+							$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESYNC_POSTCOUNTS');
+							break;
+						}
+
+						$step = ($config['num_posts']) ? (max((int) ($config['num_posts'] / 5), 20000)) : 20000;
+						$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_posts = 0');
+
+						while ($start < $max_post_id)
+						{
+							$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
+								FROM ' . POSTS_TABLE . '
+								WHERE post_id BETWEEN ' . ($start + 1) . ' AND ' . ($start + $step) . '
+									AND post_postcount = 1 AND post_visibility = ' . ITEM_APPROVED . '
+								GROUP BY poster_id';
+							$result = $db->sql_query($sql);
+
+							if ($row = $db->sql_fetchrow($result))
+							{
+								do
+								{
+									$sql = 'UPDATE ' . USERS_TABLE . " SET user_posts = user_posts + {$row['num_posts']} WHERE user_id = {$row['poster_id']}";
+									$db->sql_query($sql);
+								}
+								while ($row = $db->sql_fetchrow($result));
+							}
+							$db->sql_freeresult($result);
+
+							$start += $step;
+						}
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESYNC_POSTCOUNTS');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('RESYNC_POSTCOUNTS_SUCCESS');
+						}
+					break;
+
+					case 'date':
+						if (!$auth->acl_get('a_board'))
+						{
+							send_status_line(403, 'Forbidden');
+							trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						$config->set('board_startdate', time() - 1);
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESET_DATE');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('RESET_DATE_SUCCESS');
+						}
+					break;
+
+					case 'db_track':
+						switch ($db->get_sql_layer())
+						{
+							case 'sqlite3':
+								$db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE);
+							break;
+
+							default:
+								$db->sql_query('TRUNCATE TABLE ' . TOPICS_POSTED_TABLE);
+							break;
+						}
+
+						// This can get really nasty... therefore we only do the last six months
+						$get_from_time = time() - (6 * 4 * 7 * 24 * 60 * 60);
+
+						// Select forum ids, do not include categories
+						$sql = 'SELECT forum_id
+							FROM ' . FORUMS_TABLE . '
+							WHERE forum_type <> ' . FORUM_CAT;
+						$result = $db->sql_query($sql);
+
+						$forum_ids = array();
+						while ($row = $db->sql_fetchrow($result))
+						{
+							$forum_ids[] = $row['forum_id'];
+						}
+						$db->sql_freeresult($result);
+
+						// Any global announcements? ;)
+						$forum_ids[] = 0;
+
+						// Now go through the forums and get us some topics...
+						foreach ($forum_ids as $forum_id)
+						{
+							$sql = 'SELECT p.poster_id, p.topic_id
+								FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
+								WHERE t.forum_id = ' . $forum_id . '
+									AND t.topic_moved_id = 0
+									AND t.topic_last_post_time > ' . $get_from_time . '
+									AND t.topic_id = p.topic_id
+									AND p.poster_id <> ' . ANONYMOUS . '
+								GROUP BY p.poster_id, p.topic_id';
+							$result = $db->sql_query($sql);
+
+							$posted = array();
+							while ($row = $db->sql_fetchrow($result))
+							{
+								$posted[$row['poster_id']][] = $row['topic_id'];
+							}
+							$db->sql_freeresult($result);
+
+							$sql_ary = array();
+							foreach ($posted as $user_id => $topic_row)
+							{
+								foreach ($topic_row as $topic_id)
+								{
+									$sql_ary[] = array(
+										'user_id'		=> (int) $user_id,
+										'topic_id'		=> (int) $topic_id,
+										'topic_posted'	=> 1,
+									);
+								}
+							}
+							unset($posted);
+
+							if (count($sql_ary))
+							{
+								$db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary);
+							}
+						}
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESYNC_POST_MARKING');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('RESYNC_POST_MARKING_SUCCESS');
+						}
+					break;
+
+					case 'purge_cache':
+						$config->increment('assets_version', 1);
+						$cache->purge();
+
+						// Remove old renderers from the text_formatter service. Since this
+						// operation is performed after the cache is purged, there is not "current"
+						// renderer and in effect all renderers will be purged
+						$phpbb_container->get('text_formatter.cache')->tidy();
+
+						// Clear permissions
+						$auth->acl_clear_prefetch();
+						phpbb_cache_moderators($db, $cache, $auth);
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_PURGE_CACHE');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('PURGE_CACHE_SUCCESS');
+						}
+					break;
+
+					case 'purge_sessions':
+						if ((int) $user->data['user_type'] !== USER_FOUNDER)
+						{
+							send_status_line(403, 'Forbidden');
+							trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+
+						$tables = array(CONFIRM_TABLE, SESSIONS_TABLE);
+
+						foreach ($tables as $table)
+						{
+							switch ($db->get_sql_layer())
+							{
+								case 'sqlite3':
+									$db->sql_query("DELETE FROM $table");
+								break;
+
+								default:
+									$db->sql_query("TRUNCATE TABLE $table");
+								break;
+							}
+						}
+
+						// let's restore the admin session
+						$reinsert_ary = array(
+								'session_id'			=> (string) $user->session_id,
+								'session_page'			=> (string) substr($user->page['page'], 0, 199),
+								'session_forum_id'		=> $user->page['forum'],
+								'session_user_id'		=> (int) $user->data['user_id'],
+								'session_start'			=> (int) $user->data['session_start'],
+								'session_last_visit'	=> (int) $user->data['session_last_visit'],
+								'session_time'			=> (int) $user->time_now,
+								'session_browser'		=> (string) trim(substr($user->browser, 0, 149)),
+								'session_forwarded_for'	=> (string) $user->forwarded_for,
+								'session_ip'			=> (string) $user->ip,
+								'session_autologin'		=> (int) $user->data['session_autologin'],
+								'session_admin'			=> 1,
+								'session_viewonline'	=> (int) $user->data['session_viewonline'],
+						);
+
+						$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $reinsert_ary);
+						$db->sql_query($sql);
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_PURGE_SESSIONS');
+
+						if ($request->is_ajax())
+						{
+							trigger_error('PURGE_SESSIONS_SUCCESS');
+						}
+					break;
+				}
+			}
+		}
+
+		// Version check
+		$user->add_lang('install');
+
+		if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.4.0', '<'))
+		{
+			$template->assign_vars(array(
+				'S_PHP_VERSION_OLD'	=> true,
+				'L_PHP_VERSION_OLD'	=> sprintf($user->lang['PHP_VERSION_OLD'], PHP_VERSION, '5.4.0', '<a href="https://www.phpbb.com/support/docs/en/3.2/ug/quickstart/requirements">', '</a>'),
+			));
+		}
+
+		if ($auth->acl_get('a_board'))
+		{
+			$version_helper = $phpbb_container->get('version_helper');
+			try
+			{
+				$recheck = $request->variable('versioncheck_force', false);
+				$updates_available = $version_helper->get_update_on_branch($recheck);
+				$upgrades_available = $version_helper->get_suggested_updates();
+				if (!empty($upgrades_available))
+				{
+					$upgrades_available = array_pop($upgrades_available);
+				}
+
+				$template->assign_vars(array(
+					'S_VERSION_UP_TO_DATE'		=> empty($updates_available),
+					'S_VERSION_UPGRADEABLE'		=> !empty($upgrades_available),
+					'UPGRADE_INSTRUCTIONS'		=> !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
+				));
+			}
+			catch (\RuntimeException $e)
+			{
+				$message = call_user_func_array(array($user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
+				$template->assign_vars(array(
+					'S_VERSIONCHECK_FAIL'		=> true,
+					'VERSIONCHECK_FAIL_REASON'	=> ($e->getMessage() !== 'VERSIONCHECK_FAIL') ? $message : '',
+				));
+			}
+		}
+		else
+		{
+			// We set this template var to true, to not display an outdated version notice.
+			$template->assign_var('S_VERSION_UP_TO_DATE', true);
+		}
+
+		// Incomplete update?
+		if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<'))
+		{
+			$template->assign_var('S_UPDATE_INCOMPLETE', true);
+		}
+
+		/**
+		* Notice admin
+		*
+		* @event core.acp_main_notice
+		* @since 3.1.0-RC3
+		*/
+		$phpbb_dispatcher->dispatch('core.acp_main_notice');
+
+		// Get forum statistics
+		$total_posts = $config['num_posts'];
+		$total_topics = $config['num_topics'];
+		$total_users = $config['num_users'];
+		$total_files = $config['num_files'];
+
+		$start_date = $user->format_date($config['board_startdate']);
+
+		$boarddays = (time() - $config['board_startdate']) / 86400;
+
+		$posts_per_day = sprintf('%.2f', $total_posts / $boarddays);
+		$topics_per_day = sprintf('%.2f', $total_topics / $boarddays);
+		$users_per_day = sprintf('%.2f', $total_users / $boarddays);
+		$files_per_day = sprintf('%.2f', $total_files / $boarddays);
+
+		$upload_dir_size = get_formatted_filesize($config['upload_dir_size']);
+
+		$avatar_dir_size = 0;
+
+		if ($avatar_dir = @opendir($phpbb_root_path . $config['avatar_path']))
+		{
+			while (($file = readdir($avatar_dir)) !== false)
+			{
+				if ($file[0] != '.' && $file != 'CVS' && strpos($file, 'index.') === false)
+				{
+					$avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file);
+				}
+			}
+			closedir($avatar_dir);
+
+			$avatar_dir_size = get_formatted_filesize($avatar_dir_size);
+		}
+		else
+		{
+			// Couldn't open Avatar dir.
+			$avatar_dir_size = $user->lang['NOT_AVAILABLE'];
+		}
+
+		if ($posts_per_day > $total_posts)
+		{
+			$posts_per_day = $total_posts;
+		}
+
+		if ($topics_per_day > $total_topics)
+		{
+			$topics_per_day = $total_topics;
+		}
+
+		if ($users_per_day > $total_users)
+		{
+			$users_per_day = $total_users;
+		}
+
+		if ($files_per_day > $total_files)
+		{
+			$files_per_day = $total_files;
+		}
+
+		if ($config['allow_attachments'] || $config['allow_pm_attach'])
+		{
+			$sql = 'SELECT COUNT(attach_id) AS total_orphan
+				FROM ' . ATTACHMENTS_TABLE . '
+				WHERE is_orphan = 1
+					AND filetime < ' . (time() - 3*60*60);
+			$result = $db->sql_query($sql);
+			$total_orphan = (int) $db->sql_fetchfield('total_orphan');
+			$db->sql_freeresult($result);
+		}
+		else
+		{
+			$total_orphan = false;
+		}
+
+		$dbsize = get_database_size();
+
+		$template->assign_vars(array(
+			'TOTAL_POSTS'		=> $total_posts,
+			'POSTS_PER_DAY'		=> $posts_per_day,
+			'TOTAL_TOPICS'		=> $total_topics,
+			'TOPICS_PER_DAY'	=> $topics_per_day,
+			'TOTAL_USERS'		=> $total_users,
+			'USERS_PER_DAY'		=> $users_per_day,
+			'TOTAL_FILES'		=> $total_files,
+			'FILES_PER_DAY'		=> $files_per_day,
+			'START_DATE'		=> $start_date,
+			'AVATAR_DIR_SIZE'	=> $avatar_dir_size,
+			'DBSIZE'			=> $dbsize,
+			'UPLOAD_DIR_SIZE'	=> $upload_dir_size,
+			'TOTAL_ORPHAN'		=> $total_orphan,
+			'S_TOTAL_ORPHAN'	=> ($total_orphan === false) ? false : true,
+			'GZIP_COMPRESSION'	=> ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'],
+			'DATABASE_INFO'		=> $db->sql_server_info(),
+			'PHP_VERSION_INFO'	=> PHP_VERSION,
+			'BOARD_VERSION'		=> $config['version'],
+
+			'U_ACTION'			=> $this->u_action,
+			'U_ADMIN_LOG'		=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=admin'),
+			'U_INACTIVE_USERS'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&amp;mode=list'),
+			'U_VERSIONCHECK'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=update&amp;mode=version_check'),
+			'U_VERSIONCHECK_FORCE'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'versioncheck_force=1'),
+			'U_ATTACH_ORPHAN'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=acp_attachments&mode=orphan'),
+
+			'S_VERSIONCHECK'	=> ($auth->acl_get('a_board')) ? true : false,
+			'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? true : false,
+			'S_FOUNDER'			=> ($user->data['user_type'] == USER_FOUNDER) ? true : false,
+			)
+		);
+
+		$log_data = array();
+		$log_count = false;
+
+		if ($auth->acl_get('a_viewlogs'))
+		{
+			view_log('admin', $log_data, $log_count, 5);
+
+			foreach ($log_data as $row)
+			{
+				$template->assign_block_vars('log', array(
+					'USERNAME'	=> $row['username_full'],
+					'IP'		=> $row['ip'],
+					'DATE'		=> $user->format_date($row['time']),
+					'ACTION'	=> $row['action'])
+				);
+			}
+		}
+
+		if ($auth->acl_get('a_user'))
+		{
+			$user->add_lang('memberlist');
+
+			$inactive = array();
+			$inactive_count = 0;
+
+			view_inactive_users($inactive, $inactive_count, 10);
+
+			foreach ($inactive as $row)
+			{
+				$template->assign_block_vars('inactive', array(
+					'INACTIVE_DATE'	=> $user->format_date($row['user_inactive_time']),
+					'REMINDED_DATE'	=> $user->format_date($row['user_reminded_time']),
+					'JOINED'		=> $user->format_date($row['user_regdate']),
+					'LAST_VISIT'	=> (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
+
+					'REASON'		=> $row['inactive_reason'],
+					'USER_ID'		=> $row['user_id'],
+					'POSTS'			=> ($row['user_posts']) ? $row['user_posts'] : 0,
+					'REMINDED'		=> $row['user_reminded'],
+
+					'REMINDED_EXPLAIN'	=> $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])),
+
+					'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview')),
+					'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+					'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+
+					'U_USER_ADMIN'	=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&amp;mode=overview&amp;u={$row['user_id']}"),
+					'U_SEARCH_USER'	=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&amp;sr=posts") : '',
+				));
+			}
+
+			$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
+			if ($config['email_enable'])
+			{
+				$option_ary += array('remind' => 'REMIND');
+			}
+
+			$template->assign_vars(array(
+				'S_INACTIVE_USERS'		=> true,
+				'S_INACTIVE_OPTIONS'	=> build_select($option_ary))
+			);
+		}
+
+		// Warn if install is still present
+		if (file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install'))
+		{
+			$template->assign_var('S_REMOVE_INSTALL', true);
+		}
+
+		// Warn if no search index is created
+		if ($config['num_posts'] && class_exists($config['search_type']))
+		{
+			$error = false;
+			$search_type = $config['search_type'];
+			$search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher);
+
+			if (!$search->index_created())
+			{
+				$template->assign_vars(array(
+					'S_SEARCH_INDEX_MISSING'	=> true,
+					'L_NO_SEARCH_INDEX'			=> $user->lang('NO_SEARCH_INDEX', $search->get_name(), '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=acp_search&amp;mode=index') . '">', '</a>'),
+				));
+			}
+		}
+
+		if (!defined('PHPBB_DISABLE_CONFIG_CHECK') && file_exists($phpbb_root_path . 'config.' . $phpEx) && $phpbb_filesystem->is_writable($phpbb_root_path . 'config.' . $phpEx))
+		{
+			// World-Writable? (000x)
+			$template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002));
+		}
+
+		if (extension_loaded('mbstring'))
+		{
+			$template->assign_vars(array(
+				'S_MBSTRING_LOADED'						=> true,
+				'S_MBSTRING_FUNC_OVERLOAD_FAIL'			=> (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL | MB_OVERLOAD_STRING)),
+				'S_MBSTRING_ENCODING_TRANSLATION_FAIL'	=> (@ini_get('mbstring.encoding_translation') != 0),
+				'S_MBSTRING_HTTP_INPUT_FAIL'			=> !in_array(@ini_get('mbstring.http_input'), array('pass', '')),
+				'S_MBSTRING_HTTP_OUTPUT_FAIL'			=> !in_array(@ini_get('mbstring.http_output'), array('pass', '')),
+			));
+		}
+
+		// Fill dbms version if not yet filled
+		if (empty($config['dbms_version']))
+		{
+			$config->set('dbms_version', $db->sql_server_info(true));
+		}
+
+		$this->tpl_name = 'acp_main';
+		$this->page_title = 'ACP_MAIN';
+	}
+}

includes/acp/acp_modules.php

@@ -0,0 +1,666 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use phpbb\module\exception\module_exception;
+
+/**
+* - Able to check for new module versions (modes changed/adjusted/added/removed)
+* Icons for:
+* - module enabled and displayed (common)
+* - module enabled and not displayed
+* - module deactivated
+* - category (enabled)
+* - category disabled
+*/
+
+class acp_modules
+{
+	var $module_class = '';
+	var $parent_id;
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $module, $request, $phpbb_log, $phpbb_container;
+
+		/** @var \phpbb\module\module_manager $module_manager */
+		$module_manager = $phpbb_container->get('module.manager');
+
+		// Set a global define for modules we might include (the author is able to prevent execution of code by checking this constant)
+		define('MODULE_INCLUDE', true);
+
+		$user->add_lang('acp/modules');
+		$this->tpl_name = 'acp_modules';
+
+		$form_key = 'acp_modules';
+		add_form_key($form_key);
+
+		// module class
+		$this->module_class = $mode;
+
+		if ($this->module_class == 'ucp')
+		{
+			$user->add_lang('ucp');
+		}
+		else if ($this->module_class == 'mcp')
+		{
+			$user->add_lang('mcp');
+		}
+
+		if ($module->p_class != $this->module_class)
+		{
+			$module->add_mod_info($this->module_class);
+		}
+
+		$this->page_title = strtoupper($this->module_class);
+
+		$this->parent_id = $request->variable('parent_id', 0);
+		$module_id = $request->variable('m', 0);
+		$action = $request->variable('action', '');
+		$errors = array();
+
+		switch ($action)
+		{
+			case 'delete':
+				if (!$module_id)
+				{
+					trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				if (confirm_box(true))
+				{
+					// Make sure we are not directly within a module
+					if ($module_id == $this->parent_id)
+					{
+						$sql = 'SELECT parent_id
+							FROM ' . MODULES_TABLE . '
+							WHERE module_id = ' . $module_id;
+						$result = $db->sql_query($sql);
+						$this->parent_id = (int) $db->sql_fetchfield('parent_id');
+						$db->sql_freeresult($result);
+					}
+
+					try
+					{
+						$row = $module_manager->get_module_row($module_id, $this->module_class);
+						$module_manager->delete_module($module_id, $this->module_class);
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MODULE_REMOVED', false, array($user->lang($row['module_langname'])));
+					}
+					catch (module_exception $e)
+					{
+						$msg = $user->lang($e->getMessage());
+						trigger_error($msg . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+					}
+
+					$module_manager->remove_cache_file($this->module_class);
+					trigger_error($user->lang['MODULE_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+				}
+				else
+				{
+					confirm_box(false, 'DELETE_MODULE', build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'parent_id'	=> $this->parent_id,
+						'module_id'	=> $module_id,
+						'action'	=> $action,
+					)));
+				}
+
+			break;
+
+			case 'enable':
+			case 'disable':
+				if (!$module_id)
+				{
+					trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				if (!check_link_hash($request->variable('hash', ''), 'acp_modules'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT *
+					FROM ' . MODULES_TABLE . "
+					WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
+						AND module_id = $module_id";
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				$sql = 'UPDATE ' . MODULES_TABLE . '
+					SET module_enabled = ' . (($action == 'enable') ? 1 : 0) . "
+					WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
+						AND module_id = $module_id";
+				$db->sql_query($sql);
+
+				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MODULE_' . strtoupper($action), false, array($user->lang($row['module_langname'])));
+				$module_manager->remove_cache_file($this->module_class);
+
+			break;
+
+			case 'move_up':
+			case 'move_down':
+				if (!$module_id)
+				{
+					trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				if (!check_link_hash($request->variable('hash', ''), 'acp_modules'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT *
+					FROM ' . MODULES_TABLE . "
+					WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
+						AND module_id = $module_id";
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				try
+				{
+					$move_module_name = $module_manager->move_module_by($row, $this->module_class, $action, 1);
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MODULE_' . strtoupper($action), false, array($user->lang($row['module_langname']), $move_module_name));
+					$module_manager->remove_cache_file($this->module_class);
+				}
+				catch (module_exception $e)
+				{
+					// Do nothing
+				}
+
+				if ($request->is_ajax())
+				{
+					$json_response = new \phpbb\json_response;
+					$json_response->send(array(
+						'success'	=> ($move_module_name !== false),
+					));
+				}
+
+			break;
+
+			case 'quickadd':
+				$quick_install = $request->variable('quick_install', '');
+
+				if (confirm_box(true))
+				{
+					if (!$quick_install || strpos($quick_install, '::') === false)
+					{
+						break;
+					}
+
+					list($module_basename, $module_mode) = explode('::', $quick_install);
+
+					// Check if module name and mode exist...
+					$fileinfo = $module_manager->get_module_infos($this->module_class, $module_basename);
+					$fileinfo = $fileinfo[$module_basename];
+
+					if (isset($fileinfo['modes'][$module_mode]))
+					{
+						$module_data = array(
+							'module_basename'	=> $module_basename,
+							'module_enabled'	=> 0,
+							'module_display'	=> (isset($fileinfo['modes'][$module_mode]['display'])) ? $fileinfo['modes'][$module_mode]['display'] : 1,
+							'parent_id'			=> $this->parent_id,
+							'module_class'		=> $this->module_class,
+							'module_langname'	=> $fileinfo['modes'][$module_mode]['title'],
+							'module_mode'		=> $module_mode,
+							'module_auth'		=> $fileinfo['modes'][$module_mode]['auth'],
+						);
+
+						try
+						{
+							$module_manager->update_module_data($module_data);
+							$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MODULE_ADD', false, array($user->lang($module_data['module_langname'])));
+						}
+						catch (\phpbb\module\exception\module_exception $e)
+						{
+							$msg = $user->lang($e->getMessage());
+							trigger_error($msg . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+						}
+
+						if (!count($errors))
+						{
+							$module_manager->remove_cache_file($this->module_class);
+
+							trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+						}
+					}
+				}
+				else
+				{
+					confirm_box(false, 'ADD_MODULE', build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'parent_id'	=> $this->parent_id,
+						'action'	=> 'quickadd',
+						'quick_install'	=> $quick_install,
+					)));
+				}
+
+			break;
+
+			case 'edit':
+
+				if (!$module_id)
+				{
+					trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+				try
+				{
+					$module_row = $module_manager->get_module_row($module_id, $this->module_class);
+				}
+				catch (\phpbb\module\exception\module_not_found_exception $e)
+				{
+					$msg = $user->lang($e->getMessage());
+					trigger_error($msg . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+				}
+
+			// no break
+
+			case 'add':
+
+				if ($action == 'add')
+				{
+					$module_row = array(
+						'module_basename'	=> '',
+						'module_enabled'	=> 0,
+						'module_display'	=> 1,
+						'parent_id'			=> 0,
+						'module_langname'	=> $request->variable('module_langname', '', true),
+						'module_mode'		=> '',
+						'module_auth'		=> '',
+					);
+				}
+
+				$module_data = array();
+
+				$module_data['module_basename'] = $request->variable('module_basename', (string) $module_row['module_basename']);
+				$module_data['module_enabled'] = $request->variable('module_enabled', (int) $module_row['module_enabled']);
+				$module_data['module_display'] = $request->variable('module_display', (int) $module_row['module_display']);
+				$module_data['parent_id'] = $request->variable('module_parent_id', (int) $module_row['parent_id']);
+				$module_data['module_class'] = $this->module_class;
+				$module_data['module_langname'] = $request->variable('module_langname', (string) $module_row['module_langname'], true);
+				$module_data['module_mode'] = $request->variable('module_mode', (string) $module_row['module_mode']);
+
+				$submit = (isset($_POST['submit'])) ? true : false;
+
+				if ($submit)
+				{
+					if (!check_form_key($form_key))
+					{
+						trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+					}
+
+					if (!$module_data['module_langname'])
+					{
+						trigger_error($user->lang['NO_MODULE_LANGNAME'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+					}
+
+					$module_type = $request->variable('module_type', 'category');
+
+					if ($module_type == 'category')
+					{
+						$module_data['module_basename'] = $module_data['module_mode'] = $module_data['module_auth'] = '';
+						$module_data['module_display'] = 1;
+					}
+
+					if ($action == 'edit')
+					{
+						$module_data['module_id'] = $module_id;
+					}
+
+					// Adjust auth row
+					if ($module_data['module_basename'] && $module_data['module_mode'])
+					{
+						$fileinfo = $module_manager->get_module_infos($this->module_class, $module_data['module_basename']);
+						$module_data['module_auth'] = $fileinfo[$module_data['module_basename']]['modes'][$module_data['module_mode']]['auth'];
+					}
+
+					try
+					{
+						$module_manager->update_module_data($module_data);
+						$phpbb_log->add('admin',
+							$user->data['user_id'],
+							$user->ip,
+							($action === 'edit') ? 'LOG_MODULE_EDIT' : 'LOG_MODULE_ADD',
+							false,
+							array($user->lang($module_data['module_langname']))
+						);					}
+					catch (\phpbb\module\exception\module_exception $e)
+					{
+						$msg = $user->lang($e->getMessage());
+						trigger_error($msg . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+					}
+
+					if (!count($errors))
+					{
+						$module_manager->remove_cache_file($this->module_class);
+
+						trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+					}
+				}
+
+				// Category/not category?
+				$is_cat = (!$module_data['module_basename']) ? true : false;
+
+				// Get module information
+				$module_infos = $module_manager->get_module_infos($this->module_class);
+
+				// Build name options
+				$s_name_options = $s_mode_options = '';
+				foreach ($module_infos as $option => $values)
+				{
+					if (!$module_data['module_basename'])
+					{
+						$module_data['module_basename'] = $option;
+					}
+
+					// Name options
+					$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_basename']) ? ' selected="selected"' : '') . '>' . $user->lang($values['title']) . ' [' . $option . ']</option>';
+
+					$template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option)));
+
+					// Build module modes
+					foreach ($values['modes'] as $m_mode => $m_values)
+					{
+						if ($option == $module_data['module_basename'])
+						{
+							$s_mode_options .= '<option value="' . $m_mode . '"' . (($m_mode == $module_data['module_mode']) ? ' selected="selected"' : '') . '>' . $user->lang($m_values['title']) . '</option>';
+						}
+
+						$template->assign_block_vars('m_names.modes', array(
+							'OPTION'		=> $m_mode,
+							'VALUE'			=> $user->lang($m_values['title']),
+							'A_OPTION'		=> addslashes($m_mode),
+							'A_VALUE'		=> addslashes($user->lang($m_values['title'])))
+						);
+					}
+				}
+
+				$s_cat_option = '<option value="0"' . (($module_data['parent_id'] == 0) ? ' selected="selected"' : '') . '>' . $user->lang['NO_PARENT'] . '</option>';
+
+				$template->assign_vars(array_merge(array(
+					'S_EDIT_MODULE'		=> true,
+					'S_IS_CAT'			=> $is_cat,
+					'S_CAT_OPTIONS'		=> $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true),
+					'S_MODULE_NAMES'	=> $s_name_options,
+					'S_MODULE_MODES'	=> $s_mode_options,
+					'U_BACK'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+					'U_EDIT_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+
+					'L_TITLE'			=> $user->lang[strtoupper($action) . '_MODULE'],
+
+					'MODULENAME'		=> $user->lang($module_data['module_langname']),
+					'ACTION'			=> $action,
+					'MODULE_ID'			=> $module_id,
+
+				),
+					array_change_key_case($module_data, CASE_UPPER))
+				);
+
+				if (count($errors))
+				{
+					$template->assign_vars(array(
+						'S_ERROR'	=> true,
+						'ERROR_MSG'	=> implode('<br />', $errors))
+					);
+				}
+
+				return;
+
+			break;
+		}
+
+		// Default management page
+		if (count($errors))
+		{
+			if ($request->is_ajax())
+			{
+				$json_response = new \phpbb\json_response;
+				$json_response->send(array(
+					'MESSAGE_TITLE'	=> $user->lang('ERROR'),
+					'MESSAGE_TEXT'	=> implode('<br />', $errors),
+					'SUCCESS'	=> false,
+				));
+			}
+
+			$template->assign_vars(array(
+				'S_ERROR'	=> true,
+				'ERROR_MSG'	=> implode('<br />', $errors))
+			);
+		}
+
+		if (!$this->parent_id)
+		{
+			$navigation = strtoupper($this->module_class);
+		}
+		else
+		{
+			$navigation = '<a href="' . $this->u_action . '">' . strtoupper($this->module_class) . '</a>';
+
+			$modules_nav = $module_manager->get_module_branch($this->parent_id, $this->module_class, 'parents');
+
+			foreach ($modules_nav as $row)
+			{
+				$langname = $user->lang($row['module_langname']);
+
+				if ($row['module_id'] == $this->parent_id)
+				{
+					$navigation .= ' -&gt; ' . $langname;
+				}
+				else
+				{
+					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['module_id'] . '">' . $langname . '</a>';
+				}
+			}
+		}
+
+		// Jumpbox
+		$module_box = $this->make_module_select($this->parent_id, false, false, false, false);
+
+		$sql = 'SELECT *
+			FROM ' . MODULES_TABLE . "
+			WHERE parent_id = {$this->parent_id}
+				AND module_class = '" . $db->sql_escape($this->module_class) . "'
+			ORDER BY left_id";
+		$result = $db->sql_query($sql);
+
+		if ($row = $db->sql_fetchrow($result))
+		{
+			do
+			{
+				$langname = $user->lang($row['module_langname']);
+
+				if (!$row['module_enabled'])
+				{
+					$module_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['DEACTIVATED_MODULE'] .'" />';
+				}
+				else
+				{
+					$module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['MODULE'] . '" />';
+				}
+
+				$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
+
+				$template->assign_block_vars('modules', array(
+					'MODULE_IMAGE'		=> $module_image,
+					'MODULE_TITLE'		=> $langname,
+					'MODULE_ENABLED'	=> ($row['module_enabled']) ? true : false,
+					'MODULE_DISPLAYED'	=> ($row['module_display']) ? true : false,
+
+					'S_ACP_CAT_SYSTEM'			=> ($this->module_class == 'acp' && $row['module_langname'] == 'ACP_CAT_SYSTEM') ? true : false,
+					'S_ACP_MODULE_MANAGEMENT'	=> ($this->module_class == 'acp' && ($row['module_basename'] == 'modules' || $row['module_langname'] == 'ACP_MODULE_MANAGEMENT')) ? true : false,
+
+					'U_MODULE'			=> $this->u_action . '&amp;parent_id=' . $row['module_id'],
+					'U_MOVE_UP'			=> $url . '&amp;action=move_up&amp;hash=' . generate_link_hash('acp_modules'),
+					'U_MOVE_DOWN'		=> $url . '&amp;action=move_down&amp;hash=' . generate_link_hash('acp_modules'),
+					'U_EDIT'			=> $url . '&amp;action=edit',
+					'U_DELETE'			=> $url . '&amp;action=delete',
+					'U_ENABLE'			=> $url . '&amp;action=enable&amp;hash=' . generate_link_hash('acp_modules'),
+					'U_DISABLE'			=> $url . '&amp;action=disable&amp;hash=' . generate_link_hash('acp_modules'))
+				);
+			}
+			while ($row = $db->sql_fetchrow($result));
+		}
+		else if ($this->parent_id)
+		{
+			try
+			{
+				$row = $module_manager->get_module_row($this->parent_id, $this->module_class);
+			}
+			catch (\phpbb\module\exception\module_not_found_exception $e)
+			{
+				$msg = $user->lang($e->getMessage());
+				trigger_error($msg . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			}
+
+			$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
+
+			$template->assign_vars(array(
+				'S_NO_MODULES'		=> true,
+				'MODULE_TITLE'		=> $langname,
+				'MODULE_ENABLED'	=> ($row['module_enabled']) ? true : false,
+				'MODULE_DISPLAYED'	=> ($row['module_display']) ? true : false,
+
+				'U_EDIT'			=> $url . '&amp;action=edit',
+				'U_DELETE'			=> $url . '&amp;action=delete',
+				'U_ENABLE'			=> $url . '&amp;action=enable&amp;hash=' . generate_link_hash('acp_modules'),
+				'U_DISABLE'			=> $url . '&amp;action=disable&amp;hash=' . generate_link_hash('acp_modules'))
+			);
+		}
+		$db->sql_freeresult($result);
+
+		// Quick adding module
+		$module_infos = $module_manager->get_module_infos($this->module_class);
+
+		// Build quick options
+		$s_install_options = '';
+		foreach ($module_infos as $option => $values)
+		{
+			// Name options
+			$s_install_options .= '<optgroup label="' . $user->lang($values['title']) . ' [' . $option . ']">';
+
+			// Build module modes
+			foreach ($values['modes'] as $m_mode => $m_values)
+			{
+				$s_install_options .= '<option value="' . $option . '::' . $m_mode . '">&nbsp; &nbsp;' . $user->lang($m_values['title']) . '</option>';
+			}
+
+			$s_install_options .= '</optgroup>';
+		}
+
+		$template->assign_vars(array(
+			'U_SEL_ACTION'		=> $this->u_action,
+			'U_ACTION'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+			'NAVIGATION'		=> $navigation,
+			'MODULE_BOX'		=> $module_box,
+			'PARENT_ID'			=> $this->parent_id,
+			'S_INSTALL_OPTIONS'	=> $s_install_options,
+			)
+		);
+	}
+
+	/**
+	* Simple version of jumpbox, just lists modules
+	*/
+	function make_module_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $ignore_noncat = false)
+	{
+		global $db, $user;
+
+		$sql = 'SELECT module_id, module_enabled, module_basename, parent_id, module_langname, left_id, right_id, module_auth
+			FROM ' . MODULES_TABLE . "
+			WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
+			ORDER BY left_id ASC";
+		$result = $db->sql_query($sql);
+
+		$right = $iteration = 0;
+		$padding_store = array('0' => '');
+		$module_list = $padding = '';
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if ($row['left_id'] < $right)
+			{
+				$padding .= '&nbsp; &nbsp;';
+				$padding_store[$row['parent_id']] = $padding;
+			}
+			else if ($row['left_id'] > $right + 1)
+			{
+				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
+			}
+
+			$right = $row['right_id'];
+
+			if (!$ignore_acl && $row['module_auth'])
+			{
+				// We use zero as the forum id to check - global setting.
+				if (!p_master::module_auth($row['module_auth'], 0))
+				{
+					continue;
+				}
+			}
+
+			// ignore this module?
+			if ((is_array($ignore_id) && in_array($row['module_id'], $ignore_id)) || $row['module_id'] == $ignore_id)
+			{
+				continue;
+			}
+
+			// empty category
+			if (!$row['module_basename'] && ($row['left_id'] + 1 == $row['right_id']) && $ignore_emptycat)
+			{
+				continue;
+			}
+
+			// ignore non-category?
+			if ($row['module_basename'] && $ignore_noncat)
+			{
+				continue;
+			}
+
+			$selected = (is_array($select_id)) ? ((in_array($row['module_id'], $select_id)) ? ' selected="selected"' : '') : (($row['module_id'] == $select_id) ? ' selected="selected"' : '');
+
+			$langname = $user->lang($row['module_langname']);
+			$module_list .= '<option value="' . $row['module_id'] . '"' . $selected . ((!$row['module_enabled']) ? ' class="disabled"' : '') . '>' . $padding . $langname . '</option>';
+
+			$iteration++;
+		}
+		$db->sql_freeresult($result);
+
+		unset($padding_store);
+
+		return $module_list;
+	}
+}

includes/acp/acp_permission_roles.php

@@ -0,0 +1,596 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_permission_roles
+{
+	var $u_action;
+	protected $auth_admin;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $phpbb_container;
+		global $phpbb_root_path, $phpEx;
+		global $request, $phpbb_log;
+
+		if (!function_exists('user_get_id_name'))
+		{
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		}
+
+		if (!class_exists('auth_admin'))
+		{
+			include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+		}
+
+		$this->auth_admin = new auth_admin();
+
+		$user->add_lang('acp/permissions');
+		add_permission_language();
+
+		$this->tpl_name = 'acp_permission_roles';
+
+		$submit = (isset($_POST['submit'])) ? true : false;
+		$role_id = $request->variable('role_id', 0);
+		$action = $request->variable('action', '');
+		$action = (isset($_POST['add'])) ? 'add' : $action;
+
+		$form_name = 'acp_permissions';
+		add_form_key($form_name);
+
+		if (!$role_id && in_array($action, array('remove', 'edit', 'move_up', 'move_down')))
+		{
+			trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		switch ($mode)
+		{
+			case 'admin_roles':
+				$permission_type = 'a_';
+				$this->page_title = 'ACP_ADMIN_ROLES';
+			break;
+
+			case 'user_roles':
+				$permission_type = 'u_';
+				$this->page_title = 'ACP_USER_ROLES';
+			break;
+
+			case 'mod_roles':
+				$permission_type = 'm_';
+				$this->page_title = 'ACP_MOD_ROLES';
+			break;
+
+			case 'forum_roles':
+				$permission_type = 'f_';
+				$this->page_title = 'ACP_FORUM_ROLES';
+			break;
+
+			default:
+				trigger_error('NO_MODE', E_USER_ERROR);
+			break;
+		}
+
+		$template->assign_vars(array(
+			'L_TITLE'		=> $user->lang[$this->page_title],
+			'L_EXPLAIN'		=> $user->lang[$this->page_title . '_EXPLAIN'])
+		);
+
+		// Take action... admin submitted something
+		if ($submit || $action == 'remove')
+		{
+			switch ($action)
+			{
+				case 'remove':
+
+					$sql = 'SELECT *
+						FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$result = $db->sql_query($sql);
+					$role_row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$role_row)
+					{
+						trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (confirm_box(true))
+					{
+						$this->remove_role($role_id, $permission_type);
+
+						$role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_' . strtoupper($permission_type) . 'ROLE_REMOVED', false, array($role_name));
+						trigger_error($user->lang['ROLE_DELETED'] . adm_back_link($this->u_action));
+					}
+					else
+					{
+						confirm_box(false, 'DELETE_ROLE', build_hidden_fields(array(
+							'i'			=> $id,
+							'mode'		=> $mode,
+							'role_id'	=> $role_id,
+							'action'	=> $action,
+						)));
+					}
+
+				break;
+
+				case 'edit':
+
+					// Get role we edit
+					$sql = 'SELECT *
+						FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$result = $db->sql_query($sql);
+					$role_row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$role_row)
+					{
+						trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+				// no break;
+
+				case 'add':
+
+					if (!check_form_key($form_name))
+					{
+						trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					$role_name = $request->variable('role_name', '', true);
+					$role_description = $request->variable('role_description', '', true);
+					$auth_settings = $request->variable('setting', array('' => 0));
+
+					if (!$role_name)
+					{
+						trigger_error($user->lang['NO_ROLE_NAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (utf8_strlen($role_description) > 4000)
+					{
+						trigger_error($user->lang['ROLE_DESCRIPTION_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					// if we add/edit a role we check the name to be unique among the settings...
+					$sql = 'SELECT role_id
+						FROM ' . ACL_ROLES_TABLE . "
+						WHERE role_type = '" . $db->sql_escape($permission_type) . "'
+							AND role_name = '" . $db->sql_escape($role_name) . "'";
+					$result = $db->sql_query($sql);
+					$row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					// Make sure we only print out the error if we add the role or change it's name
+					if ($row && ($mode == 'add' || ($mode == 'edit' && $role_row['role_name'] != $role_name)))
+					{
+						trigger_error(sprintf($user->lang['ROLE_NAME_ALREADY_EXIST'], $role_name) . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					$sql_ary = array(
+						'role_name'			=> (string) $role_name,
+						'role_description'	=> (string) $role_description,
+						'role_type'			=> (string) $permission_type,
+					);
+
+					if ($action == 'edit')
+					{
+						$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
+							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+							WHERE role_id = ' . $role_id;
+						$db->sql_query($sql);
+					}
+					else
+					{
+						// Get maximum role order for inserting a new role...
+						$sql = 'SELECT MAX(role_order) as max_order
+							FROM ' . ACL_ROLES_TABLE . "
+							WHERE role_type = '" . $db->sql_escape($permission_type) . "'";
+						$result = $db->sql_query($sql);
+						$max_order = (int) $db->sql_fetchfield('max_order');
+						$db->sql_freeresult($result);
+
+						$sql_ary['role_order'] = $max_order + 1;
+
+						$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+						$db->sql_query($sql);
+
+						$role_id = $db->sql_nextid();
+					}
+
+					// Now add the auth settings
+					$this->auth_admin->acl_set_role($role_id, $auth_settings);
+
+					$role_name = (!empty($user->lang[$role_name])) ? $user->lang[$role_name] : $role_name;
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_' . strtoupper($permission_type) . 'ROLE_' . strtoupper($action), false, array($role_name));
+
+					trigger_error($user->lang['ROLE_' . strtoupper($action) . '_SUCCESS'] . adm_back_link($this->u_action));
+
+				break;
+			}
+		}
+
+		// Display screens
+		switch ($action)
+		{
+			case 'add':
+
+				$options_from = $request->variable('options_from', 0);
+
+				$role_row = array(
+					'role_name'			=> $request->variable('role_name', '', true),
+					'role_description'	=> $request->variable('role_description', '', true),
+					'role_type'			=> $permission_type,
+				);
+
+				if ($options_from)
+				{
+					$sql = 'SELECT p.auth_option_id, p.auth_setting, o.auth_option
+						FROM ' . ACL_ROLES_DATA_TABLE . ' p, ' . ACL_OPTIONS_TABLE . ' o
+						WHERE o.auth_option_id = p.auth_option_id
+							AND p.role_id = ' . $options_from . '
+						ORDER BY p.auth_option_id';
+					$result = $db->sql_query($sql);
+
+					$auth_options = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$auth_options[$row['auth_option']] = $row['auth_setting'];
+					}
+					$db->sql_freeresult($result);
+				}
+				else
+				{
+					$sql = 'SELECT auth_option_id, auth_option
+						FROM ' . ACL_OPTIONS_TABLE . "
+						WHERE auth_option " . $db->sql_like_expression($permission_type . $db->get_any_char()) . "
+							AND auth_option <> '{$permission_type}'
+						ORDER BY auth_option_id";
+					$result = $db->sql_query($sql);
+
+					$auth_options = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$auth_options[$row['auth_option']] = ACL_NO;
+					}
+					$db->sql_freeresult($result);
+				}
+
+			// no break;
+
+			case 'edit':
+
+				if ($action == 'edit')
+				{
+					$sql = 'SELECT *
+						FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$result = $db->sql_query($sql);
+					$role_row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					$sql = 'SELECT p.auth_option_id, p.auth_setting, o.auth_option
+						FROM ' . ACL_ROLES_DATA_TABLE . ' p, ' . ACL_OPTIONS_TABLE . ' o
+						WHERE o.auth_option_id = p.auth_option_id
+							AND p.role_id = ' . $role_id . '
+						ORDER BY p.auth_option_id';
+					$result = $db->sql_query($sql);
+
+					$auth_options = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$auth_options[$row['auth_option']] = $row['auth_setting'];
+					}
+					$db->sql_freeresult($result);
+				}
+
+				if (!$role_row)
+				{
+					trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				/* @var $phpbb_permissions \phpbb\permissions */
+				$phpbb_permissions = $phpbb_container->get('acl.permissions');
+
+				$template->assign_vars(array(
+					'S_EDIT'			=> true,
+
+					'U_ACTION'			=> $this->u_action . "&amp;action={$action}&amp;role_id={$role_id}",
+					'U_BACK'			=> $this->u_action,
+
+					'ROLE_NAME'			=> $role_row['role_name'],
+					'ROLE_DESCRIPTION'	=> $role_row['role_description'],
+					'L_ACL_TYPE'		=> $phpbb_permissions->get_type_lang($permission_type),
+				));
+
+				// We need to fill the auth options array with ACL_NO options ;)
+				$sql = 'SELECT auth_option_id, auth_option
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option " . $db->sql_like_expression($permission_type . $db->get_any_char()) . "
+						AND auth_option <> '{$permission_type}'
+					ORDER BY auth_option_id";
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					if (!isset($auth_options[$row['auth_option']]))
+					{
+						$auth_options[$row['auth_option']] = ACL_NO;
+					}
+				}
+				$db->sql_freeresult($result);
+
+				// Unset global permission option
+				unset($auth_options[$permission_type]);
+
+				// Display auth options
+				$this->display_auth_options($auth_options);
+
+				// Get users/groups/forums using this preset...
+				if ($action == 'edit')
+				{
+					$hold_ary = $this->auth_admin->get_role_mask($role_id);
+
+					if (count($hold_ary))
+					{
+						$role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
+
+						$template->assign_vars(array(
+							'S_DISPLAY_ROLE_MASK'	=> true,
+							'L_ROLE_ASSIGNED_TO'	=> sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
+						);
+
+						$this->auth_admin->display_role_mask($hold_ary);
+					}
+				}
+
+				return;
+			break;
+
+			case 'move_up':
+			case 'move_down':
+
+				if (!check_link_hash($request->variable('hash', ''), 'acp_permission_roles'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT role_order
+					FROM ' . ACL_ROLES_TABLE . "
+					WHERE role_id = $role_id";
+				$result = $db->sql_query($sql);
+				$order = $db->sql_fetchfield('role_order');
+				$db->sql_freeresult($result);
+
+				if ($order === false || ($order == 0 && $action == 'move_up'))
+				{
+					break;
+				}
+				$order = (int) $order;
+				$order_total = $order * 2 + (($action == 'move_up') ? -1 : 1);
+
+				$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
+					SET role_order = ' . $order_total . " - role_order
+					WHERE role_type = '" . $db->sql_escape($permission_type) . "'
+						AND role_order IN ($order, " . (($action == 'move_up') ? $order - 1 : $order + 1) . ')';
+				$db->sql_query($sql);
+
+				if ($request->is_ajax())
+				{
+					$json_response = new \phpbb\json_response;
+					$json_response->send(array(
+						'success'	=> (bool) $db->sql_affectedrows(),
+					));
+				}
+
+			break;
+		}
+
+		// By default, check that role_order is valid and fix it if necessary
+		$sql = 'SELECT role_id, role_order
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_type = '" . $db->sql_escape($permission_type) . "'
+			ORDER BY role_order ASC";
+		$result = $db->sql_query($sql);
+
+		if ($row = $db->sql_fetchrow($result))
+		{
+			$order = 0;
+			do
+			{
+				$order++;
+				if ($row['role_order'] != $order)
+				{
+					$db->sql_query('UPDATE ' . ACL_ROLES_TABLE . " SET role_order = $order WHERE role_id = {$row['role_id']}");
+				}
+			}
+			while ($row = $db->sql_fetchrow($result));
+		}
+		$db->sql_freeresult($result);
+
+		// Display assigned items?
+		$display_item = $request->variable('display_item', 0);
+
+		// Select existing roles
+		$sql = 'SELECT *
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_type = '" . $db->sql_escape($permission_type) . "'
+			ORDER BY role_order ASC";
+		$result = $db->sql_query($sql);
+
+		$s_role_options = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$role_name = (!empty($user->lang[$row['role_name']])) ? $user->lang[$row['role_name']] : $row['role_name'];
+
+			$template->assign_block_vars('roles', array(
+				'ROLE_NAME'				=> $role_name,
+				'ROLE_DESCRIPTION'		=> (!empty($user->lang[$row['role_description']])) ? $user->lang[$row['role_description']] : nl2br($row['role_description']),
+
+				'U_EDIT'			=> $this->u_action . '&amp;action=edit&amp;role_id=' . $row['role_id'],
+				'U_REMOVE'			=> $this->u_action . '&amp;action=remove&amp;role_id=' . $row['role_id'],
+				'U_MOVE_UP'			=> $this->u_action . '&amp;action=move_up&amp;role_id=' . $row['role_id'] . '&amp;hash=' . generate_link_hash('acp_permission_roles'),
+				'U_MOVE_DOWN'		=> $this->u_action . '&amp;action=move_down&amp;role_id=' . $row['role_id'] . '&amp;hash=' . generate_link_hash('acp_permission_roles'),
+				'U_DISPLAY_ITEMS'	=> ($row['role_id'] == $display_item) ? '' : $this->u_action . '&amp;display_item=' . $row['role_id'] . '#assigned_to')
+			);
+
+			$s_role_options .= '<option value="' . $row['role_id'] . '">' . $role_name . '</option>';
+
+			if ($display_item == $row['role_id'])
+			{
+				$template->assign_vars(array(
+					'L_ROLE_ASSIGNED_TO'	=> sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
+				);
+			}
+		}
+		$db->sql_freeresult($result);
+
+		$template->assign_vars(array(
+			'S_ROLE_OPTIONS'		=> $s_role_options)
+		);
+
+		if ($display_item)
+		{
+			$template->assign_vars(array(
+				'S_DISPLAY_ROLE_MASK'	=> true)
+			);
+
+			$hold_ary = $this->auth_admin->get_role_mask($display_item);
+			$this->auth_admin->display_role_mask($hold_ary);
+		}
+	}
+
+	/**
+	* Display permission settings able to be set
+	*/
+	function display_auth_options($auth_options)
+	{
+		global $template, $phpbb_container;
+
+		/* @var $phpbb_permissions \phpbb\permissions */
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
+
+		$content_array = $categories = array();
+		$key_sort_array = array(0);
+		$auth_options = array(0 => $auth_options);
+
+		// Making use of auth_admin method here (we do not really want to change two similar code fragments)
+		$this->auth_admin->build_permission_array($auth_options, $content_array, $categories, $key_sort_array);
+
+		$content_array = $content_array[0];
+
+		$template->assign_var('S_NUM_PERM_COLS', count($categories));
+
+		// Assign to template
+		foreach ($content_array as $cat => $cat_array)
+		{
+			$template->assign_block_vars('auth', array(
+				'CAT_NAME'	=> $phpbb_permissions->get_category_lang($cat),
+
+				'S_YES'		=> ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
+				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
+				'S_NO'		=> ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false)
+			);
+
+			foreach ($cat_array['permissions'] as $permission => $allowed)
+			{
+				$template->assign_block_vars('auth.mask', array(
+					'S_YES'		=> ($allowed == ACL_YES) ? true : false,
+					'S_NEVER'	=> ($allowed == ACL_NEVER) ? true : false,
+					'S_NO'		=> ($allowed == ACL_NO) ? true : false,
+
+					'FIELD_NAME'	=> $permission,
+					'PERMISSION'	=> $phpbb_permissions->get_permission_lang($permission),
+				));
+			}
+		}
+	}
+
+	/**
+	* Remove role
+	*/
+	function remove_role($role_id, $permission_type)
+	{
+		global $db;
+
+		// Get complete auth array
+		$sql = 'SELECT auth_option, auth_option_id
+			FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option " . $db->sql_like_expression($permission_type . $db->get_any_char());
+		$result = $db->sql_query($sql);
+
+		$auth_settings = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$auth_settings[$row['auth_option']] = ACL_NO;
+		}
+		$db->sql_freeresult($result);
+
+		// Get the role auth settings we need to re-set...
+		$sql = 'SELECT o.auth_option, r.auth_setting
+			FROM ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' o
+			WHERE o.auth_option_id = r.auth_option_id
+				AND r.role_id = ' . $role_id;
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$auth_settings[$row['auth_option']] = $row['auth_setting'];
+		}
+		$db->sql_freeresult($result);
+
+		// Get role assignments
+		$hold_ary = $this->auth_admin->get_role_mask($role_id);
+
+		// Re-assign permissions
+		foreach ($hold_ary as $forum_id => $forum_ary)
+		{
+			if (isset($forum_ary['users']))
+			{
+				$this->auth_admin->acl_set('user', $forum_id, $forum_ary['users'], $auth_settings, 0, false);
+			}
+
+			if (isset($forum_ary['groups']))
+			{
+				$this->auth_admin->acl_set('group', $forum_id, $forum_ary['groups'], $auth_settings, 0, false);
+			}
+		}
+
+		// Remove role from users and groups just to be sure (happens through acl_set)
+		$sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
+			WHERE auth_role_id = ' . $role_id;
+		$db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
+			WHERE auth_role_id = ' . $role_id;
+		$db->sql_query($sql);
+
+		// Remove role data and role
+		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$db->sql_query($sql);
+
+		$this->auth_admin->acl_clear_prefetch();
+	}
+}

includes/acp/acp_php_info.php

@@ -0,0 +1,89 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_php_info
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $template;
+
+		if ($mode != 'info')
+		{
+			trigger_error('NO_MODE', E_USER_ERROR);
+		}
+
+		$this->tpl_name = 'acp_php_info';
+		$this->page_title = 'ACP_PHP_INFO';
+
+		ob_start();
+		phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
+		$phpinfo = ob_get_clean();
+
+		$phpinfo = trim($phpinfo);
+
+		// Here we play around a little with the PHP Info HTML to try and stylise
+		// it along phpBB's lines ... hopefully without breaking anything. The idea
+		// for this was nabbed from the PHP annotated manual
+		preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
+
+		if (empty($phpinfo) || empty($output[1][0]))
+		{
+			trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
+		}
+
+		$output = $output[1][0];
+
+		// expose_php can make the image not exist
+		if (preg_match('#<a[^>]*><img[^>]*></a>#', $output))
+		{
+			$output = preg_replace('#<tr class="v"><td>(.*?<a[^>]*><img[^>]*></a>)(.*?)</td></tr>#s', '<tr class="row1"><td><table class="type2"><tr><td>\2</td><td>\1</td></tr></table></td></tr>', $output);
+		}
+		else
+		{
+			$output = preg_replace('#<tr class="v"><td>(.*?)</td></tr>#s', '<tr class="row1"><td><table class="type2"><tr><td>\1</td></tr></table></td></tr>', $output);
+		}
+		$output = preg_replace('#<table[^>]+>#i', '<table>', $output);
+		$output = preg_replace('#<img border="0"#i', '<img', $output);
+		$output = str_replace(array('class="e"', 'class="v"', 'class="h"', '<hr />', '<font', '</font>'), array('class="row1"', 'class="row2"', '', '', '<span', '</span>'), $output);
+
+		// Fix invalid anchor names (eg "module_Zend Optimizer")
+		$output = preg_replace_callback('#<a name="([^"]+)">#', array($this, 'remove_spaces'), $output);
+
+		if (empty($output))
+		{
+			trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
+		}
+
+		$orig_output = $output;
+
+		preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output);
+		$output = (!empty($output[1][0])) ? $output[1][0] : $orig_output;
+
+		$template->assign_var('PHPINFO', $output);
+	}
+
+	function remove_spaces($matches)
+	{
+		return '<a name="' . str_replace(' ', '_', $matches[1]) . '">';
+	}
+}

includes/acp/acp_prune.php

@@ -0,0 +1,587 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_prune
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $user, $phpEx, $phpbb_root_path;
+
+		$user->add_lang('acp/prune');
+
+		if (!function_exists('user_active_flip'))
+		{
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		}
+
+		switch ($mode)
+		{
+			case 'forums':
+				$this->tpl_name = 'acp_prune_forums';
+				$this->page_title = 'ACP_PRUNE_FORUMS';
+				$this->prune_forums($id, $mode);
+			break;
+
+			case 'users':
+				$this->tpl_name = 'acp_prune_users';
+				$this->page_title = 'ACP_PRUNE_USERS';
+				$this->prune_users($id, $mode);
+			break;
+		}
+	}
+
+	/**
+	* Prune forums
+	*/
+	function prune_forums($id, $mode)
+	{
+		global $db, $user, $auth, $template, $phpbb_log, $request, $phpbb_dispatcher;
+
+		$all_forums = $request->variable('all_forums', 0);
+		$forum_id = $request->variable('f', array(0));
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		if ($all_forums)
+		{
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				ORDER BY left_id';
+			$result = $db->sql_query($sql);
+
+			$forum_id = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$forum_id[] = $row['forum_id'];
+			}
+			$db->sql_freeresult($result);
+		}
+
+		if ($submit)
+		{
+			if (confirm_box(true))
+			{
+				$prune_posted = $request->variable('prune_days', 0);
+				$prune_viewed = $request->variable('prune_vieweddays', 0);
+				$prune_all = (!$prune_posted && !$prune_viewed) ? true : false;
+
+				$prune_flags = 0;
+				$prune_flags += ($request->variable('prune_old_polls', 0)) ? 2 : 0;
+				$prune_flags += ($request->variable('prune_announce', 0)) ? 4 : 0;
+				$prune_flags += ($request->variable('prune_sticky', 0)) ? 8 : 0;
+
+				// Convert days to seconds for timestamp functions...
+				$prunedate_posted = time() - ($prune_posted * 86400);
+				$prunedate_viewed = time() - ($prune_viewed * 86400);
+
+				$template->assign_vars(array(
+					'S_PRUNED'		=> true)
+				);
+
+				$sql_forum = (count($forum_id)) ? ' AND ' . $db->sql_in_set('forum_id', $forum_id) : '';
+
+				// Get a list of forum's or the data for the forum that we are pruning.
+				$sql = 'SELECT forum_id, forum_name
+					FROM ' . FORUMS_TABLE . '
+					WHERE forum_type = ' . FORUM_POST . "
+						$sql_forum
+					ORDER BY left_id ASC";
+				$result = $db->sql_query($sql);
+
+				if ($row = $db->sql_fetchrow($result))
+				{
+					$prune_ids = array();
+					$p_result['topics'] = 0;
+					$p_result['posts'] = 0;
+					$log_data = '';
+
+					do
+					{
+						if (!$auth->acl_get('f_list', $row['forum_id']))
+						{
+							continue;
+						}
+
+						if ($prune_all)
+						{
+							$p_result = prune($row['forum_id'], 'posted', time(), $prune_flags, false);
+						}
+						else
+						{
+							if ($prune_posted)
+							{
+								$return = prune($row['forum_id'], 'posted', $prunedate_posted, $prune_flags, false);
+								$p_result['topics'] += $return['topics'];
+								$p_result['posts'] += $return['posts'];
+							}
+
+							if ($prune_viewed)
+							{
+								$return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false);
+								$p_result['topics'] += $return['topics'];
+								$p_result['posts'] += $return['posts'];
+							}
+						}
+
+						$prune_ids[] = $row['forum_id'];
+
+						$template->assign_block_vars('pruned', array(
+							'FORUM_NAME'	=> $row['forum_name'],
+							'NUM_TOPICS'	=> $p_result['topics'],
+							'NUM_POSTS'		=> $p_result['posts'])
+						);
+
+						$log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name'];
+					}
+					while ($row = $db->sql_fetchrow($result));
+
+					// Sync all pruned forums at once
+					sync('forum', 'forum_id', $prune_ids, true, true);
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_PRUNE', false, array($log_data));
+				}
+				$db->sql_freeresult($result);
+
+				return;
+			}
+			else
+			{
+				$hidden_fields = array(
+					'i'				=> $id,
+					'mode'			=> $mode,
+					'submit'		=> 1,
+					'all_forums'	=> $all_forums,
+					'f'				=> $forum_id,
+
+					'prune_days'		=> $request->variable('prune_days', 0),
+					'prune_vieweddays'	=> $request->variable('prune_vieweddays', 0),
+					'prune_old_polls'	=> $request->variable('prune_old_polls', 0),
+					'prune_announce'	=> $request->variable('prune_announce', 0),
+					'prune_sticky'		=> $request->variable('prune_sticky', 0),
+				);
+
+				/**
+				 * Use this event to pass data from the prune form to the confirmation screen
+				 *
+				 * @event core.prune_forums_settings_confirm
+				 * @var array	hidden_fields	Hidden fields that are passed through the confirm screen
+				 * @since 3.2.2-RC1
+				 */
+				$vars = array('hidden_fields');
+				extract($phpbb_dispatcher->trigger_event('core.prune_forums_settings_confirm', compact($vars)));
+
+				confirm_box(false, $user->lang['PRUNE_FORUM_CONFIRM'], build_hidden_fields($hidden_fields));
+			}
+		}
+
+		// If they haven't selected a forum for pruning yet then
+		// display a select box to use for pruning.
+		if (!count($forum_id))
+		{
+			$template->assign_vars(array(
+				'U_ACTION'			=> $this->u_action,
+				'S_SELECT_FORUM'	=> true,
+				'S_FORUM_OPTIONS'	=> make_forum_select(false, false, false))
+			);
+		}
+		else
+		{
+			$sql = 'SELECT forum_id, forum_name
+				FROM ' . FORUMS_TABLE . '
+				WHERE ' . $db->sql_in_set('forum_id', $forum_id);
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+
+			if (!$row)
+			{
+				$db->sql_freeresult($result);
+				trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$forum_list = $s_hidden_fields = '';
+			do
+			{
+				$forum_list .= (($forum_list != '') ? ', ' : '') . '<b>' . $row['forum_name'] . '</b>';
+				$s_hidden_fields .= '<input type="hidden" name="f[]" value="' . $row['forum_id'] . '" />';
+			}
+			while ($row = $db->sql_fetchrow($result));
+
+			$db->sql_freeresult($result);
+
+			$l_selected_forums = (count($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
+
+			$template_data = array(
+				'L_SELECTED_FORUMS'		=> $user->lang[$l_selected_forums],
+				'U_ACTION'				=> $this->u_action,
+				'U_BACK'				=> $this->u_action,
+				'FORUM_LIST'			=> $forum_list,
+				'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
+			);
+
+			/**
+			 * Event to add/modify prune forums settings template data
+			 *
+			 * @event core.prune_forums_settings_template_data
+			 * @var array	template_data	Array with form template data
+			 * @since 3.2.2-RC1
+			 */
+			$vars = array('template_data');
+			extract($phpbb_dispatcher->trigger_event('core.prune_forums_settings_template_data', compact($vars)));
+
+			$template->assign_vars($template_data);
+		}
+	}
+
+	/**
+	* Prune users
+	*/
+	function prune_users($id, $mode)
+	{
+		global $db, $user, $auth, $template, $phpbb_log, $request;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;
+
+		/** @var \phpbb\group\helper $group_helper */
+		$group_helper = $phpbb_container->get('group_helper');
+
+		$user->add_lang('memberlist');
+
+		$prune = (isset($_POST['prune'])) ? true : false;
+
+		if ($prune)
+		{
+			$action = $request->variable('action', 'deactivate');
+			$deleteposts = $request->variable('deleteposts', 0);
+
+			if (confirm_box(true))
+			{
+				$user_ids = $usernames = array();
+
+				$this->get_prune_users($user_ids, $usernames);
+				if (count($user_ids))
+				{
+					if ($action == 'deactivate')
+					{
+						user_active_flip('deactivate', $user_ids);
+						$l_log = 'LOG_PRUNE_USER_DEAC';
+					}
+					else if ($action == 'delete')
+					{
+						if ($deleteposts)
+						{
+							user_delete('remove', $user_ids);
+
+							$l_log = 'LOG_PRUNE_USER_DEL_DEL';
+						}
+						else
+						{
+							user_delete('retain', $user_ids, true);
+
+							$l_log = 'LOG_PRUNE_USER_DEL_ANON';
+						}
+					}
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, $l_log, false, array(implode(', ', $usernames)));
+					$msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS'];
+				}
+				else
+				{
+					$msg = $user->lang['USER_PRUNE_FAILURE'];
+				}
+
+				trigger_error($msg . adm_back_link($this->u_action));
+			}
+			else
+			{
+				// We list the users which will be pruned...
+				$user_ids = $usernames = array();
+				$this->get_prune_users($user_ids, $usernames);
+
+				if (!count($user_ids))
+				{
+					trigger_error($user->lang['USER_PRUNE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Assign to template
+				foreach ($user_ids as $user_id)
+				{
+					$template->assign_block_vars('users', array(
+						'USERNAME'			=> $usernames[$user_id],
+						'USER_ID'           => $user_id,
+						'U_PROFILE'			=> get_username_string('profile', $user_id, $usernames[$user_id]),
+						'U_USER_ADMIN'		=> ($auth->acl_get('a_user')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview&amp;u=' . $user_id, true, $user->session_id) : '',
+					));
+				}
+
+				$template->assign_vars(array(
+					'S_DEACTIVATE'		=> ($action == 'deactivate') ? true : false,
+					'S_DELETE'			=> ($action == 'delete') ? true : false,
+				));
+
+				confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+					'i'				=> $id,
+					'mode'			=> $mode,
+					'prune'			=> 1,
+
+					'deleteposts'	=> $request->variable('deleteposts', 0),
+					'action'		=> $request->variable('action', ''),
+				)), 'confirm_body_prune.html');
+			}
+		}
+
+		$find_count = array('lt' => $user->lang['LESS_THAN'], 'eq' => $user->lang['EQUAL_TO'], 'gt' => $user->lang['MORE_THAN']);
+		$s_find_count = '';
+
+		foreach ($find_count as $key => $value)
+		{
+			$selected = ($key == 'eq') ? ' selected="selected"' : '';
+			$s_find_count .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+		}
+
+		$find_time = array('lt' => $user->lang['BEFORE'], 'gt' => $user->lang['AFTER']);
+		$s_find_active_time = '';
+		foreach ($find_time as $key => $value)
+		{
+			$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
+		}
+
+		$sql = 'SELECT group_id, group_name
+			FROM ' . GROUPS_TABLE . '
+			WHERE group_type <> ' . GROUP_SPECIAL . '
+			ORDER BY group_name ASC';
+		$result = $db->sql_query($sql);
+
+		$s_group_list = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$s_group_list .= '<option value="' . $row['group_id'] . '">' . $group_helper->get_name($row['group_name']) . '</option>';
+		}
+		$db->sql_freeresult($result);
+
+		if ($s_group_list)
+		{
+			// Only prepend the "All groups" option if there are groups,
+			// otherwise we don't want to display this option at all.
+			$s_group_list = '<option value="0">' . $user->lang['PRUNE_USERS_GROUP_NONE'] . '</option>' . $s_group_list;
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'			=> $this->u_action,
+			'S_ACTIVE_OPTIONS'	=> $s_find_active_time,
+			'S_GROUP_LIST'		=> $s_group_list,
+			'S_COUNT_OPTIONS'	=> $s_find_count,
+			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_prune&amp;field=users'),
+		));
+	}
+
+	/**
+	* Get user_ids/usernames from those being pruned
+	*/
+	function get_prune_users(&$user_ids, &$usernames)
+	{
+		global $user, $db, $request;
+
+		$users_by_name = $request->variable('users', '', true);
+		$users_by_id = $request->variable('user_ids', array(0));
+		$group_id = $request->variable('group_id', 0);
+		$posts_on_queue = (trim($request->variable('posts_on_queue', '')) === '') ? false : $request->variable('posts_on_queue', 0);
+
+		if ($users_by_name)
+		{
+			$users = explode("\n", $users_by_name);
+			$where_sql = ' AND ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', $users));
+		}
+		else if (!empty($users_by_id))
+		{
+			$user_ids = $users_by_id;
+			user_get_id_name($user_ids, $usernames);
+
+			$where_sql = ' AND ' . $db->sql_in_set('user_id', $user_ids);
+		}
+		else
+		{
+			$username = $request->variable('username', '', true);
+			$email = $request->variable('email', '');
+
+			$active_select = $request->variable('active_select', 'lt');
+			$count_select = $request->variable('count_select', 'eq');
+			$queue_select = $request->variable('queue_select', 'gt');
+			$joined_before = $request->variable('joined_before', '');
+			$joined_after = $request->variable('joined_after', '');
+			$active = $request->variable('active', '');
+
+			$count = ($request->variable('count', '') === '') ? false : $request->variable('count', 0);
+
+			$active = ($active) ? explode('-', $active) : array();
+			$joined_before = ($joined_before) ? explode('-', $joined_before) : array();
+			$joined_after = ($joined_after) ? explode('-', $joined_after) : array();
+
+			// calculate the conditions required by the join time criteria
+			$joined_sql = '';
+			if (!empty($joined_before) && !empty($joined_after))
+			{
+				// if the two entered dates are equal, we need to adjust
+				// so that our time range is a full day instead of 1 second
+				if ($joined_after == $joined_before)
+				{
+					$joined_after[2] += 1;
+				}
+
+				$joined_sql = ' AND user_regdate BETWEEN ' . gmmktime(0, 0, 0, (int) $joined_after[1], (int) $joined_after[2], (int) $joined_after[0]) .
+					' AND ' . gmmktime(0, 0, 0, (int) $joined_before[1], (int) $joined_before[2], (int) $joined_before[0]);
+			}
+			else if (empty($joined_before) && !empty($joined_after))
+			{
+				$joined_sql = ' AND user_regdate > ' . gmmktime(0, 0, 0, (int) $joined_after[1], (int) $joined_after[2], (int) $joined_after[0]);
+			}
+			else if (empty($joined_after) && !empty($joined_before))
+			{
+				$joined_sql = ' AND user_regdate < ' . gmmktime(0, 0, 0, (int) $joined_before[1], (int) $joined_before[2], (int) $joined_before[0]);
+			}
+			// implicit else when both arrays are empty do nothing
+
+			if ((count($active) && count($active) != 3) || (count($joined_before) && count($joined_before) != 3) || (count($joined_after) && count($joined_after) != 3))
+			{
+				trigger_error($user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
+
+			$where_sql = '';
+			$where_sql .= ($username) ? ' AND username_clean ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), utf8_clean_string($username))) : '';
+			$where_sql .= ($email) ? ' AND user_email ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), $email)) . ' ' : '';
+			$where_sql .= $joined_sql;
+			$where_sql .= ($count !== false) ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
+
+			// First handle pruning of users who never logged in, last active date is 0000-00-00
+			if (count($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
+			{
+				$where_sql .= ' AND user_lastvisit = 0';
+			}
+			else if (count($active) && $active_select != 'lt')
+			{
+				$where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);
+			}
+			else if (count($active))
+			{
+				$where_sql .= ' AND (user_lastvisit > 0 AND user_lastvisit < ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) . ')';
+			}
+		}
+
+		// If no search criteria were provided, go no further.
+		if (!$where_sql && !$group_id && $posts_on_queue === false)
+		{
+			return;
+		}
+
+		// Get bot ids
+		$sql = 'SELECT user_id
+			FROM ' . BOTS_TABLE;
+		$result = $db->sql_query($sql);
+
+		$bot_ids = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$bot_ids[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Protect the admin, do not prune if no options are given...
+		if ($where_sql)
+		{
+			// Do not prune founder members
+			$sql = 'SELECT user_id, username
+				FROM ' . USERS_TABLE . '
+				WHERE user_id <> ' . ANONYMOUS . '
+					AND user_type <> ' . USER_FOUNDER . "
+				$where_sql";
+			$result = $db->sql_query($sql);
+
+			$user_ids = $usernames = array();
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				// Do not prune bots and the user currently pruning.
+				if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
+				{
+					$user_ids[] = $row['user_id'];
+					$usernames[$row['user_id']] = $row['username'];
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+
+		if ($group_id)
+		{
+			$sql = 'SELECT u.user_id, u.username
+				FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
+				WHERE ug.group_id = ' . (int) $group_id . '
+					AND ug.user_id <> ' . ANONYMOUS . '
+					AND u.user_type <> ' . USER_FOUNDER . '
+					AND ug.user_pending = 0
+					AND u.user_id = ug.user_id
+					' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : '');
+			$result = $db->sql_query($sql);
+
+			// we're performing an intersection operation, so all the relevant users
+			// come from this most recent query (which was limited to the results of the
+			// previous query)
+			$user_ids = $usernames = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				// Do not prune bots and the user currently pruning.
+				if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
+				{
+					$user_ids[] = $row['user_id'];
+					$usernames[$row['user_id']] = $row['username'];
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+
+		if ($posts_on_queue !== false)
+		{
+			$sql = 'SELECT u.user_id, u.username, COUNT(p.post_id) AS queue_posts
+				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
+				WHERE u.user_id <> ' . ANONYMOUS . '
+					AND u.user_type <> ' . USER_FOUNDER . '
+					AND ' . $db->sql_in_set('p.post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . '
+					AND u.user_id = p.poster_id
+					' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . '
+				GROUP BY p.poster_id
+				HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue;
+			$result = $db->sql_query($sql);
+
+			// same intersection logic as the above group ID portion
+			$user_ids = $usernames = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				// Do not prune bots and the user currently pruning.
+				if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
+				{
+					$user_ids[] = $row['user_id'];
+					$usernames[$row['user_id']] = $row['username'];
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+	}
+}

includes/acp/acp_ranks.php

@@ -0,0 +1,285 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_ranks
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $cache, $request, $phpbb_dispatcher;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpbb_log;
+
+		$user->add_lang('acp/posting');
+
+		// Set up general vars
+		$action = $request->variable('action', '');
+		$action = (isset($_POST['add'])) ? 'add' : $action;
+		$action = (isset($_POST['save'])) ? 'save' : $action;
+		$rank_id = $request->variable('id', 0);
+
+		$this->tpl_name = 'acp_ranks';
+		$this->page_title = 'ACP_MANAGE_RANKS';
+
+		$form_name = 'acp_ranks';
+		add_form_key($form_name);
+
+		switch ($action)
+		{
+			case 'save':
+
+				if (!check_form_key($form_name))
+				{
+					trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
+				}
+				$rank_title = $request->variable('title', '', true);
+				$special_rank = $request->variable('special_rank', 0);
+				$min_posts = ($special_rank) ? 0 : max(0, $request->variable('min_posts', 0));
+				$rank_image = $request->variable('rank_image', '');
+
+				// The rank image has to be a jpg, gif or png
+				if ($rank_image != '' && !preg_match('#(\.gif|\.png|\.jpg|\.jpeg)$#i', $rank_image))
+				{
+					$rank_image = '';
+				}
+
+				if (!$rank_title)
+				{
+					trigger_error($user->lang['NO_RANK_TITLE'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql_ary = array(
+					'rank_title'		=> $rank_title,
+					'rank_special'		=> $special_rank,
+					'rank_min'			=> $min_posts,
+					'rank_image'		=> htmlspecialchars_decode($rank_image)
+				);
+
+				/**
+				* Modify the SQL array when saving a rank
+				*
+				* @event core.acp_ranks_save_modify_sql_ary
+				* @var	int		rank_id		The ID of the rank (if available)
+				* @var	array	sql_ary		Array with the rank's data
+				* @since 3.1.0-RC3
+				*/
+				$vars = array('rank_id', 'sql_ary');
+				extract($phpbb_dispatcher->trigger_event('core.acp_ranks_save_modify_sql_ary', compact($vars)));
+
+				if ($rank_id)
+				{
+					$sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id";
+					$message = $user->lang['RANK_UPDATED'];
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RANK_UPDATED', false, array($rank_title));
+				}
+				else
+				{
+					$sql = 'INSERT INTO ' . RANKS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+					$message = $user->lang['RANK_ADDED'];
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RANK_ADDED', false, array($rank_title));
+				}
+				$db->sql_query($sql);
+
+				$cache->destroy('_ranks');
+
+				trigger_error($message . adm_back_link($this->u_action));
+
+			break;
+
+			case 'delete':
+
+				if (!$rank_id)
+				{
+					trigger_error($user->lang['MUST_SELECT_RANK'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (confirm_box(true))
+				{
+					$sql = 'SELECT rank_title
+						FROM ' . RANKS_TABLE . '
+						WHERE rank_id = ' . $rank_id;
+					$result = $db->sql_query($sql);
+					$rank_title = (string) $db->sql_fetchfield('rank_title');
+					$db->sql_freeresult($result);
+
+					$sql = 'DELETE FROM ' . RANKS_TABLE . "
+						WHERE rank_id = $rank_id";
+					$db->sql_query($sql);
+
+					$sql = 'UPDATE ' . USERS_TABLE . "
+						SET user_rank = 0
+						WHERE user_rank = $rank_id";
+					$db->sql_query($sql);
+
+					$cache->destroy('_ranks');
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RANK_REMOVED', false, array($rank_title));
+
+					if ($request->is_ajax())
+					{
+						$json_response = new \phpbb\json_response;
+						$json_response->send(array(
+							'MESSAGE_TITLE'	=> $user->lang['INFORMATION'],
+							'MESSAGE_TEXT'	=> $user->lang['RANK_REMOVED'],
+							'REFRESH_DATA'	=> array(
+								'time'	=> 3
+							)
+						));
+					}
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'rank_id'	=> $rank_id,
+						'action'	=> 'delete',
+					)));
+				}
+
+			break;
+
+			case 'edit':
+			case 'add':
+
+				$ranks = $existing_imgs = array();
+
+				$sql = 'SELECT *
+					FROM ' . RANKS_TABLE . '
+					ORDER BY rank_min ASC, rank_special ASC';
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$existing_imgs[] = $row['rank_image'];
+
+					if ($action == 'edit' && $rank_id == $row['rank_id'])
+					{
+						$ranks = $row;
+					}
+				}
+				$db->sql_freeresult($result);
+
+				$imglist = filelist($phpbb_root_path . $config['ranks_path'], '');
+				$edit_img = $filename_list = '';
+
+				foreach ($imglist as $path => $img_ary)
+				{
+					sort($img_ary);
+
+					foreach ($img_ary as $img)
+					{
+						$img = $path . $img;
+
+						if ($ranks && $img == $ranks['rank_image'])
+						{
+							$selected = ' selected="selected"';
+							$edit_img = $img;
+						}
+						else
+						{
+							$selected = '';
+						}
+
+						if (strlen($img) > 255)
+						{
+							continue;
+						}
+
+						$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . ((in_array($img, $existing_imgs)) ? ' ' . $user->lang['RANK_IMAGE_IN_USE'] : '') . '</option>';
+					}
+				}
+
+				$filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list;
+				unset($existing_imgs, $imglist);
+
+				$tpl_ary = array(
+					'S_EDIT'			=> true,
+					'U_BACK'			=> $this->u_action,
+					'RANKS_PATH'		=> $phpbb_root_path . $config['ranks_path'],
+					'U_ACTION'			=> $this->u_action . '&amp;id=' . $rank_id,
+
+					'RANK_TITLE'		=> (isset($ranks['rank_title'])) ? $ranks['rank_title'] : '',
+					'S_FILENAME_LIST'	=> $filename_list,
+					'RANK_IMAGE'		=> ($edit_img) ? $phpbb_root_path . $config['ranks_path'] . '/' . $edit_img : htmlspecialchars($phpbb_admin_path) . 'images/spacer.gif',
+					'S_SPECIAL_RANK'	=> (isset($ranks['rank_special']) && $ranks['rank_special']) ? true : false,
+					'MIN_POSTS'			=> (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0,
+				);
+
+				/**
+				* Modify the template output array for editing/adding ranks
+				*
+				* @event core.acp_ranks_edit_modify_tpl_ary
+				* @var	array	ranks		Array with the rank's data
+				* @var	array	tpl_ary		Array with the rank's template data
+				* @since 3.1.0-RC3
+				*/
+				$vars = array('ranks', 'tpl_ary');
+				extract($phpbb_dispatcher->trigger_event('core.acp_ranks_edit_modify_tpl_ary', compact($vars)));
+
+				$template->assign_vars($tpl_ary);
+				return;
+
+			break;
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'		=> $this->u_action)
+		);
+
+		$sql = 'SELECT *
+			FROM ' . RANKS_TABLE . '
+			ORDER BY rank_special DESC, rank_min ASC, rank_title ASC';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$rank_row = array(
+				'S_RANK_IMAGE'		=> ($row['rank_image']) ? true : false,
+				'S_SPECIAL_RANK'	=> ($row['rank_special']) ? true : false,
+
+				'RANK_IMAGE'		=> $phpbb_root_path . $config['ranks_path'] . '/' . $row['rank_image'],
+				'RANK_TITLE'		=> $row['rank_title'],
+				'MIN_POSTS'			=> $row['rank_min'],
+
+				'U_EDIT'			=> $this->u_action . '&amp;action=edit&amp;id=' . $row['rank_id'],
+				'U_DELETE'			=> $this->u_action . '&amp;action=delete&amp;id=' . $row['rank_id'],
+			);
+
+			/**
+			* Modify the template output array for each listed rank
+			*
+			* @event core.acp_ranks_list_modify_rank_row
+			* @var	array	row			Array with the rank's data
+			* @var	array	rank_row	Array with the rank's template data
+			* @since 3.1.0-RC3
+			*/
+			$vars = array('row', 'rank_row');
+			extract($phpbb_dispatcher->trigger_event('core.acp_ranks_list_modify_rank_row', compact($vars)));
+
+			$template->assign_block_vars('ranks', $rank_row);
+		}
+		$db->sql_freeresult($result);
+
+	}
+}

includes/acp/acp_reasons.php

@@ -0,0 +1,394 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_reasons
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template;
+		global $request, $phpbb_log;
+
+		$user->add_lang(array('mcp', 'acp/posting'));
+
+		// Set up general vars
+		$action = $request->variable('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
+		$reason_id = $request->variable('id', 0);
+
+		$this->tpl_name = 'acp_reasons';
+		$this->page_title = 'ACP_REASONS';
+
+		$form_name = 'acp_reason';
+		add_form_key('acp_reason');
+
+		$error = array();
+
+		switch ($action)
+		{
+			case 'add':
+			case 'edit':
+
+				$reason_row = array(
+					'reason_title'			=> $request->variable('reason_title', '', true),
+					'reason_description'	=> $request->variable('reason_description', '', true),
+				);
+
+				if ($submit)
+				{
+					if (!check_form_key($form_name))
+					{
+						$error[] = $user->lang['FORM_INVALID'];
+					}
+					// Reason specified?
+					if (!$reason_row['reason_title'] || !$reason_row['reason_description'])
+					{
+						$error[] = $user->lang['NO_REASON_INFO'];
+					}
+
+					$check_double = ($action == 'add') ? true : false;
+
+					if ($action == 'edit')
+					{
+						$sql = 'SELECT reason_title
+							FROM ' . REPORTS_REASONS_TABLE . "
+							WHERE reason_id = $reason_id";
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if (strtolower($row['reason_title']) == 'other' || strtolower($reason_row['reason_title']) == 'other')
+						{
+							$reason_row['reason_title'] = 'other';
+						}
+
+						if ($row['reason_title'] != $reason_row['reason_title'])
+						{
+							$check_double = true;
+						}
+					}
+
+					// Check for same reason if adding it...
+					if ($check_double)
+					{
+						$sql = 'SELECT reason_id
+							FROM ' . REPORTS_REASONS_TABLE . "
+							WHERE reason_title = '" . $db->sql_escape($reason_row['reason_title']) . "'";
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if ($row || ($action == 'add' && strtolower($reason_row['reason_title']) == 'other'))
+						{
+							$error[] = $user->lang['REASON_ALREADY_EXIST'];
+						}
+					}
+
+					if (!count($error))
+					{
+						// New reason?
+						if ($action == 'add')
+						{
+							// Get new order...
+							$sql = 'SELECT MAX(reason_order) as max_reason_order
+								FROM ' . REPORTS_REASONS_TABLE;
+							$result = $db->sql_query($sql);
+							$max_order = (int) $db->sql_fetchfield('max_reason_order');
+							$db->sql_freeresult($result);
+
+							$sql_ary = array(
+								'reason_title'			=> (string) $reason_row['reason_title'],
+								'reason_description'	=> (string) $reason_row['reason_description'],
+								'reason_order'			=> $max_order + 1
+							);
+
+							$db->sql_query('INSERT INTO ' . REPORTS_REASONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
+
+							$log = 'ADDED';
+						}
+						else if ($reason_id)
+						{
+							$sql_ary = array(
+								'reason_title'			=> (string) $reason_row['reason_title'],
+								'reason_description'	=> (string) $reason_row['reason_description'],
+							);
+
+							$db->sql_query('UPDATE ' . REPORTS_REASONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+								WHERE reason_id = ' . $reason_id);
+
+							$log = 'UPDATED';
+						}
+
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_REASON_' . $log, false, array($reason_row['reason_title']));
+						trigger_error($user->lang['REASON_' . $log] . adm_back_link($this->u_action));
+					}
+				}
+				else if ($reason_id)
+				{
+					$sql = 'SELECT *
+						FROM ' . REPORTS_REASONS_TABLE . '
+						WHERE reason_id = ' . $reason_id;
+					$result = $db->sql_query($sql);
+					$reason_row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$reason_row)
+					{
+						trigger_error($user->lang['NO_REASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+				}
+
+				$l_title = ($action == 'edit') ? 'EDIT' : 'ADD';
+
+				$translated = false;
+
+				// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
+				if (isset($user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])]))
+				{
+					$translated = true;
+				}
+
+				$template->assign_vars(array(
+					'L_TITLE'		=> $user->lang['REASON_' . $l_title],
+					'U_ACTION'		=> $this->u_action . "&amp;id=$reason_id&amp;action=$action",
+					'U_BACK'		=> $this->u_action,
+					'ERROR_MSG'		=> (count($error)) ? implode('<br />', $error) : '',
+
+					'REASON_TITLE'			=> $reason_row['reason_title'],
+					'REASON_DESCRIPTION'	=> $reason_row['reason_description'],
+
+					'TRANSLATED_TITLE'		=> ($translated) ? $user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])] : '',
+					'TRANSLATED_DESCRIPTION'=> ($translated) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])] : '',
+
+					'S_AVAILABLE_TITLES'	=> implode($user->lang['COMMA_SEPARATOR'], array_map('htmlspecialchars', array_keys($user->lang['report_reasons']['TITLE']))),
+					'S_EDIT_REASON'			=> true,
+					'S_TRANSLATED'			=> $translated,
+					'S_ERROR'				=> (count($error)) ? true : false,
+					)
+				);
+
+				return;
+			break;
+
+			case 'delete':
+
+				$sql = 'SELECT *
+					FROM ' . REPORTS_REASONS_TABLE . '
+					WHERE reason_id = ' . $reason_id;
+				$result = $db->sql_query($sql);
+				$reason_row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if (!$reason_row)
+				{
+					trigger_error($user->lang['NO_REASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (strtolower($reason_row['reason_title']) == 'other')
+				{
+					trigger_error($user->lang['NO_REMOVE_DEFAULT_REASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Let the deletion be confirmed...
+				if (confirm_box(true))
+				{
+					$sql = 'SELECT reason_id
+						FROM ' . REPORTS_REASONS_TABLE . "
+						WHERE LOWER(reason_title) = 'other'";
+					$result = $db->sql_query($sql);
+					$other_reason_id = (int) $db->sql_fetchfield('reason_id');
+					$db->sql_freeresult($result);
+
+					switch ($db->get_sql_layer())
+					{
+						// The ugly one!
+						case 'mysqli':
+						case 'mysql4':
+						case 'mysql':
+							// Change the reports using this reason to 'other'
+							$sql = 'UPDATE ' . REPORTS_TABLE . '
+								SET reason_id = ' . $other_reason_id . ", report_text = CONCAT('" . $db->sql_escape($reason_row['reason_description']) . "\n\n', report_text)
+								WHERE reason_id = $reason_id";
+						break;
+
+						// Standard? What's that?
+						case 'mssql_odbc':
+						case 'mssqlnative':
+							// Change the reports using this reason to 'other'
+							$sql = "DECLARE @ptrval binary(16)
+
+									SELECT @ptrval = TEXTPTR(report_text)
+										FROM " . REPORTS_TABLE . "
+									WHERE reason_id = " . $reason_id . "
+
+									UPDATETEXT " . REPORTS_TABLE . ".report_text @ptrval 0 0 '" . $db->sql_escape($reason_row['reason_description']) . "\n\n'
+
+									UPDATE " . REPORTS_TABLE . '
+										SET reason_id = ' . $other_reason_id . "
+									WHERE reason_id = $reason_id";
+						break;
+
+						// Teh standard
+						case 'postgres':
+						case 'oracle':
+						case 'sqlite3':
+							// Change the reports using this reason to 'other'
+							$sql = 'UPDATE ' . REPORTS_TABLE . '
+								SET reason_id = ' . $other_reason_id . ", report_text = '" . $db->sql_escape($reason_row['reason_description']) . "\n\n' || report_text
+								WHERE reason_id = $reason_id";
+						break;
+					}
+					$db->sql_query($sql);
+
+					$db->sql_query('DELETE FROM ' . REPORTS_REASONS_TABLE . ' WHERE reason_id = ' . $reason_id);
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_REASON_REMOVED', false, array($reason_row['reason_title']));
+					trigger_error($user->lang['REASON_REMOVED'] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action,
+						'id'		=> $reason_id))
+					);
+				}
+
+			break;
+
+			case 'move_up':
+			case 'move_down':
+
+				if (!check_link_hash($request->variable('hash', ''), 'acp_reasons'))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT reason_order
+					FROM ' . REPORTS_REASONS_TABLE . "
+					WHERE reason_id = $reason_id";
+				$result = $db->sql_query($sql);
+				$order = $db->sql_fetchfield('reason_order');
+				$db->sql_freeresult($result);
+
+				if ($order === false || ($order == 0 && $action == 'move_up'))
+				{
+					break;
+				}
+				$order = (int) $order;
+				$order_total = $order * 2 + (($action == 'move_up') ? -1 : 1);
+
+				$sql = 'UPDATE ' . REPORTS_REASONS_TABLE . '
+					SET reason_order = ' . $order_total . ' - reason_order
+					WHERE reason_order IN (' . $order . ', ' . (($action == 'move_up') ? $order - 1 : $order + 1) . ')';
+				$db->sql_query($sql);
+
+				if ($request->is_ajax())
+				{
+					$json_response = new \phpbb\json_response;
+					$json_response->send(array(
+						'success'	=> (bool) $db->sql_affectedrows(),
+					));
+				}
+			break;
+		}
+
+		// By default, check that order is valid and fix it if necessary
+		$sql = 'SELECT reason_id, reason_order
+			FROM ' . REPORTS_REASONS_TABLE . '
+			ORDER BY reason_order';
+		$result = $db->sql_query($sql);
+
+		if ($row = $db->sql_fetchrow($result))
+		{
+			$order = 0;
+			do
+			{
+				++$order;
+
+				if ($row['reason_order'] != $order)
+				{
+					$sql = 'UPDATE ' . REPORTS_REASONS_TABLE . "
+						SET reason_order = $order
+						WHERE reason_id = {$row['reason_id']}";
+					$db->sql_query($sql);
+				}
+			}
+			while ($row = $db->sql_fetchrow($result));
+		}
+		$db->sql_freeresult($result);
+
+		$template->assign_vars(array(
+			'U_ACTION'			=> $this->u_action,
+			)
+		);
+
+		// Reason count
+		$sql = 'SELECT reason_id, COUNT(reason_id) AS reason_count
+			FROM ' . REPORTS_TABLE . '
+			GROUP BY reason_id';
+		$result = $db->sql_query($sql);
+
+		$reason_count = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$reason_count[$row['reason_id']] = $row['reason_count'];
+		}
+		$db->sql_freeresult($result);
+
+		$sql = 'SELECT *
+			FROM ' . REPORTS_REASONS_TABLE . '
+			ORDER BY reason_order ASC';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$translated = false;
+			$other_reason = ($row['reason_title'] == 'other') ? true : false;
+
+			// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
+			if (isset($user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
+			{
+				$row['reason_description'] = $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])];
+				$row['reason_title'] = $user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])];
+
+				$translated = true;
+			}
+
+			$template->assign_block_vars('reasons', array(
+				'REASON_TITLE'			=> $row['reason_title'],
+				'REASON_DESCRIPTION'	=> $row['reason_description'],
+				'REASON_COUNT'			=> (isset($reason_count[$row['reason_id']])) ? $reason_count[$row['reason_id']] : 0,
+
+				'S_TRANSLATED'		=> $translated,
+				'S_OTHER_REASON'	=> $other_reason,
+
+				'U_EDIT'		=> $this->u_action . '&amp;action=edit&amp;id=' . $row['reason_id'],
+				'U_DELETE'		=> (!$other_reason) ? $this->u_action . '&amp;action=delete&amp;id=' . $row['reason_id'] : '',
+				'U_MOVE_UP'		=> $this->u_action . '&amp;action=move_up&amp;id=' . $row['reason_id'] . '&amp;hash=' . generate_link_hash('acp_reasons'),
+				'U_MOVE_DOWN'	=> $this->u_action . '&amp;action=move_down&amp;id=' . $row['reason_id'] . '&amp;hash=' . generate_link_hash('acp_reasons'))
+			);
+		}
+		$db->sql_freeresult($result);
+	}
+}

includes/acp/acp_search.php

@@ -0,0 +1,623 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_search
+{
+	var $u_action;
+	var $state;
+	var $search;
+	var $max_post_id;
+	var $batch_size = 100;
+
+	function main($id, $mode)
+	{
+		global $user;
+
+		$user->add_lang('acp/search');
+
+		// For some this may be of help...
+		@ini_set('memory_limit', '128M');
+
+		switch ($mode)
+		{
+			case 'settings':
+				$this->settings($id, $mode);
+			break;
+
+			case 'index':
+				$this->index($id, $mode);
+			break;
+		}
+	}
+
+	function settings($id, $mode)
+	{
+		global $user, $template, $phpbb_log, $request;
+		global $config, $phpbb_admin_path, $phpEx;
+
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		if ($submit && !check_link_hash($request->variable('hash', ''), 'acp_search'))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		$search_types = $this->get_search_types();
+
+		$settings = array(
+			'search_interval'			=> 'float',
+			'search_anonymous_interval'	=> 'float',
+			'load_search'				=> 'bool',
+			'limit_search_load'			=> 'float',
+			'min_search_author_chars'	=> 'integer',
+			'max_num_search_keywords'	=> 'integer',
+			'search_store_results'		=> 'integer',
+		);
+
+		$search = null;
+		$error = false;
+		$search_options = '';
+		foreach ($search_types as $type)
+		{
+			if ($this->init_search($type, $search, $error))
+			{
+				continue;
+			}
+
+			$name = $search->get_name();
+
+			$selected = ($config['search_type'] == $type) ? ' selected="selected"' : '';
+			$identifier = substr($type, strrpos($type, '\\') + 1);
+			$search_options .= "<option value=\"$type\"$selected data-toggle-setting=\"#search_{$identifier}_settings\">$name</option>";
+
+			if (method_exists($search, 'acp'))
+			{
+				$vars = $search->acp();
+
+				if (!$submit)
+				{
+					$template->assign_block_vars('backend', array(
+						'NAME'			=> $name,
+						'SETTINGS'		=> $vars['tpl'],
+						'IDENTIFIER'	=> $identifier,
+					));
+				}
+				else if (is_array($vars['config']))
+				{
+					$settings = array_merge($settings, $vars['config']);
+				}
+			}
+		}
+		unset($search);
+		unset($error);
+
+		$cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', array('' => ''), true) : array();
+		$updated = $request->variable('updated', false);
+
+		foreach ($settings as $config_name => $var_type)
+		{
+			if (!isset($cfg_array[$config_name]))
+			{
+				continue;
+			}
+
+			// e.g. integer:4:12 (min 4, max 12)
+			$var_type = explode(':', $var_type);
+
+			$config_value = $cfg_array[$config_name];
+			settype($config_value, $var_type[0]);
+
+			if (isset($var_type[1]))
+			{
+				$config_value = max($var_type[1], $config_value);
+			}
+
+			if (isset($var_type[2]))
+			{
+				$config_value = min($var_type[2], $config_value);
+			}
+
+			// only change config if anything was actually changed
+			if ($submit && ($config[$config_name] != $config_value))
+			{
+				$config->set($config_name, $config_value);
+				$updated = true;
+			}
+		}
+
+		if ($submit)
+		{
+			$extra_message = '';
+			if ($updated)
+			{
+				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_SEARCH');
+			}
+
+			if (isset($cfg_array['search_type']) && in_array($cfg_array['search_type'], $search_types, true) && ($cfg_array['search_type'] != $config['search_type']))
+			{
+				$search = null;
+				$error = false;
+
+				if (!$this->init_search($cfg_array['search_type'], $search, $error))
+				{
+					if (confirm_box(true))
+					{
+						if (!method_exists($search, 'init') || !($error = $search->init()))
+						{
+							$config->set('search_type', $cfg_array['search_type']);
+
+							if (!$updated)
+							{
+								$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_SEARCH');
+							}
+							$extra_message = '<br />' . $user->lang['SWITCHED_SEARCH_BACKEND'] . '<br /><a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=search&amp;mode=index') . '">&raquo; ' . $user->lang['GO_TO_SEARCH_INDEX'] . '</a>';
+						}
+						else
+						{
+							trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+					}
+					else
+					{
+						confirm_box(false, $user->lang['CONFIRM_SEARCH_BACKEND'], build_hidden_fields(array(
+							'i'			=> $id,
+							'mode'		=> $mode,
+							'submit'	=> true,
+							'updated'	=> $updated,
+							'config'	=> array('search_type' => $cfg_array['search_type']),
+						)));
+					}
+				}
+				else
+				{
+					trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+			}
+
+			$search = null;
+			$error = false;
+			if (!$this->init_search($config['search_type'], $search, $error))
+			{
+				if ($updated)
+				{
+					if (method_exists($search, 'config_updated'))
+					{
+						if ($search->config_updated())
+						{
+							trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+					}
+				}
+			}
+			else
+			{
+				trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			trigger_error($user->lang['CONFIG_UPDATED'] . $extra_message . adm_back_link($this->u_action));
+		}
+		unset($cfg_array);
+
+		$this->tpl_name = 'acp_search';
+		$this->page_title = 'ACP_SEARCH_SETTINGS';
+
+		$template->assign_vars(array(
+			'LIMIT_SEARCH_LOAD'		=> (float) $config['limit_search_load'],
+			'MIN_SEARCH_AUTHOR_CHARS'	=> (int) $config['min_search_author_chars'],
+			'SEARCH_INTERVAL'		=> (float) $config['search_interval'],
+			'SEARCH_GUEST_INTERVAL'	=> (float) $config['search_anonymous_interval'],
+			'SEARCH_STORE_RESULTS'	=> (int) $config['search_store_results'],
+			'MAX_NUM_SEARCH_KEYWORDS'	=> (int) $config['max_num_search_keywords'],
+
+			'S_SEARCH_TYPES'		=> $search_options,
+			'S_YES_SEARCH'			=> (bool) $config['load_search'],
+			'S_SETTINGS'			=> true,
+
+			'U_ACTION'				=> $this->u_action . '&amp;hash=' . generate_link_hash('acp_search'))
+		);
+	}
+
+	function index($id, $mode)
+	{
+		global $db, $user, $template, $phpbb_log, $request;
+		global $config, $phpbb_admin_path, $phpEx;
+
+		$action = $request->variable('action', '');
+		$this->state = explode(',', $config['search_indexing_state']);
+
+		if (isset($_POST['cancel']))
+		{
+			$action = '';
+			$this->state = array();
+			$this->save_state();
+		}
+		$submit = $request->is_set_post('submit', false);
+
+		if (!check_link_hash($request->variable('hash', ''), 'acp_search') && in_array($action, array('create', 'delete')))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		if ($action)
+		{
+			switch ($action)
+			{
+				case 'progress_bar':
+					$type = $request->variable('type', '');
+					$this->display_progress_bar($type);
+				break;
+
+				case 'delete':
+					$this->state[1] = 'delete';
+				break;
+
+				case 'create':
+					$this->state[1] = 'create';
+				break;
+
+				default:
+					trigger_error('NO_ACTION', E_USER_ERROR);
+				break;
+			}
+
+			if (empty($this->state[0]))
+			{
+				$this->state[0] = $request->variable('search_type', '');
+			}
+
+			$this->search = null;
+			$error = false;
+			if ($this->init_search($this->state[0], $this->search, $error))
+			{
+				trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+			$name = $this->search->get_name();
+
+			$action = &$this->state[1];
+
+			$this->max_post_id = $this->get_max_post_id();
+
+			$post_counter = (isset($this->state[2])) ? $this->state[2] : 0;
+			$this->state[2] = &$post_counter;
+			$this->save_state();
+
+			switch ($action)
+			{
+				case 'delete':
+					if (method_exists($this->search, 'delete_index'))
+					{
+						// pass a reference to myself so the $search object can make use of save_state() and attributes
+						if ($error = $this->search->delete_index($this, append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=delete&hash=" . generate_link_hash('acp_search'), false)))
+						{
+							$this->state = array('');
+							$this->save_state();
+							trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING);
+						}
+					}
+					else
+					{
+						$starttime = microtime(true);
+						$row_count = 0;
+						while (still_on_time() && $post_counter <= $this->max_post_id)
+						{
+							$sql = 'SELECT post_id, poster_id, forum_id
+								FROM ' . POSTS_TABLE . '
+								WHERE post_id >= ' . (int) ($post_counter + 1) . '
+									AND post_id <= ' . (int) ($post_counter + $this->batch_size);
+							$result = $db->sql_query($sql);
+
+							$ids = $posters = $forum_ids = array();
+							while ($row = $db->sql_fetchrow($result))
+							{
+								$ids[] = $row['post_id'];
+								$posters[] = $row['poster_id'];
+								$forum_ids[] = $row['forum_id'];
+							}
+							$db->sql_freeresult($result);
+							$row_count += count($ids);
+
+							if (count($ids))
+							{
+								$this->search->index_remove($ids, $posters, $forum_ids);
+							}
+
+							$post_counter += $this->batch_size;
+						}
+						// save the current state
+						$this->save_state();
+
+						if ($post_counter <= $this->max_post_id)
+						{
+							$totaltime = microtime(true) - $starttime;
+							$rows_per_second = $row_count / $totaltime;
+							meta_refresh(1, append_sid($this->u_action . '&amp;action=delete&amp;skip_rows=' . $post_counter . '&amp;hash=' . generate_link_hash('acp_search')));
+							trigger_error($user->lang('SEARCH_INDEX_DELETE_REDIRECT', (int) $row_count, $post_counter) . $user->lang('SEARCH_INDEX_DELETE_REDIRECT_RATE', $rows_per_second));
+						}
+					}
+
+					$this->search->tidy();
+
+					$this->state = array('');
+					$this->save_state();
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_SEARCH_INDEX_REMOVED', false, array($name));
+					trigger_error($user->lang['SEARCH_INDEX_REMOVED'] . adm_back_link($this->u_action) . $this->close_popup_js());
+				break;
+
+				case 'create':
+					if (method_exists($this->search, 'create_index'))
+					{
+						// pass a reference to acp_search so the $search object can make use of save_state() and attributes
+						if ($error = $this->search->create_index($this, append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=create", false)))
+						{
+							$this->state = array('');
+							$this->save_state();
+							trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING);
+						}
+					}
+					else
+					{
+						$sql = 'SELECT forum_id, enable_indexing
+							FROM ' . FORUMS_TABLE;
+						$result = $db->sql_query($sql, 3600);
+
+						while ($row = $db->sql_fetchrow($result))
+						{
+							$forums[$row['forum_id']] = (bool) $row['enable_indexing'];
+						}
+						$db->sql_freeresult($result);
+
+						$starttime = microtime(true);
+						$row_count = 0;
+						while (still_on_time() && $post_counter <= $this->max_post_id)
+						{
+							$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
+								FROM ' . POSTS_TABLE . '
+								WHERE post_id >= ' . (int) ($post_counter + 1) . '
+									AND post_id <= ' . (int) ($post_counter + $this->batch_size);
+							$result = $db->sql_query($sql);
+
+							$buffer = $db->sql_buffer_nested_transactions();
+
+							if ($buffer)
+							{
+								$rows = $db->sql_fetchrowset($result);
+								$rows[] = false; // indicate end of array for while loop below
+
+								$db->sql_freeresult($result);
+							}
+
+							$i = 0;
+							while ($row = ($buffer ? $rows[$i++] : $db->sql_fetchrow($result)))
+							{
+								// Indexing enabled for this forum
+								if (isset($forums[$row['forum_id']]) && $forums[$row['forum_id']])
+								{
+									$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
+								}
+								$row_count++;
+							}
+							if (!$buffer)
+							{
+								$db->sql_freeresult($result);
+							}
+
+							$post_counter += $this->batch_size;
+						}
+						// save the current state
+						$this->save_state();
+
+						// pretend the number of posts was as big as the number of ids we indexed so far
+						// just an estimation as it includes deleted posts
+						$num_posts = $config['num_posts'];
+						$config['num_posts'] = min($config['num_posts'], $post_counter);
+						$this->search->tidy();
+						$config['num_posts'] = $num_posts;
+
+						if ($post_counter <= $this->max_post_id)
+						{
+							$totaltime = microtime(true) - $starttime;
+							$rows_per_second = $row_count / $totaltime;
+							meta_refresh(1, append_sid($this->u_action . '&amp;action=create&amp;skip_rows=' . $post_counter . '&amp;hash=' . generate_link_hash('acp_search')));
+							trigger_error($user->lang('SEARCH_INDEX_CREATE_REDIRECT', (int) $row_count, $post_counter) . $user->lang('SEARCH_INDEX_CREATE_REDIRECT_RATE', $rows_per_second));
+						}
+					}
+
+					$this->search->tidy();
+
+					$this->state = array('');
+					$this->save_state();
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_SEARCH_INDEX_CREATED', false, array($name));
+					trigger_error($user->lang['SEARCH_INDEX_CREATED'] . adm_back_link($this->u_action) . $this->close_popup_js());
+				break;
+			}
+		}
+
+		$search_types = $this->get_search_types();
+
+		$search = null;
+		$error = false;
+		foreach ($search_types as $type)
+		{
+			if ($this->init_search($type, $search, $error) || !method_exists($search, 'index_created'))
+			{
+				continue;
+			}
+
+			$name = $search->get_name();
+
+			$data = array();
+			if (method_exists($search, 'index_stats'))
+			{
+				$data = $search->index_stats();
+			}
+
+			$statistics = array();
+			foreach ($data as $statistic => $value)
+			{
+				$n = count($statistics);
+				if ($n && count($statistics[$n - 1]) < 3)
+				{
+					$statistics[$n - 1] += array('statistic_2' => $statistic, 'value_2' => $value);
+				}
+				else
+				{
+					$statistics[] = array('statistic_1' => $statistic, 'value_1' => $value);
+				}
+			}
+
+			$template->assign_block_vars('backend', array(
+				'L_NAME'			=> $name,
+				'NAME'				=> $type,
+
+				'S_ACTIVE'			=> ($type == $config['search_type']) ? true : false,
+				'S_HIDDEN_FIELDS'	=> build_hidden_fields(array('search_type' => $type)),
+				'S_INDEXED'			=> (bool) $search->index_created(),
+				'S_STATS'			=> (bool) count($statistics))
+			);
+
+			foreach ($statistics as $statistic)
+			{
+				$template->assign_block_vars('backend.data', array(
+					'STATISTIC_1'	=> $statistic['statistic_1'],
+					'VALUE_1'		=> $statistic['value_1'],
+					'STATISTIC_2'	=> (isset($statistic['statistic_2'])) ? $statistic['statistic_2'] : '',
+					'VALUE_2'		=> (isset($statistic['value_2'])) ? $statistic['value_2'] : '')
+				);
+			}
+		}
+		unset($search);
+		unset($error);
+		unset($statistics);
+		unset($data);
+
+		$this->tpl_name = 'acp_search';
+		$this->page_title = 'ACP_SEARCH_INDEX';
+
+		$template->assign_vars(array(
+			'S_INDEX'				=> true,
+			'U_ACTION'				=> $this->u_action . '&amp;hash=' . generate_link_hash('acp_search'),
+			'U_PROGRESS_BAR'		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=$mode&amp;action=progress_bar"),
+			'UA_PROGRESS_BAR'		=> addslashes(append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=$mode&amp;action=progress_bar")),
+		));
+
+		if (isset($this->state[1]))
+		{
+			$template->assign_vars(array(
+				'S_CONTINUE_INDEXING'	=> $this->state[1],
+				'U_CONTINUE_INDEXING'	=> $this->u_action . '&amp;action=' . $this->state[1] . '&amp;hash=' . generate_link_hash('acp_search'),
+				'L_CONTINUE'			=> ($this->state[1] == 'create') ? $user->lang['CONTINUE_INDEXING'] : $user->lang['CONTINUE_DELETING_INDEX'],
+				'L_CONTINUE_EXPLAIN'	=> ($this->state[1] == 'create') ? $user->lang['CONTINUE_INDEXING_EXPLAIN'] : $user->lang['CONTINUE_DELETING_INDEX_EXPLAIN'])
+			);
+		}
+	}
+
+	function display_progress_bar($type)
+	{
+		global $template, $user;
+
+		$l_type = ($type == 'create') ? 'INDEXING_IN_PROGRESS' : 'DELETING_INDEX_IN_PROGRESS';
+
+		adm_page_header($user->lang[$l_type]);
+
+		$template->set_filenames(array(
+			'body'	=> 'progress_bar.html')
+		);
+
+		$template->assign_vars(array(
+			'L_PROGRESS'			=> $user->lang[$l_type],
+			'L_PROGRESS_EXPLAIN'	=> $user->lang[$l_type . '_EXPLAIN'])
+		);
+
+		adm_page_footer();
+	}
+
+	function close_popup_js()
+	{
+		return "<script type=\"text/javascript\">\n" .
+			"// <![CDATA[\n" .
+			"	close_waitscreen = 1;\n" .
+			"// ]]>\n" .
+			"</script>\n";
+	}
+
+	function get_search_types()
+	{
+		global $phpbb_extension_manager;
+
+		$finder = $phpbb_extension_manager->get_finder();
+
+		return $finder
+			->extension_suffix('_backend')
+			->extension_directory('/search')
+			->core_path('phpbb/search/')
+			->get_classes();
+	}
+
+	function get_max_post_id()
+	{
+		global $db;
+
+		$sql = 'SELECT MAX(post_id) as max_post_id
+			FROM '. POSTS_TABLE;
+		$result = $db->sql_query($sql);
+		$max_post_id = (int) $db->sql_fetchfield('max_post_id');
+		$db->sql_freeresult($result);
+
+		return $max_post_id;
+	}
+
+	function save_state($state = false)
+	{
+		global $config;
+
+		if ($state)
+		{
+			$this->state = $state;
+		}
+
+		ksort($this->state);
+
+		$config->set('search_indexing_state', implode(',', $this->state), true);
+	}
+
+	/**
+	* Initialises a search backend object
+	*
+	* @return false if no error occurred else an error message
+	*/
+	function init_search($type, &$search, &$error)
+	{
+		global $phpbb_root_path, $phpEx, $user, $auth, $config, $db, $phpbb_dispatcher;
+
+		if (!class_exists($type) || !method_exists($type, 'keyword_search'))
+		{
+			$error = $user->lang['NO_SUCH_SEARCH_MODULE'];
+			return $error;
+		}
+
+		$error = false;
+		$search = new $type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher);
+
+		return $error;
+	}
+}

includes/acp/acp_update.php

@@ -0,0 +1,86 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_update
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $config, $user, $template, $request;
+		global $phpbb_root_path, $phpEx, $phpbb_container;
+
+		$user->add_lang('install');
+
+		$this->tpl_name = 'acp_update';
+		$this->page_title = 'ACP_VERSION_CHECK';
+
+		/* @var $version_helper \phpbb\version_helper */
+		$version_helper = $phpbb_container->get('version_helper');
+		try
+		{
+			$recheck = $request->variable('versioncheck_force', false);
+			$updates_available = $version_helper->get_update_on_branch($recheck);
+			$upgrades_available = $version_helper->get_suggested_updates();
+			if (!empty($upgrades_available))
+			{
+				$upgrades_available = array_pop($upgrades_available);
+			}
+		}
+		catch (\RuntimeException $e)
+		{
+			$template->assign_var('S_VERSIONCHECK_FAIL', true);
+
+			$updates_available = array();
+		}
+
+		if (!empty($updates_available))
+		{
+			$template->assign_block_vars('updates_available', $updates_available);
+		}
+
+		$update_link = $phpbb_root_path . 'install/app.' . $phpEx;
+
+		$template->assign_vars(array(
+			'S_UP_TO_DATE'			=> empty($updates_available),
+			'U_ACTION'				=> $this->u_action,
+			'U_VERSIONCHECK_FORCE'	=> append_sid($this->u_action . '&amp;versioncheck_force=1'),
+
+			'CURRENT_VERSION'		=> $config['version'],
+
+			'UPDATE_INSTRUCTIONS'	=> sprintf($user->lang['UPDATE_INSTRUCTIONS'], $update_link),
+			'S_VERSION_UPGRADEABLE'		=> !empty($upgrades_available),
+			'UPGRADE_INSTRUCTIONS'		=> !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
+		));
+
+		// Incomplete update?
+		if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<'))
+		{
+			$database_update_link = $phpbb_root_path . 'install/app.php/update';
+
+			$template->assign_vars(array(
+				'S_UPDATE_INCOMPLETE'		=> true,
+				'FILES_VERSION'				=> PHPBB_VERSION,
+				'INCOMPLETE_INSTRUCTIONS'	=> $user->lang('UPDATE_INCOMPLETE_EXPLAIN', $database_update_link),
+			));
+		}
+	}
+}

includes/acp/acp_words.php

@@ -0,0 +1,191 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @todo [words] check regular expressions for special char replacements (stored specialchared in db)
+*/
+class acp_words
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		global $db, $user, $template, $cache, $phpbb_log, $request, $phpbb_container;
+
+		$user->add_lang('acp/posting');
+
+		// Set up general vars
+		$action = $request->variable('action', '');
+		$action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['save'])) ? 'save' : $action);
+
+		$s_hidden_fields = '';
+		$word_info = array();
+
+		$this->tpl_name = 'acp_words';
+		$this->page_title = 'ACP_WORDS';
+
+		$form_name = 'acp_words';
+		add_form_key($form_name);
+
+		switch ($action)
+		{
+			case 'edit':
+
+				$word_id = $request->variable('id', 0);
+
+				if (!$word_id)
+				{
+					trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$sql = 'SELECT *
+					FROM ' . WORDS_TABLE . "
+					WHERE word_id = $word_id";
+				$result = $db->sql_query($sql);
+				$word_info = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />';
+
+			case 'add':
+
+				$template->assign_vars(array(
+					'S_EDIT_WORD'		=> true,
+					'U_ACTION'			=> $this->u_action,
+					'U_BACK'			=> $this->u_action,
+					'WORD'				=> (isset($word_info['word'])) ? $word_info['word'] : '',
+					'REPLACEMENT'		=> (isset($word_info['replacement'])) ? $word_info['replacement'] : '',
+					'S_HIDDEN_FIELDS'	=> $s_hidden_fields)
+				);
+
+				return;
+
+			break;
+
+			case 'save':
+
+				if (!check_form_key($form_name))
+				{
+					trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				$word_id		= $request->variable('id', 0);
+				$word			= $request->variable('word', '', true);
+				$replacement	= $request->variable('replacement', '', true);
+
+				if ($word === '' || $replacement === '')
+				{
+					trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Replace multiple consecutive asterisks with single one as those are not needed
+				$word = preg_replace('#\*{2,}#', '*', $word);
+
+				$sql_ary = array(
+					'word'			=> $word,
+					'replacement'	=> $replacement
+				);
+
+				if ($word_id)
+				{
+					$db->sql_query('UPDATE ' . WORDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE word_id = ' . $word_id);
+				}
+				else
+				{
+					$db->sql_query('INSERT INTO ' . WORDS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
+				}
+
+				$cache->destroy('_word_censors');
+				$phpbb_container->get('text_formatter.cache')->invalidate();
+
+				$log_action = ($word_id) ? 'LOG_WORD_EDIT' : 'LOG_WORD_ADD';
+
+				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, $log_action, false, array($word));
+
+				$message = ($word_id) ? $user->lang['WORD_UPDATED'] : $user->lang['WORD_ADDED'];
+				trigger_error($message . adm_back_link($this->u_action));
+
+			break;
+
+			case 'delete':
+
+				$word_id = $request->variable('id', 0);
+
+				if (!$word_id)
+				{
+					trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (confirm_box(true))
+				{
+					$sql = 'SELECT word
+						FROM ' . WORDS_TABLE . "
+						WHERE word_id = $word_id";
+					$result = $db->sql_query($sql);
+					$deleted_word = $db->sql_fetchfield('word');
+					$db->sql_freeresult($result);
+
+					$sql = 'DELETE FROM ' . WORDS_TABLE . "
+						WHERE word_id = $word_id";
+					$db->sql_query($sql);
+
+					$cache->destroy('_word_censors');
+					$phpbb_container->get('text_formatter.cache')->invalidate();
+
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_WORD_DELETE', false, array($deleted_word));
+
+					trigger_error($user->lang['WORD_REMOVED'] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'id'		=> $word_id,
+						'action'	=> 'delete',
+					)));
+				}
+
+			break;
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'			=> $this->u_action,
+			'S_HIDDEN_FIELDS'	=> $s_hidden_fields)
+		);
+
+		$sql = 'SELECT *
+			FROM ' . WORDS_TABLE . '
+			ORDER BY word';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$template->assign_block_vars('words', array(
+				'WORD'			=> $row['word'],
+				'REPLACEMENT'	=> $row['replacement'],
+				'U_EDIT'		=> $this->u_action . '&amp;action=edit&amp;id=' . $row['word_id'],
+				'U_DELETE'		=> $this->u_action . '&amp;action=delete&amp;id=' . $row['word_id'])
+			);
+		}
+		$db->sql_freeresult($result);
+	}
+}

includes/acp/info/acp_attachments.php

@@ -0,0 +1,38 @@
+<?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.
+*
+*/
+
+class acp_attachments_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_attachments',
+			'title'		=> 'ACP_ATTACHMENTS',
+			'modes'		=> array(
+				'attach'		=> array('title' => 'ACP_ATTACHMENT_SETTINGS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_ATTACHMENTS')),
+				'extensions'	=> array('title' => 'ACP_MANAGE_EXTENSIONS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')),
+				'ext_groups'	=> array('title' => 'ACP_EXTENSION_GROUPS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')),
+				'orphan'		=> array('title' => 'ACP_ORPHAN_ATTACHMENTS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')),
+				'manage'		=> array('title' => 'ACP_MANAGE_ATTACHMENTS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_ban.php

@@ -0,0 +1,36 @@
+<?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.
+*
+*/
+
+class acp_ban_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_ban',
+			'title'		=> 'ACP_BAN',
+			'modes'		=> array(
+				'email'		=> array('title' => 'ACP_BAN_EMAILS', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')),
+				'ip'		=> array('title' => 'ACP_BAN_IPS', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')),
+				'user'		=> array('title' => 'ACP_BAN_USERNAMES', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_bbcodes.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_bbcodes_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_bbcodes',
+			'title'		=> 'ACP_BBCODES',
+			'modes'		=> array(
+				'bbcodes'		=> array('title' => 'ACP_BBCODES', 'auth' => 'acl_a_bbcode', 'cat' => array('ACP_MESSAGES')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_board.php

@@ -0,0 +1,49 @@
+<?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.
+*
+*/
+
+class acp_board_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_board',
+			'title'		=> 'ACP_BOARD_MANAGEMENT',
+			'modes'		=> array(
+				'settings'		=> array('title' => 'ACP_BOARD_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+				'features'		=> array('title' => 'ACP_BOARD_FEATURES', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+				'avatar'		=> array('title' => 'ACP_AVATAR_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+				'message'		=> array('title' => 'ACP_MESSAGE_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_MESSAGES')),
+				'post'			=> array('title' => 'ACP_POST_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_MESSAGES')),
+				'signature'		=> array('title' => 'ACP_SIGNATURE_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+				'feed'			=> array('title' => 'ACP_FEED_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+				'registration'	=> array('title' => 'ACP_REGISTER_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+
+				'auth'		=> array('title' => 'ACP_AUTH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
+				'email'		=> array('title' => 'ACP_EMAIL_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
+
+				'cookie'	=> array('title' => 'ACP_COOKIE_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+				'server'	=> array('title' => 'ACP_SERVER_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+				'security'	=> array('title' => 'ACP_SECURITY_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+				'load'		=> array('title' => 'ACP_LOAD_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_bots.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_bots_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_bots',
+			'title'		=> 'ACP_BOTS',
+			'modes'		=> array(
+				'bots'		=> array('title' => 'ACP_BOTS', 'auth' => 'acl_a_bots', 'cat' => array('ACP_GENERAL_TASKS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_captcha.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_captcha_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_captcha',
+			'title'		=> 'ACP_CAPTCHA',
+			'modes'		=> array(
+				'visual'		=> array('title' => 'ACP_VC_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+				'img'			=> array('title' => 'ACP_VC_CAPTCHA_DISPLAY', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION'), 'display' => false)
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_contact.php

@@ -0,0 +1,30 @@
+<?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.
+*
+*/
+
+/**
+* @package module_install
+*/
+class acp_contact_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> 'acp_contact',
+			'title'		=> 'ACP_CONTACT',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'contact'	=> array('title' => 'ACP_CONTACT_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
+			),
+		);
+	}
+}

includes/acp/info/acp_database.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_database_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_database',
+			'title'		=> 'ACP_DATABASE',
+			'modes'		=> array(
+				'backup'	=> array('title' => 'ACP_BACKUP', 'auth' => 'acl_a_backup', 'cat' => array('ACP_CAT_DATABASE')),
+				'restore'	=> array('title' => 'ACP_RESTORE', 'auth' => 'acl_a_backup', 'cat' => array('ACP_CAT_DATABASE')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_disallow.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_disallow_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_disallow',
+			'title'		=> 'ACP_DISALLOW',
+			'modes'		=> array(
+				'usernames'		=> array('title' => 'ACP_DISALLOW_USERNAMES', 'auth' => 'acl_a_names', 'cat' => array('ACP_USER_SECURITY')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_email.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_email_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_email',
+			'title'		=> 'ACP_MASS_EMAIL',
+			'modes'		=> array(
+				'email'		=> array('title' => 'ACP_MASS_EMAIL', 'auth' => 'acl_a_email && cfg_email_enable', 'cat' => array('ACP_GENERAL_TASKS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_extensions.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_extensions_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_extensions',
+			'title'		=> 'ACP_EXTENSION_MANAGEMENT',
+			'modes'		=> array(
+				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_forums.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_forums_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_forums',
+			'title'		=> 'ACP_FORUM_MANAGEMENT',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_MANAGE_FORUMS', 'auth' => 'acl_a_forum', 'cat' => array('ACP_MANAGE_FORUMS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_groups.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_groups_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_groups',
+			'title'		=> 'ACP_GROUPS_MANAGEMENT',
+			'modes'		=> array(
+				'manage'		=> array('title' => 'ACP_GROUPS_MANAGE', 'auth' => 'acl_a_group', 'cat' => array('ACP_GROUPS')),
+				'position'		=> array('title' => 'ACP_GROUPS_POSITION', 'auth' => 'acl_a_group', 'cat' => array('ACP_GROUPS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_help_phpbb.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_help_phpbb_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_help_phpbb',
+			'title'		=> 'ACP_HELP_PHPBB',
+			'modes'		=> array(
+				'help_phpbb'	=> array('title' => 'ACP_HELP_PHPBB', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_icons.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_icons_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_icons',
+			'title'		=> 'ACP_ICONS_SMILIES',
+			'modes'		=> array(
+				'icons'		=> array('title' => 'ACP_ICONS', 'auth' => 'acl_a_icons', 'cat' => array('ACP_MESSAGES')),
+				'smilies'	=> array('title' => 'ACP_SMILIES', 'auth' => 'acl_a_icons', 'cat' => array('ACP_MESSAGES')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_inactive.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_inactive_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_inactive',
+			'title'		=> 'ACP_INACTIVE_USERS',
+			'modes'		=> array(
+				'list'		=> array('title' => 'ACP_INACTIVE_USERS', 'auth' => 'acl_a_user', 'cat' => array('ACP_CAT_USERS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_jabber.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_jabber_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_jabber',
+			'title'		=> 'ACP_JABBER_SETTINGS',
+			'modes'		=> array(
+				'settings'		=> array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_jabber', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_language.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_language_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_language',
+			'title'		=> 'ACP_LANGUAGE',
+			'modes'		=> array(
+				'lang_packs'		=> array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_LANGUAGE')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_logs.php

@@ -0,0 +1,52 @@
+<?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.
+*
+*/
+
+class acp_logs_info
+{
+	function module()
+	{
+		global $phpbb_dispatcher;
+
+		$modes = array(
+			'admin'		=> array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
+			'mod'		=> array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
+			'users'		=> array('title' => 'ACP_USERS_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
+			'critical'	=> array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
+		);
+
+		/**
+		* Event to add or modify ACP log modulemodes
+		*
+		* @event core.acp_logs_info_modify_modes
+		* @var	array	modes	Array with modes info
+		* @since 3.1.11-RC1
+		* @since 3.2.1-RC1
+		*/
+		$vars = array('modes');
+		extract($phpbb_dispatcher->trigger_event('core.acp_logs_info_modify_modes', compact($vars)));
+
+		return array(
+			'filename'	=> 'acp_logs',
+			'title'		=> 'ACP_LOGGING',
+			'modes'		=> $modes,
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_main.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_main_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_main',
+			'title'		=> 'ACP_INDEX',
+			'modes'		=> array(
+				'main'		=> array('title' => 'ACP_INDEX', 'auth' => '', 'cat' => array('ACP_CAT_GENERAL')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_modules.php

@@ -0,0 +1,36 @@
+<?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.
+*
+*/
+
+class acp_modules_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_modules',
+			'title'		=> 'ACP_MODULE_MANAGEMENT',
+			'modes'		=> array(
+				'acp'		=> array('title' => 'ACP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')),
+				'ucp'		=> array('title' => 'UCP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')),
+				'mcp'		=> array('title' => 'MCP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_permission_roles.php

@@ -0,0 +1,37 @@
+<?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.
+*
+*/
+
+class acp_permission_roles_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_permission_roles',
+			'title'		=> 'ACP_PERMISSION_ROLES',
+			'modes'		=> array(
+				'admin_roles'		=> array('title' => 'ACP_ADMIN_ROLES', 'auth' => 'acl_a_roles && acl_a_aauth', 'cat' => array('ACP_PERMISSION_ROLES')),
+				'user_roles'		=> array('title' => 'ACP_USER_ROLES', 'auth' => 'acl_a_roles && acl_a_uauth', 'cat' => array('ACP_PERMISSION_ROLES')),
+				'mod_roles'			=> array('title' => 'ACP_MOD_ROLES', 'auth' => 'acl_a_roles && acl_a_mauth', 'cat' => array('ACP_PERMISSION_ROLES')),
+				'forum_roles'		=> array('title' => 'ACP_FORUM_ROLES', 'auth' => 'acl_a_roles && acl_a_fauth', 'cat' => array('ACP_PERMISSION_ROLES')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_permissions.php

@@ -0,0 +1,51 @@
+<?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.
+*
+*/
+
+class acp_permissions_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_permissions',
+			'title'		=> 'ACP_PERMISSIONS',
+			'modes'		=> array(
+				'intro'					=> array('title' => 'ACP_PERMISSIONS', 'auth' => 'acl_a_authusers || acl_a_authgroups || acl_a_viewauth', 'cat' => array('ACP_CAT_PERMISSIONS')),
+				'trace'					=> array('title' => 'ACP_PERMISSION_TRACE', 'auth' => 'acl_a_viewauth', 'display' => false, 'cat' => array('ACP_PERMISSION_MASKS')),
+
+				'setting_forum_local'	=> array('title' => 'ACP_FORUM_PERMISSIONS', 'auth' => 'acl_a_fauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
+				'setting_forum_copy'	=> array('title' => 'ACP_FORUM_PERMISSIONS_COPY', 'auth' => 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
+				'setting_mod_local'		=> array('title' => 'ACP_FORUM_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
+				'setting_user_global'	=> array('title' => 'ACP_USERS_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_CAT_USERS')),
+				'setting_user_local'	=> array('title' => 'ACP_USERS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_CAT_USERS')),
+				'setting_group_global'	=> array('title' => 'ACP_GROUPS_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_GROUPS')),
+				'setting_group_local'	=> array('title' => 'ACP_GROUPS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_GROUPS')),
+				'setting_admin_global'	=> array('title' => 'ACP_ADMINISTRATORS', 'auth' => 'acl_a_aauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')),
+				'setting_mod_global'	=> array('title' => 'ACP_GLOBAL_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')),
+
+				'view_admin_global'		=> array('title' => 'ACP_VIEW_ADMIN_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
+				'view_user_global'		=> array('title' => 'ACP_VIEW_USER_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
+				'view_mod_global'		=> array('title' => 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
+				'view_mod_local'		=> array('title' => 'ACP_VIEW_FORUM_MOD_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
+				'view_forum_local'		=> array('title' => 'ACP_VIEW_FORUM_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_php_info.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_php_info_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_php_info',
+			'title'		=> 'ACP_PHP_INFO',
+			'modes'		=> array(
+				'info'		=> array('title' => 'ACP_PHP_INFO', 'auth' => 'acl_a_phpinfo', 'cat' => array('ACP_GENERAL_TASKS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_profile.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_profile_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_profile',
+			'title'		=> 'ACP_CUSTOM_PROFILE_FIELDS',
+			'modes'		=> array(
+				'profile'	=> array('title' => 'ACP_CUSTOM_PROFILE_FIELDS', 'auth' => 'acl_a_profile', 'cat' => array('ACP_CAT_USERS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_prune.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_prune_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_prune',
+			'title'		=> 'ACP_PRUNING',
+			'modes'		=> array(
+				'forums'	=> array('title' => 'ACP_PRUNE_FORUMS', 'auth' => 'acl_a_prune', 'cat' => array('ACP_MANAGE_FORUMS')),
+				'users'		=> array('title' => 'ACP_PRUNE_USERS', 'auth' => 'acl_a_userdel', 'cat' => array('ACP_CAT_USERS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_ranks.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_ranks_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_ranks',
+			'title'		=> 'ACP_RANKS',
+			'modes'		=> array(
+				'ranks'		=> array('title' => 'ACP_MANAGE_RANKS', 'auth' => 'acl_a_ranks', 'cat' => array('ACP_CAT_USERS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_reasons.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_reasons_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_reasons',
+			'title'		=> 'ACP_REASONS',
+			'modes'		=> array(
+				'main'		=> array('title' => 'ACP_MANAGE_REASONS', 'auth' => 'acl_a_reasons', 'cat' => array('ACP_GENERAL_TASKS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_search.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_search_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_search',
+			'title'		=> 'ACP_SEARCH',
+			'modes'		=> array(
+				'settings'	=> array('title' => 'ACP_SEARCH_SETTINGS', 'auth' => 'acl_a_search', 'cat' => array('ACP_SERVER_CONFIGURATION')),
+				'index'		=> array('title' => 'ACP_SEARCH_INDEX', 'auth' => 'acl_a_search', 'cat' => array('ACP_CAT_DATABASE')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_styles.php

@@ -0,0 +1,35 @@
+<?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.
+*
+*/
+
+class acp_styles_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_styles',
+			'title'		=> 'ACP_CAT_STYLES',
+			'modes'		=> array(
+				'style'		=> array('title' => 'ACP_STYLES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_MANAGEMENT')),
+				'install'	=> array('title' => 'ACP_STYLES_INSTALL', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_MANAGEMENT')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_update.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_update_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_update',
+			'title'		=> 'ACP_UPDATE',
+			'modes'		=> array(
+				'version_check'		=> array('title' => 'ACP_VERSION_CHECK', 'auth' => 'acl_a_board', 'cat' => array('ACP_AUTOMATION')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_users.php

@@ -0,0 +1,44 @@
+<?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.
+*
+*/
+
+class acp_users_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_users',
+			'title'		=> 'ACP_USER_MANAGEMENT',
+			'modes'		=> array(
+				'overview'		=> array('title' => 'ACP_MANAGE_USERS', 'auth' => 'acl_a_user', 'cat' => array('ACP_CAT_USERS')),
+				'feedback'		=> array('title' => 'ACP_USER_FEEDBACK', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'warnings'		=> array('title' => 'ACP_USER_WARNINGS', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'profile'		=> array('title' => 'ACP_USER_PROFILE', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'prefs'			=> array('title' => 'ACP_USER_PREFS', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'avatar'		=> array('title' => 'ACP_USER_AVATAR', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'rank'			=> array('title' => 'ACP_USER_RANK', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'sig'			=> array('title' => 'ACP_USER_SIG', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'groups'		=> array('title' => 'ACP_USER_GROUPS', 'auth' => 'acl_a_user && acl_a_group', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'perm'			=> array('title' => 'ACP_USER_PERM', 'auth' => 'acl_a_user && acl_a_viewauth', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+				'attach'		=> array('title' => 'ACP_USER_ATTACH', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}

includes/acp/info/acp_words.php

@@ -0,0 +1,34 @@
+<?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.
+*
+*/
+
+class acp_words_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_words',
+			'title'		=> 'ACP_WORDS',
+			'modes'		=> array(
+				'words'		=> array('title' => 'ACP_WORDS', 'auth' => 'acl_a_words', 'cat' => array('ACP_MESSAGES')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}