5 files changed, 174 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 25161d05f0..e14053fe34 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1406,7 +1406,7 @@ class acp_attachments_info
 	{
 		return array(
 			'filename'	=> 'acp_attachments',
-			'title'		=> 'Attachments',
+			'title'		=> 'ACP_ATTACHMENTS',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'attach'		=> array('title' => 'ACP_ATTACHMENT_SETTINGS', 'auth' => 'acl_a_attach'),
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 9e8fb8feae..9ddd925557 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -25,6 +25,7 @@ class acp_bbcodes
 		$bbcode_id = request_var('bbcode', 0);
 
 		$this->tpl_name = 'acp_bbcodes';
+		$this->page_title = 'ACP_BBCODES';
 
 		$u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
 
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index bfbcec9001..89490349a9 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -170,7 +170,7 @@ class acp_jabber_info
 	{
 		return array(
 			'filename'	=> 'acp_jabber',
-			'title'		=> 'Jabber',
+			'title'		=> 'ACP_JABBER_SETTINGS',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'settings'		=> array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_server'),
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
new file mode 100644
index 0000000000..197ada5cfc
--- /dev/null
+++ b/phpBB/includes/acp/acp_logs.php
@@ -0,0 +1,169 @@
+<?php
+/** 
+*
+* @package acp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package acp
+*/
+class acp_logs
+{
+	function main($id, $mode)
+	{
+		global $db, $user, $auth, $template, $cache;
+		global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang('mcp');
+
+		// Set up general vars
+		$action		= request_var('action', '');
+		$forum_id	= request_var('f', 0);
+		$start		= request_var('start', 0);
+		$deletemark = (isset($_POST['delmarked'])) ? true : false;
+		$deleteall	= (isset($_POST['delall'])) ? true : false;
+		$marked		= request_var('mark', array(0));
+
+		// Sort keys
+		$sort_days	= request_var('st', 0);
+		$sort_key	= request_var('sk', 't');
+		$sort_dir	= request_var('sd', 'd');
+
+		$this->tpl_name = 'acp_logs';
+		$this->log_type = constant('LOG_' . strtoupper($mode));
+
+		$u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
+
+		// Delete entries if requested and able
+		if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs'))
+		{
+			$where_sql = '';
+			if ($deletemark && $marked)
+			{
+				$sql_in = array();
+				foreach ($marked as $mark)
+				{
+					$sql_in[] =  $mark;
+				}
+				$where_sql = ' AND log_id IN (' . implode(', ', $sql_in) . ')';
+				unset($sql_in);
+			}
+
+			if ($where_sql)
+			{
+				$sql = 'DELETE FROM ' . LOG_TABLE . "
+					WHERE log_type = {$this->log_type}
+					$where_sql";
+				$db->sql_query($sql);
+
+				add_log('admin', 'LOG_' . strtoupper($mode) . '_CLEAR');
+			}
+		}
+
+		// 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'], 364 => $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' => 'l.user_id', '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');
+
+		$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;
+		view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort);
+
+		$template->assign_vars(array(
+			'L_TITLE'		=> $l_title,
+			'L_EXPLAIN'		=> $l_title_explain,
+			'U_ACTION'		=> $u_action,
+
+			'S_ON_PAGE'		=> on_page($log_count, $config['topics_per_page'], $start),
+			'PAGINATION'	=> generate_pagination($u_action . "&amp;$u_sort_param", $log_count, $config['topics_per_page'], $start, true),
+
+			'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'),
+			
+			)
+		);
+
+		foreach ($log_data as $row)
+		{
+			$data = array();
+				
+			foreach (array('viewtopic', 'viewlogs', 'viewforum') 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'],
+				'IP'			=> $row['ip'],
+				'DATE'			=> $user->format_date($row['time']),
+				'ACTION'		=> $row['action'],
+				'DATA'			=> (sizeof($data)) ? implode(' | ', $data) : '',
+				'ID'			=> $row['id'],
+				)
+			);
+		}
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_logs_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_logs',
+			'title'		=> 'ACP_LOGGING',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'admin'		=> array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_'),
+				'mod'		=> array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_'),
+				'critical'	=> array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 86a7c8467f..2b1c522f50 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -716,8 +716,8 @@ class acp_modules
 		$rows = array();
 
 		$sql = 'SELECT m2.*
-			FROM (' . MODULES_TABLE . ' m1
-			LEFT JOIN ' . MODULES_TABLE . " m2 ON $condition)
+			FROM ' . MODULES_TABLE . ' m1
+			LEFT JOIN ' . MODULES_TABLE . " m2 ON ($condition)
 			WHERE m1.module_class = '" . $db->sql_escape($this->module_class) . "'
 				AND m2.module_class = '" . $db->sql_escape($this->module_class) . "'
 				AND m1.module_id = $module_id