6 files changed, 23 insertions, 21 deletions
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 241f266541..33a4ce13c2 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -127,12 +127,14 @@ class acp_logs
 			}
 
 			$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'],
+				'USERNAME'			=> $row['username'],
+				'REPORTEE_USERNAME'	=> ($row['reportee_username'] && $row['user_id'] != $row['reportee_id']) ? $row['reportee_username'] : '',
+
+				'IP'				=> $row['ip'],
+				'DATE'				=> $user->format_date($row['time']),
+				'ACTION'			=> $row['action'],
+				'DATA'				=> (sizeof($data)) ? implode(' | ', $data) : '',
+				'ID'				=> $row['id'],
 				)
 			);
 		}
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 7e742c8e46..8a163996d1 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -564,12 +564,13 @@ class acp_modules
 	/**
 	* Get available module informations from module files
 	*/
-	function get_module_infos($module = '')
+	function get_module_infos($module = '', $module_class = false)
 	{
 		global $phpbb_root_path, $phpEx;
 		
-		$directory = $phpbb_root_path . 'includes/' . $this->module_class . '/info/';
-		
+		$module_class = ($module_class === false) ? $this->module_class : $module_class;
+
+		$directory = $phpbb_root_path . 'includes/' . $module_class . '/info/';
 		$fileinfo = array();
 
 		if (!$module)
@@ -578,7 +579,7 @@ class acp_modules
 			while (($file = readdir($dh)) !== false)
 			{
 				// Is module?
-				if (preg_match('/^' . $this->module_class . '_.+\.' . $phpEx . '$/', $file))
+				if (preg_match('/^' . $module_class . '_.+\.' . $phpEx . '$/', $file))
 				{
 					$class = str_replace(".$phpEx", '', $file) . '_info';
 
@@ -592,7 +593,7 @@ class acp_modules
 					{
 						$c_class = new $class();
 						$module_info = $c_class->module();
-						$fileinfo[str_replace($this->module_class . '_', '', $module_info['filename'])] = $module_info;
+						$fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info;
 					}
 				}
 			}
@@ -602,8 +603,8 @@ class acp_modules
 		}
 		else
 		{
-			$filename = $this->module_class . '_' . basename($module);
-			$class = $this->module_class . '_' . basename($module) . '_info';
+			$filename = $module_class . '_' . basename($module);
+			$class = $module_class . '_' . basename($module) . '_info';
 
 			if (!class_exists($class))
 			{
@@ -615,7 +616,7 @@ class acp_modules
 			{
 				$c_class = new $class();
 				$module_info = $c_class->module();
-				$fileinfo[str_replace($this->module_class . '_', '', $module_info['filename'])] = $module_info;
+				$fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info;
 			}
 		}
 		
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 44c73e8cf1..9ca25c8cf7 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -679,7 +679,8 @@ class acp_permissions
 			trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action));
 		}
 		
-		$auth_settings = $_POST['setting'];
+		$auth_settings = (isset($_POST['setting'])) ? $_POST['setting'] : array();
+		$auth_roles = (isset($_POST['role'])) ? $_POST['role'] : array();
 		$ug_ids = $forum_ids = array();
 
 		// We need to go through the auth settings
@@ -694,7 +695,7 @@ class acp_permissions
 				$forum_ids[] = $forum_id;
 
 				// Check role...
-				$assigned_role = (isset($_POST['role'][$ug_id][$forum_id])) ? (int) $_POST['role'][$ug_id][$forum_id] : 0;
+				$assigned_role = (isset($auth_roles[$ug_id][$forum_id])) ? (int) $auth_roles[$ug_id][$forum_id] : 0;
 
 				// If the auth settings differ from the assigned role, then do not set a role...
 				if ($assigned_role)
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 62a9a38d98..75ac50cdcb 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -652,7 +652,6 @@ class acp_users
 						{
 							$sql_ary['username'] = $update_username;
 
-							add_log('admin', 'LOG_USER_UPDATE_NAME', $user_row['username'], $update_username);
 							add_log('user', $user_id, 'LOG_USER_UPDATE_NAME', $user_row['username'], $update_username);
 						}
 
@@ -663,7 +662,6 @@ class acp_users
 								'user_email_hash'	=> crc32(strtolower($update_email)) . strlen($update_email)
 							);
 
-							add_log('admin', 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
 							add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
 						}
 
@@ -675,7 +673,6 @@ class acp_users
 							);
 
 							$user->reset_login_keys($user_id);
-							add_log('admin', 'LOG_USER_NEW_PASSWORD', $user_row['username']);
 							add_log('user', $user_id, 'LOG_USER_NEW_PASSWORD', $user_row['username']);
 						}
 
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 0aeffeb47e..9bb80f4ac0 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -701,7 +701,7 @@ class auth_admin extends auth
 	/**
 	* Set a user or group ACL record
 	*/
-	function acl_set($ug_type, &$forum_id, &$ug_id, &$auth, $role_id = 0, $clear_prefetch = true)
+	function acl_set($ug_type, $forum_id, $ug_id, $auth, $role_id = 0, $clear_prefetch = true)
 	{
 		global $db;
 
@@ -851,7 +851,7 @@ class auth_admin extends auth
 	/**
 	* Set a role-specific ACL record
 	*/
-	function acl_set_role($role_id, &$auth)
+	function acl_set_role($role_id, $auth)
 	{
 		global $db;
 
diff --git a/phpBB/includes/acp/info/acp_logs.php b/phpBB/includes/acp/info/acp_logs.php
index 066da62ab2..0da4c82633 100644
--- a/phpBB/includes/acp/info/acp_logs.php
+++ b/phpBB/includes/acp/info/acp_logs.php
@@ -22,6 +22,7 @@ class acp_logs_info
 			'modes'		=> array(
 				'admin'		=> array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_viewlogs'),
 				'mod'		=> array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_viewlogs'),
+				'users'		=> array('title' => 'ACP_USERS_LOGS', 'auth' => 'acl_a_viewlogs'),
 				'critical'	=> array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_viewlogs'),
 			),
 		);