7 files changed, 171 insertions, 18 deletions
diff --git a/phpBB/includes/acp/acp_contact.php b/phpBB/includes/acp/acp_contact.php
new file mode 100644
index 0000000000..13d38d9f29
--- /dev/null
+++ b/phpBB/includes/acp/acp_contact.php
@@ -0,0 +1,129 @@
+<?php
+/**
+*
+* @package acp
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*/
+
+/**
+* @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);
+		}
+
+		$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);
+
+		$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="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</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();
+	}
+}
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 63bfa3ac53..fe55b36e67 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -201,7 +201,7 @@ class acp_email
 					$messenger->set_mail_priority($priority);
 
 					$messenger->assign_vars(array(
-						'CONTACT_EMAIL' => $config['board_contact'],
+						'CONTACT_EMAIL' => phpbb_get_board_contact($config, $phpEx),
 						'MESSAGE'		=> htmlspecialchars_decode($message))
 					);
 
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 88b6a9c270..3d3cfb7f16 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -70,7 +70,7 @@ class acp_extensions
 		// If they've specified an extension, let's load the metadata manager and validate it.
 		if ($ext_name)
 		{
-			$md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path);
+			$md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $user, $phpbb_root_path);
 
 			try
 			{
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 4322cd006d..80dee1d620 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -54,28 +54,26 @@ class acp_logs
 		{
 			if (confirm_box(true))
 			{
-				$where_sql = '';
+				$conditions = array();
 
 				if ($deletemark && sizeof($marked))
 				{
-					$sql_in = array();
-					foreach ($marked as $mark)
-					{
-						$sql_in[] = $mark;
-					}
-					$where_sql = ' AND ' . $db->sql_in_set('log_id', $sql_in);
-					unset($sql_in);
+					$conditions['log_id'] = array('IN' => $marked);
 				}
 
-				if ($where_sql || $deleteall)
+				if ($deleteall)
 				{
-					$sql = 'DELETE FROM ' . LOG_TABLE . "
-						WHERE log_type = {$this->log_type}
-						$where_sql";
-					$db->sql_query($sql);
+					if ($sort_days)
+					{
+						$conditions['log_time'] = array('>=', time() - ($sort_days * 86400));
+					}
 
-					add_log('admin', 'LOG_CLEAR_' . strtoupper($mode));
+					$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
+					$conditions['keywords'] = $keywords;
 				}
+
+				$phpbb_log = $phpbb_container->get('log');
+				$phpbb_log->delete($mode, $conditions);
 			}
 			else
 			{
diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php
index 0e06c94869..810a111edb 100644
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -47,7 +47,7 @@ class acp_php_info
 		// for this was nabbed from the PHP annotated manual
 		preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
 
-		if (empty($phpinfo) || empty($output))
+		if (empty($phpinfo) || empty($output[1][0]))
 		{
 			trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
 		}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index b653ddd13b..83ab88d48c 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -814,7 +814,7 @@ class acp_users
 						$check_ary += array(
 							'email'				=> array(
 								array('string', false, 6, 60),
-								array('email', $user_row['user_email'])
+								array('user_email', $user_row['user_email']),
 							),
 						);
 					}
diff --git a/phpBB/includes/acp/info/acp_contact.php b/phpBB/includes/acp/info/acp_contact.php
new file mode 100644
index 0000000000..b8326f34ea
--- /dev/null
+++ b/phpBB/includes/acp/info/acp_contact.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package acp
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @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')),
+			),
+		);
+	}
+}