HOLLA! Whats this shit...

These gets commited now because i want to be sure no one is changing an admin file corresponding the ones listed within includes/acp git-svn-id: file:///svn/phpbb/trunk@5303 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-30 21:40:43 +02:00 · 2005-11-17 18:06:11 +00:00
parent e21245f2ee
commit 5c6f71cdb9
12 changed files with 4866 additions and 0 deletions
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -0,0 +1,554 @@
+<?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_board
+{
+	function main($id, $mode)
+	{
+		global $db, $user, $auth, $template;
+		global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang('acp/board');
+
+		$action	= request_var('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		switch ($mode)
+		{
+			case 'cookie':
+				$display_vars = array(
+					'title'	=> 'ACP_COOKIE_SETTINGS',
+					'vars'	=> array(
+						'legend1'		=> 'ACP_COOKIE_SETTINGS',
+						'cookie_domain'	=> array('lang' => 'COOKIE_DOMAIN',	'type' => 'text::255', 'explain' => false),
+						'cookie_name'	=> array('lang' => 'COOKIE_NAME',	'type' => 'text::16', 'explain' => false),
+						'cookie_path'	=> array('lang'	=> 'COOKIE_PATH',	'type' => 'text::255', 'explain' => false),
+						'cookie_secure'	=> array('lang' => 'COOKIE_SECURE',	'type' => 'radio:disabled_enabled', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'avatar':
+				$display_vars = array(
+					'title'	=> 'ACP_AVATAR_SETTINGS',
+					'vars'	=> array(
+						'legend1'				=> 'ACP_AVATAR_SETTINGS',
+						'avatar_min_height'		=> false, 'avatar_min_width' => false, 'avatar_max_height' => false, 'avatar_max_width' => false,
+
+						'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',	'type' => 'radio:yes_no', 'explain' => false),
+						'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',	'type' => 'radio:yes_no', 'explain' => true),
+						'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',	'type' => 'radio:yes_no', 'explain' => false),
+						'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+						'avatar_min'			=> array('lang' => 'MIN_AVATAR_SIZE',	'type' => 'dimension:3:4', 'explain' => true),
+						'avatar_max'			=> array('lang' => 'MAX_AVATAR_SIZE',	'type' => 'dimension:3:4', 'explain' => true),
+						'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'type' => 'text:20:255', 'explain' => true),
+						'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'type' => 'text:20:255', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'settings':
+				$display_vars = array(
+					'title'	=> 'ACP_BOARD_SETTINGS',
+					'vars'	=> array(
+						'legend1'			=> 'GENERAL_SETTINGS',
+						'sitename'			=> array('lang' => 'SITE_NAME',			'type' => 'text:40:255', 'explain' => false),
+						'site_desc'			=> array('lang' => 'SITE_DESC',			'type' => 'text:40:255', 'explain' => false),
+						'board_disable'		=> array('lang' => 'DISABLE_BOARD',		'type' => 'custom', 'method' => 'board_disable', 'explain' => true),
+						'board_disable_msg'	=> false, 'max_name_chars' => false, 'max_pass_chars' => false, 'bump_type' => false,
+
+						'legend2'			=> 'COPPA',
+						'coppa_enable'		=> array('lang' => 'ENABLE_COPPA',		'type' => 'radio:yes_no', 'explain' => true),
+						'coppa_mail'		=> array('lang' => 'COPPA_MAIL',		'type' => 'textarea:5:40', 'explain' => true),
+						'coppa_fax'			=> array('lang' => 'COPPA_FAX',			'type' => 'text:25:100', 'explain' => false),
+
+						'legend3'			=> 'REGISTRATION',
+						'require_activation'=> array('lang' => 'ACC_ACTIVATION',	'type' => 'custom', 'method' => 'select_acc_activation', 'explain' => true),
+						'enable_confirm'	=> array('lang' => 'VISUAL_CONFIRM',	'type' => 'radio:yes_no', 'explain' => true),
+						'max_reg_attempts'	=> array('lang' => 'REG_LIMIT',			'type' => 'text:4:4', 'explain' => true),
+						'min_name_chars'	=> array('lang' => 'USERNAME_LENGTH',	'type' => 'custom', 'method' => 'username_length', 'explain' => true),
+						'min_pass_chars'	=> array('lang' => 'PASSWORD_LENGTH',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
+						'allow_name_chars'	=> array('lang' => 'USERNAME_CHARS',	'type' => 'select', 'method' => 'select_username_chars', 'explain' => true),
+						'pass_complex'		=> array('lang' => 'PASSWORD_TYPE',		'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
+						'chg_passforce'		=> array('lang' => 'FORCE_PASS_CHANGE',	'type' => 'text:3:3', 'explain' => true),
+						'allow_emailreuse'	=> array('lang' => 'ALLOW_EMAIL_REUSE',	'type' => 'radio:yes_no', 'explain' => true),
+
+						'legend4'			=> 'POSTING',
+						'edit_time'			=> array('lang' => 'EDIT_TIME',			'type' => 'text:3:3', 'explain' => true),
+						'display_last_edited' => array('lang' => 'DISPLAY_LAST_EDITED', 'type' => 'radio:yes_no', 'explain' => true),
+						'flood_interval'	=> array('lang' => 'FLOOD_INTERVAL',	'type' => 'text:3:4', 'explain' => true),
+						'bump_interval'		=> array('lang' => 'BUMP_INTERVAL',		'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
+						'topics_per_page'	=> array('lang' => 'TOPICS_PER_PAGE',	'type' => 'text:3:4', 'explain' => false),
+						'posts_per_page'	=> array('lang' => 'POSTS_PER_PAGE',	'type' => 'text:3:4', 'explain' => false),
+						'hot_threshold'		=> array('lang' => 'HOT_THRESHOLD',		'type' => 'text:3:4', 'explain' => false),
+						'max_poll_options'	=> array('lang' => 'MAX_POLL_OPTIONS',	'type' => 'text:4:4', 'explain' => false),
+						'max_post_chars'	=> array('lang' => 'CHAR_LIMIT',		'type' => 'text:4:6', 'explain' => true),
+						'max_post_smilies'	=> array('lang' => 'SMILIES_LIMIT',		'type' => 'text:4:4', 'explain' => true),
+						'max_quote_depth'	=> array('lang' => 'QUOTE_DEPTH_LIMIT',	'type' => 'text:4:4', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'default':
+				$display_vars = array(
+					'title'	=> 'ACP_BOARD_DEFAULTS',
+					'vars'	=> array(
+						'legend1'				=> 'GENERAL_SETTINGS',
+						'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', true), 'explain' => false),
+						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'type' => 'radio:yes_no', 'explain' => true),
+						'default_lang'			=> array('lang' => 'DEFAULT_LANGUAGE',		'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
+						'default_dateformat'	=> array('lang' => 'DEFAULT_DATE_FORMAT',	'type' => 'text::255', 'explain' => true),
+						'board_timezone'		=> array('lang' => 'SYSTEM_TIMEZONE',		'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
+						'board_dst'				=> array('lang' => 'SYSTEM_DST',			'type' => 'radio:yes_no', 'explain' => false),
+						'allow_html_tags'		=> array('lang' => 'ALLOWED_TAGS',			'type' => 'text:30:255', 'explain' => true),
+						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'type' => 'text:5:4', 'explain' => true),
+
+						'legend2'				=> 'GENERAL_OPTIONS',
+						'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'type' => 'radio:yes_no', 'explain' => true),
+						'allow_topic_notify'	=> array('lang' => 'ALLOW_TOPIC_NOTIFY',	'type' => 'radio:yes_no', 'explain' => false),
+						'allow_forum_notify'	=> array('lang' => 'ALLOW_FORUM_NOTIFY',	'type' => 'radio:yes_no', 'explain' => false),
+						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'type' => 'radio:yes_no', 'explain' => false),
+						'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'type' => 'radio:yes_no', 'explain' => false),
+						'allow_html'			=> array('lang' => 'ALLOW_HTML',			'type' => 'radio:yes_no', 'explain' => false),
+						'allow_bbcode'			=> array('lang' => 'ALLOW_BBCODE',			'type' => 'radio:yes_no', 'explain' => false),
+						'allow_smilies'			=> array('lang' => 'ALLOW_SMILIES',			'type' => 'radio:yes_no', 'explain' => false),
+						'allow_sig'				=> array('lang' => 'ALLOW_SIG',				'type' => 'radio:yes_no', 'explain' => false),
+						'allow_nocensors'		=> array('lang' => 'ALLOW_NO_CENSORS',		'type' => 'radio:yes_no', 'explain' => true),
+						'allow_bookmarks'		=> array('lang' => 'ALLOW_BOOKMARKS',		'type' => 'radio:yes_no', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'load':
+				$display_vars = array(
+					'title'	=> 'ACP_LOAD_SETTINGS',
+					'vars'	=> array(
+						'legend1'			=> 'GENERAL_SETTINGS',
+						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'type' => 'text:4:4', 'explain' => true),
+						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'type' => 'text:5:5', 'explain' => true),
+						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'type' => 'text:4:4', 'explain' => true),
+						'search_interval'	=> array('lang' => 'SEARCH_INTERVAL',	'type' => 'text:3:4', 'explain' => true),
+						'min_search_chars'	=> array('lang' => 'MIN_SEARCH_CHARS',	'type' => 'text:3:3', 'explain' => true),
+						'max_search_chars'	=> array('lang' => 'MAX_SEARCH_CHARS',	'type' => 'text:3:3', 'explain' => true),
+						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'type' => 'text:4:3', 'explain' => true),
+
+						'legend2'			=> 'GENERAL_OPTIONS',
+						'load_db_track'		=> array('lang' => 'YES_POST_MARKING',	'type' => 'radio:yes_no', 'explain' => true),
+						'load_db_lastread'	=> array('lang' => 'YES_READ_MARKING',	'type' => 'radio:yes_no', 'explain' => true),
+						'load_online'		=> array('lang' => 'YES_ONLINE',		'type' => 'radio:yes_no', 'explain' => true),
+						'load_onlinetrack'	=> array('lang' => 'YES_ONLINE_TRACK',	'type' => 'radio:yes_no', 'explain' => true),
+						'load_birthdays'	=> array('lang' => 'YES_BIRTHDAYS',		'type' => 'radio:yes_no', 'explain' => false),
+						'load_moderators'	=> array('lang' => 'YES_MODERATORS',	'type' => 'radio:yes_no', 'explain' => false),
+						'load_jumpbox'		=> array('lang' => 'YES_JUMPBOX',		'type' => 'radio:yes_no', 'explain' => false),
+						'load_search'		=> array('lang' => 'YES_SEARCH',		'type' => 'radio:yes_no', 'explain' => true),
+						'load_search_upd'	=> array('lang' => 'YES_SEARCH_UPDATE',	'type' => 'radio:yes_no', 'explain' => true),
+			//			'load_search_phr'	=> array('lang' => 'YES_SEARCH_PHRASE',	'type' => 'radio:yes_no', 'explain' => true),
+						'load_tplcompile'	=> array('lang' => 'RECOMPILE_TEMPLATES', 'type' => 'radio:yes_no', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'auth':
+				$display_vars = array(
+					'title'	=> 'ACP_AUTH_SETTINGS',
+					'vars'	=> array(
+						'legend1'		=> 'ACP_AUTH_SETTINGS',
+						'auth_method'	=> array('lang' => 'AUTH_METHOD',	'type' => 'select', 'method' => 'select_auth_method', 'explain' => false)
+					)
+				);
+				break;
+
+			case 'server':
+				$display_vars = array(
+					'title'	=> 'ACP_SERVER_SETTINGS',
+					'vars'	=> array(
+						'legend1'			=> 'ACP_SERVER_SETTINGS',
+						'server_name'		=> array('lang' => 'SERVER_NAME',	'type' => 'text:40:255', 'explain' => true),
+						'server_port'		=> array('lang' => 'SERVER_PORT',	'type' => 'text:5:5', 'explain' => true),
+						'script_path'		=> array('lang' => 'SCRIPT_PATH',	'type' => 'text::255', 'explain' => true),
+						'ip_check'			=> array('lang' => 'IP_VALID',		'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
+						'browser_check'		=> array('lang' => 'BROWSER_VALID',	'type' => 'radio:yes_no', 'explain' => true),
+						'gzip_compress'		=> array('lang' => 'ENABLE_GZIP',	'type' => 'radio:yes_no', 'explain' => false),
+
+						'legend2'			=> 'PATH_SETTINGS',
+						'smilies_path'		=> array('lang' => 'SMILIES_PATH',	'type' => 'text:20:255', 'explain' => true),
+						'icons_path'		=> array('lang' => 'ICONS_PATH',	'type' => 'text:20:255', 'explain' => true),
+						'upload_icons_path'	=> array('lang' => 'UPLOAD_ICONS_PATH', 'type' => 'text:20:255', 'explain' => true),
+						'ranks_path'		=> array('lang' => 'RANKS_PATH',	'type' => 'text:20:255', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'email':
+				$display_vars = array(
+					'title'	=> 'ACP_EMAIL_SETTINGS',
+					'vars'	=> array(
+						'legend1'				=> 'GENERAL_SETTINGS',
+						'email_enable'			=> array('lang' => 'ENABLE_EMAIL',			'type' => 'radio:enabled_disabled', 'explain' => true),
+						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'type' => 'radio:enabled_disabled', 'explain' => true),
+						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'type' => 'text:20:50', 'explain' => true),
+						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'type' => 'text:5:5', 'explain' => true),
+						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'type' => 'text:25:100', 'explain' => true),
+						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'type' => 'text:25:100', 'explain' => true),
+						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'type' => 'textarea:5:30', 'explain' => true),
+						
+						'legend2'				=> 'SMTP_SETTINGS',
+						'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'type' => 'radio:yes_no', 'explain' => true),
+						'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'type' => 'text:25:50', 'explain' => false),
+						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'type' => 'text:4:5', 'explain' => true),
+						'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
+						'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'type' => 'text:25:255', 'explain' => true),
+						'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'type' => 'password:25:255', 'explain' => true)
+					)
+				);
+				break;
+
+			case 'message':
+				$display_vars = array(
+					'title'	=> 'ACP_MESSAGE_SETTINGS',
+					'lang'	=> 'ucp',
+					'vars'	=> array(
+						'legend1'				=> 'GENERAL_SETTINGS',
+						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'type' => 'text:4:4', 'explain' => true),
+						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'type' => 'text:4:4', 'explain' => true),
+						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
+						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'type' => 'text:3:3', 'explain' => true),
+						
+						'legend2'				=> 'GENERAL_OPTIONS',
+						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'type' => 'radio:yes_no', 'explain' => false),
+						'auth_html_pm'			=> array('lang' => 'ALLOW_HTML_PM',			'type' => 'radio:yes_no', 'explain' => false),
+						'auth_bbcode_pm'		=> array('lang' => 'ALLOW_BBCODE_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'auth_smilies_pm'		=> array('lang' => 'ALLOW_SMILIES_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'type' => 'radio:yes_no', 'explain' => false),
+						'auth_download_pm'		=> array('lang' => 'ALLOW_DOWNLOAD_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'allow_sig_pm'			=> array('lang' => 'ALLOW_SIG_PM',			'type' => 'radio:yes_no', 'explain' => false),
+						'auth_report_pm'		=> array('lang' => 'ALLOW_REPORT_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'auth_quote_pm'			=> array('lang' => 'ALLOW_QUOTE_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'print_pm'				=> array('lang' => 'ALLOW_PRINT_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'email_pm'				=> array('lang' => 'ALLOW_EMAIL_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'forward_pm'			=> array('lang' => 'ALLOW_FORWARD_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'auth_img_pm'			=> array('lang' => 'ALLOW_IMG_PM',			'type' => 'radio:yes_no', 'explain' => false),
+						'auth_flash_pm'			=> array('lang' => 'ALLOW_FLASH_PM',		'type' => 'radio:yes_no', 'explain' => false),
+						'enable_pm_icons'		=> array('lang' => 'ENABLE_PM_ICONS',		'type' => 'radio:yes_no', 'explain' => false)
+					)
+				);
+				break;
+			
+			default:
+				trigger_error('NO_MODE');
+		}
+
+		$u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
+		
+		if (isset($display_vars['lang']))
+		{
+			$user->add_lang($display_vars['lang']);
+		}
+
+		$this->new_config = $config;
+		$cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => '')) : $this->new_config;
+
+		// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
+		foreach ($display_vars['vars'] as $config_name => $null)
+		{
+			if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
+			{
+				continue;
+			}
+
+			$config_value = $cfg_array[$config_name];
+			$this->new_config[$config_name] = $config_value;
+
+			if ($config_name == 'email_function_name')
+			{
+				$this->new_config['email_function_name'] = (empty($this->new_config['email_function_name']) || !function_exists($this->new_config['email_function_name'])) ? 'mail' : str_replace(array('(', ')'), array('', ''), trim($this->new_config['email_function_name']));
+			}
+
+			if ($submit)
+			{
+				set_config($config_name, $config_value);
+			}
+		}
+
+		if ($submit)
+		{
+			add_log('admin', 'LOG_' . strtoupper($mode) . '_CONFIG');
+
+			trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($u_action));
+		}
+
+		$this->tpl_name = 'acp_board';
+
+		$template->assign_vars(array(
+			'L_TITLE'			=> $user->lang[$display_vars['title']],
+			'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'] . '_EXPLAIN'],
+			'U_ACTION'			=> $u_action)
+		);
+
+		// Output relevant page
+		foreach ($display_vars['vars'] as $config_key => $vars)
+		{
+
+			if (!is_array($vars) && strpos($config_key, 'legend') === false)
+			{
+				continue;
+			}
+
+			if (strpos($config_key, 'legend') !== false)
+			{
+				$template->assign_block_vars('options', array(
+					'S_LEGEND'		=> true,
+					'LEGEND'		=> $user->lang[$vars])
+				);
+
+				continue;
+			}
+
+			$type = explode(':', $vars['type']);
+
+			$template->assign_block_vars('options', array(
+				'KEY'			=> $config_key,
+				'TITLE'			=> $user->lang[$vars['lang']],
+				'S_EXPLAIN'		=> $vars['explain'],
+				'TITLE_EXPLAIN'	=> ($vars['explain']) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '',
+				'CONTENT'		=> build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
+				)
+			);
+		
+			unset($display_vars['vars'][$config_key]);
+		}
+
+		if ($mode == 'auth')
+		{
+			$template->assign_var('S_AUTH', true);
+			
+			$auth_plugins = array();
+
+			$dp = opendir($phpbb_root_path . 'includes/auth');
+			while ($file = readdir($dp))
+			{
+				if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
+				{
+					$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
+				}
+			}
+
+			sort($auth_plugins);
+
+			foreach ($auth_plugins as $method)
+			{
+				if ($method && file_exists($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx))
+				{
+					include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
+
+					$method = 'admin_' . $method;
+					if (function_exists($method))
+					{
+						if ($fields = $method($new))
+						{
+							// Check if we need to create config fields for this plugin
+							foreach ($fields['config'] as $field)
+							{
+								if (!isset($config[$field]))
+								{
+									set_config($field, '');
+								}
+							}
+						}
+
+						if ($fields['tpl'])
+						{
+							$template->assign_block_vars('auth_tpl', array(
+								'TPL'	=> $fields['tpl'])
+							);
+						}
+						unset($fields);
+					}
+				}
+			}
+		}
+	}
+
+	function select_auth_method($selected_method, $key = '')
+	{
+		global $new, $phpbb_root_path, $phpEx;
+
+		$auth_plugins = array();
+
+		$dp = opendir($phpbb_root_path . 'includes/auth');
+		while ($file = readdir($dp))
+		{
+			if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
+			{
+				$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
+			}
+		}
+
+		sort($auth_plugins);
+
+		$auth_select = '';
+		foreach ($auth_plugins as $method)
+		{
+			$selected = ($selected_method == $method) ? ' selected="selected"' : '';
+			$auth_select .= '<option value="' . $method . '"' . $selected . '>' . ucfirst($method) . '</option>';
+		}
+
+		return $auth_select;
+	}
+
+	function mail_auth_select($selected_method, $key = '')
+	{
+		global $user;
+
+		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
+		$s_smtp_auth_options = '';
+
+		foreach ($auth_methods as $method)
+		{
+			$s_smtp_auth_options .= '<option value="' . $method . '"' . (($selected_method == $method) ? ' selected="selected"' : '') . '>' . $user->lang['SMTP_' . str_replace('-', '_', $method)] . '</option>';
+		}
+
+		return $s_smtp_auth_options;
+	}
+
+	function full_folder_select($value, $key = '')
+	{
+		global $user;
+
+		return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['HOLD_NEW_MESSAGES'] . '</option>';
+	}
+
+	function select_ip_check($value, $key = '')
+	{
+		$radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NONE');
+
+		return h_radio('config[ip_check]', $radio_ary, $value, $key);
+	}
+
+	function select_acc_activation($value, $key = '')
+	{
+		global $user, $config;
+
+		$radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE');
+		if ($config['email_enable'])
+		{
+			$radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
+		}
+
+		return h_radio('config[require_activation]', $radio_ary, $value, $key);
+	}
+
+	function username_length($value, $key = '')
+	{
+		global $new, $user;
+
+		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $new['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+	}
+
+	function select_username_chars($selected_value, $key)
+	{
+		global $user;
+
+		$user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[\w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');
+		$user_char_options = '';
+		foreach ($user_char_ary as $lang => $value)
+		{
+			$selected = ($selected_value == $value) ? ' selected="selected"' : '';
+			$user_char_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
+		}
+
+		return $user_char_options;
+	}
+
+	function password_length($value, $key)
+	{
+		global $new, $user;
+
+		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $new['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+	}
+
+	function select_password_chars($selected_value, $key)
+	{
+		global $user;
+
+		$pass_type_ary = array('PASS_TYPE_ANY' => '.*', 'PASS_TYPE_CASE' => '[a-zA-Z]', 'PASS_TYPE_ALPHA' => '[a-zA-Z0-9]', 'PASS_TYPE_SYMBOL' => '[a-zA-Z\W]');
+		$pass_char_options = '';
+		foreach ($pass_type_ary as $lang => $value)
+		{
+			$selected = ($selected_value == $value) ? ' selected="selected"' : '';
+			$pass_char_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
+		}
+
+		return $pass_char_options;
+	}
+
+	function bump_interval($value, $key)
+	{
+		global $new, $user;
+
+		$s_bump_type = '';
+		$types = array('m' => 'MINUTES', 'h' => 'HOURS', 'd' => 'DAYS');
+		foreach ($types as $type => $lang)
+		{
+			$selected = ($new['bump_type'] == $type) ? 'selected="selected" ' : '';
+			$s_bump_type .= '<option value="' . $type . '" ' . $selected . '>' . $user->lang[$lang] . '</option>';
+		}
+
+		return '<input id="' . $key . '" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '" />&nbsp;<select name="config[bump_type]">' . $s_bump_type . '</select>';
+	}
+
+	function board_disable($value, $key)
+	{
+		global $new, $user;
+
+		$radio_ary = array(1 => 'YES', 0 => 'NO');
+
+		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $new['board_disable_msg'] . '" />';
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_board_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_board',
+			'title'		=> 'Board Management',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'auth'		=> array('title' => 'ACP_AUTH_SETTINGS', 'auth' => 'acl_a_server'),
+				'avatar'	=> array('title' => 'ACP_AVATAR_SETTINGS', 'auth' => 'acl_a_board'),
+				'default'	=> array('title' => 'ACP_BOARD_DEFAULTS', 'auth' => 'acl_a_defaults'),
+				'settings'	=> array('title' => 'ACP_BOARD_SETTINGS', 'auth' => 'acl_a_board'),
+				'cookie'	=> array('title' => 'ACP_COOKIE_SETTINGS', 'auth' => 'acl_a_cookies'),
+				'email'		=> array('title' => 'ACP_EMAIL_SETTINGS', 'auth' => 'acl_a_server'),
+				'load'		=> array('title' => 'ACP_LOAD_SETTINGS', 'auth' => 'acl_a_server'),
+				'server'	=> array('title' => 'ACP_SERVER_SETTINGS', 'auth' => 'acl_a_server'),
+				'message'	=> array('title' => 'ACP_MESSAGE_SETTINGS', 'auth' => 'acl_a_defaults'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+?>
--- a/phpBB/includes/acp/acp_bots.php
+++ b/phpBB/includes/acp/acp_bots.php
@@ -0,0 +1,351 @@
+<?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_bots
+{
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $auth, $template, $cache;
+		global $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
+
+		$action = request_var('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
+		$mark	= request_var('mark', array(0));
+		$bot_id	= request_var('id', 0);
+
+		if (isset($_POST['add']))
+		{
+			$action = 'add';
+		}
+
+		$error = array();
+
+		$user->add_lang('acp/bots');
+		$this->tpl_name = 'acp_bots';
+
+		$u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
+
+		// User wants to do something, how inconsiderate of them!
+		switch ($action)
+		{
+			case 'activate':
+				if ($bot_id || sizeof($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 || sizeof($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 || sizeof($mark))
+				{
+					// 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();
+
+					$sql = 'DELETE FROM ' . BOTS_TABLE . " 
+						WHERE bot_id $sql_id";
+					$db->sql_query($sql);
+
+					foreach (array(USERS_TABLE, USER_GROUP_TABLE) as $table)
+					{
+						$sql = "DELETE FROM $table
+							WHERE user_id IN (" . implode(', ', $user_id_ary) . ')';
+						$db->sql_query($sql);
+					}
+
+					$db->sql_transaction('commit');
+
+					$cache->destroy('bots');
+
+					add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary));
+					trigger_error($user->lang['BOT_DELETED'] . adm_back_link($u_action));
+				}
+			break;
+
+			case 'edit':
+			case 'add':
+				$bot_row = array(
+					'bot_name'		=> request_var('bot_name', ''),
+					'bot_agent'		=> request_var('bot_agent', ''),
+					'bot_ip'		=> request_var('bot_ip', ''),
+					'bot_active'	=> request_var('bot_active', true),
+					'bot_lang'		=> request_var('bot_lang', $config['default_lang']),
+					'bot_style'		=> request_var('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']);
+
+					if (!sizeof($error))
+					{
+						$db->sql_transaction();
+
+						// 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_GROUP'] . adm_back_link($u_action . "&amp;id=$bot_id&amp;action=$action"));
+							}
+
+							$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								'group_id'		=> (int) $group_row['group_id'], 
+								'username'		=> (string) $bot_row['bot_name'], 
+								'user_type'		=> (int) USER_IGNORE, 
+								'user_colour'	=> (string) $group_row['group_colour'],
+								'user_lang'		=> (string) $bot_row['bot_lang'], 
+								'user_style'	=> (int) $bot_row['bot_style'],
+								'user_options'	=> 0)
+							);
+							$db->sql_query($sql);
+
+							$user_id = $db->sql_nextid();
+
+							// Add to Bots usergroup
+							$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+								'user_id'	=> $user_id, 
+								'group_id'	=> $group_row['group_id'])
+							);
+							$db->sql_query($sql);
+
+							$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 
+								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($u_action . "&amp;id=$bot_id&amp;action=$action"));
+							}
+
+							$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+								'user_style'	=> (int) $bot_row['bot_style'],
+								'user_lang'		=> (string) $bot_row['bot_lang'])
+							) . " 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);
+
+							$log = 'UPDATED';
+						}
+
+						$db->sql_transaction('commit');
+
+						$cache->destroy('bots');
+				
+						add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']);
+						trigger_error($user->lang['BOT_' . $log] . adm_back_link($u_action . "&amp;id=$bot_id&amp;action=$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($u_action . "&amp;id=$bot_id&amp;action=$action"));
+					}
+
+					$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 = '';
+				foreach (array('0' => 'NO', '1' => 'YES') 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'		=> $u_action . "&amp;id=$bot_id&amp;action=$action",
+					'U_BACK'		=> $u_action,
+					'ERROR_MSG'		=> (sizeof($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'			=> (sizeof($error)) ? true : false,
+					)
+				);
+
+				return;
+
+			break;
+		}
+
+		$s_options = '';
+		foreach (array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE') as $value => $lang)
+		{
+			$s_options .= '<option value="' . $value . '">' . $user->lang[$lang] . '</option>';
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'		=> $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';
+		$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'	=> $u_action . "&amp;id={$row['bot_id']}&amp;action=$active_value",
+				'L_ACTIVATE_DEACTIVATE'	=> $user->lang[$active_lang],
+				'U_EDIT'				=> $u_action . "&amp;id={$row['bot_id']}&amp;action=edit",
+				'U_DELETE'				=> $u_action . "&amp;id={$row['bot_id']}&amp;action=delete")
+			);
+		}
+		$db->sql_freeresult($result);
+
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_bots_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_bots',
+			'title'		=> 'ACP_BOTS',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'bots'		=> array('title' => 'ACP_BOTS', 'auth' => 'acl_a_server'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+
+?>
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -0,0 +1,188 @@
+<?php
+/** 
+*
+* @package acp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+* @todo Check/enter/update transport info
+*/
+
+/**
+* @package acp
+*/
+class acp_jabber
+{
+	function main($id, $mode)
+	{
+		global $db, $user, $auth, $template;
+		global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang('acp/board');
+
+		include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
+
+		$action	= request_var('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		if ($mode != 'settings')
+		{
+			return;
+		}
+
+		$u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
+		$this->tpl_name = 'acp_jabber';
+		
+		$jab_enable		= request_var('jab_enable', $config['jab_enable']);
+		$jab_host		= request_var('jab_host', $config['jab_host']);
+		$jab_port		= request_var('jab_port', $config['jab_port']);
+		$jab_username	= request_var('jab_username', $config['jab_username']);
+		$jab_password	= request_var('jab_password', $config['jab_password']);
+		$jab_resource	= request_var('jab_resource', $config['jab_resource']);
+
+		$jabber = new jabber();
+		$error = array();
+
+		// Setup the basis vars for jabber connection
+		$jabber->server		= $jab_host;
+		$jabber->port		= ($jab_port) ? $jab_port : 5222;
+		$jabber->username	= $jab_username;
+		$jabber->password	= $jab_password;
+		$jabber->resource	= $jab_resource;
+
+		// Are changing (or initialising) a new host or username? If so run some checks and 
+		// try to create account if it doesn't exist
+		if ($jab_enable)
+		{
+			if ($jab_host != $config['jab_host'] || $jab_username != $config['jab_username'])
+			{
+				if (!$jabber->Connect())
+				{
+					trigger_error('Could not connect to Jabber server' . adm_back_link($u_action));
+				}
+
+				// First we'll try to authorise using this account, if that fails we'll
+				// try to create it.
+				if (!($result = $jabber->SendAuth()))
+				{
+					if (($result = $jabber->AccountRegistration($config['board_email'], $config['sitename'])) <> 2)
+					{
+						$error[] = ($result == 1) ? $user->lang['ERR_JAB_USERNAME'] : sprintf($user->lang['ERR_JAB_REGISTER'], $result);
+					}
+					else
+					{
+						$message = $user->lang['JAB_REGISTERED'];
+						$log = 'JAB_REGISTER';
+					}
+				}
+				else
+				{
+					$message = $user->lang['JAB_CHANGED'];
+					$log = 'JAB_CHANGED';
+				}
+
+				sleep(1);
+				$jabber->Disconnect();
+			}
+			else if ($jab_password != $config['jab_password'])
+			{
+				if (!$jabber->Connect())
+				{
+					trigger_error('Could not connect to Jabber server' . adm_back_link($u_action));
+				}
+
+				if (!$jabber->SendAuth())
+				{
+					trigger_error('Could not authorise on Jabber server' . adm_back_link($u_action));
+				}
+				$jabber->SendPresence(NULL, NULL, 'online');
+
+				if (($result = $jabber->ChangePassword($jab_password))  <> 2)
+				{
+					$error[] = ($result == 1) ? $user->lang['ERR_JAB_PASSCHG'] : sprintf($user->lang['ERR_JAB_PASSFAIL'], $result);
+				}
+				else
+				{
+					$message = $user->lang['JAB_PASS_CHANGED'];
+					$log = 'JAB_PASSCHG';
+				}
+
+				sleep(1);
+				$jabber->Disconnect();
+			}
+		}
+
+		// Pull relevant config data
+		$sql = 'SELECT *
+			FROM ' . CONFIG_TABLE . "
+			WHERE config_name LIKE 'jab_%'";
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$config_name = $row['config_name'];
+			$config_value = $row['config_value'];
+
+			$default_config[$config_name] = $config_value;
+			$new[$config_name] = (isset($_POST[$config_name])) ? request_var($config_name, '') : $default_config[$config_name];
+
+			if ($submit && !sizeof($error))
+			{
+				set_config($config_name, $new[$config_name]);
+			}
+		}
+
+		if ($submit && !sizeof($error))
+		{
+			add_log('admin', 'LOG_' . $log);
+			trigger_error($message . adm_back_link($u_action));
+		}
+
+		if (sizeof($error))
+		{
+			$template->assign_vars(array(
+				'S_WARNING'		=> true,
+				'WARNING_MSG'	=> implode('<br />', $error))
+			);
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'				=> $u_action,
+			'JAB_ENABLE'			=> $new['jab_enable'],
+			'L_JAB_SERVER_EXPLAIN'	=> sprintf($user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/user/publicservers.php" rel="external">', '</a>'),
+			'JAB_HOST'				=> $new['jab_host'],
+			'JAB_PORT'				=> $new['jab_port'],
+			'JAB_USERNAME'			=> $new['jab_username'],
+			'JAB_PASSWORD'			=> $new['jab_password'],
+			'JAB_RESOURCE'			=> $new['jab_resource'])
+		);		
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_jabber_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_jabber',
+			'title'		=> 'Jabber',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'settings'		=> array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_server'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+?>
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -0,0 +1,409 @@
+<?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_main
+{
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $auth, $template;
+		global $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
+
+		$action = request_var('action', '');
+		$mark	= (isset($_REQUEST['mark'])) ? implode(', ', request_var('mark', array(0))) : '';
+
+		if ($mark)
+		{
+			switch ($action)
+			{
+				case 'activate':
+				case 'delete':
+
+					if (!$auth->acl_get('a_user'))
+					{
+						trigger_error($user->lang['NO_ADMIN']);
+					}
+
+					$sql = 'SELECT username 
+						FROM ' . USERS_TABLE . "
+						WHERE user_id IN ($mark)";
+					$result = $db->sql_query($sql);
+				
+					$user_affected = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$user_affected[] = $row['username'];
+					}
+					$db->sql_freeresult($result);
+
+					if ($action == 'activate')
+					{
+						include($phpbb_root_path . 'includes/functions_user.php');
+						$mark_ary = explode(', ', $mark);
+
+						foreach ($mark_ary as $user_id)
+						{
+							user_active_flip($user_id, USER_INACTIVE);
+						}
+					}
+					else if ($action == 'delete')
+					{
+						$sql = 'DELETE FROM ' . USER_GROUP_TABLE . " WHERE user_id IN ($mark)";
+						$db->sql_query($sql);
+						$sql = 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)";
+						$db->sql_query($sql);
+	
+						add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected));
+					}
+
+					if ($action != 'delete')
+					{
+						set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true);
+					}
+
+				break;
+
+				case 'remind':
+					if (!$auth->acl_get('a_user'))
+					{
+						trigger_error($user->lang['NO_ADMIN']);
+					}
+
+					if (empty($config['email_enable']))
+					{
+						trigger_error($user->lang['EMAIL_DISABLED']);
+					}
+
+					$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey 
+						FROM ' . USERS_TABLE . " 
+						WHERE user_id IN ($mark)";
+					$result = $db->sql_query($sql);
+
+					if ($row = $db->sql_fetchrow($result))
+					{
+						// Send the messages
+						include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
+
+						$messenger = new messenger();
+
+						$board_url = generate_board_url() . "/ucp.$phpEx?mode=activate";
+						$sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+
+						$usernames = array();
+						do
+						{
+							$messenger->template('user_remind_inactive', $row['user_lang']);
+
+							$messenger->replyto($config['board_email']);
+							$messenger->to($row['user_email'], $row['username']);
+							$messenger->im($row['user_jabber'], $row['username']);
+
+							$messenger->assign_vars(array(
+								'EMAIL_SIG'		=> $sig,
+								'USERNAME'		=> $row['username'],
+								'SITENAME'		=> $config['sitename'],
+								'REGISTER_DATE'	=> $user->format_date($row['user_regdate']), 
+							
+								'U_ACTIVATE'	=> "$board_url&mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'])
+							);
+
+							$messenger->send($row['user_notify_type']);
+
+							$usernames[] = $row['username'];
+						}
+						while ($row = $db->sql_fetchrow($result));
+
+						$messenger->save_queue();
+
+						unset($email_list);
+
+						add_log('admin', 'LOG_INDEX_REMIND', implode(', ', $usernames));
+						unset($usernames);
+					}
+					$db->sql_freeresult($result);
+		
+				break;
+			}
+		}
+
+		switch ($action)
+		{
+			case 'online':
+				if (!$auth->acl_get('a_defaults'))
+				{
+					trigger_error($user->lang['NO_ADMIN']);
+				}
+
+				set_config('record_online_users', 1, true);
+				set_config('record_online_date', time(), true);
+				add_log('admin', 'LOG_RESET_ONLINE');
+			break;
+
+			case 'stats':
+				if (!$auth->acl_get('a_defaults'))
+				{
+					trigger_error($user->lang['NO_ADMIN']);
+				}
+
+				$sql = 'SELECT COUNT(post_id) AS stat 
+					FROM ' . POSTS_TABLE . '
+					WHERE post_approved = 1';
+				$result = $db->sql_query($sql);
+
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+				set_config('num_posts', (int) $row['stat'], true);
+
+				$sql = 'SELECT COUNT(topic_id) AS stat
+					FROM ' . TOPICS_TABLE . '
+					WHERE topic_approved = 1';
+				$result = $db->sql_query($sql);
+
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+				set_config('num_topics', (int) $row['stat'], true);
+
+				$sql = 'SELECT COUNT(user_id) AS stat
+					FROM ' . USERS_TABLE . '
+					WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')';
+				$result = $db->sql_query($sql);
+
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+				set_config('num_users', (int) $row['stat'], true);
+
+				$sql = 'SELECT COUNT(attach_id) as stat
+					FROM ' . ATTACHMENTS_TABLE;
+				$result = $db->sql_query($sql);
+
+				set_config('num_files', (int) $db->sql_fetchfield('stat', 0, $result), true);
+				$db->sql_freeresult($result);
+
+				$sql = 'SELECT SUM(filesize) as stat
+					FROM ' . ATTACHMENTS_TABLE;
+				$result = $db->sql_query($sql);
+
+				set_config('upload_dir_size', (int) $db->sql_fetchfield('stat', 0, $result), true);
+				$db->sql_freeresult($result);
+
+				add_log('admin', 'LOG_RESYNC_STATS');
+			break;
+
+			case 'user':
+				if (!$auth->acl_get('a_defaults'))
+				{
+					trigger_error($user->lang['NO_ADMIN']);
+				}
+
+				$post_count_ary = $auth->acl_getf('f_postcount');
+
+				$forum_ary = array();
+				foreach ($post_count_ary as $forum_id => $allowed)
+				{
+					if ($allowed['f_postcount'])
+					{
+						$forum_ary[] = $forum_id;
+					}
+				}
+			
+				if (!sizeof($forum_ary))
+				{
+					$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_posts = 0');
+				}
+				else
+				{
+					$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
+						FROM ' . POSTS_TABLE . '
+						WHERE poster_id <> ' . ANONYMOUS . '
+							AND forum_id IN (' . implode(', ', $forum_ary) . ')
+						GROUP BY poster_id';
+					$result = $db->sql_query($sql);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['poster_id']}");
+					}
+					$db->sql_freeresult($result);
+				}
+
+				add_log('admin', 'LOG_RESYNC_POSTCOUNTS');
+			break;
+	
+			case 'date':
+				if (!$auth->acl_get('a_defaults'))
+				{
+					trigger_error($user->lang['NO_ADMIN']);
+				}
+
+				set_config('board_startdate', time() - 1);
+				add_log('admin', 'LOG_RESET_DATE');
+			break;
+		}
+
+		// 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 = ($config['upload_dir_size'] >= 1048576) ? sprintf('%.2f ' . $user->lang['MB'], ($config['upload_dir_size'] / 1048576)) : (($config['upload_dir_size'] >= 1024) ? sprintf('%.2f ' . $user->lang['KB'], ($config['upload_dir_size'] / 1024)) : sprintf('%.2f ' . $user->lang['BYTES'], $config['upload_dir_size']));
+
+		$avatar_dir_size = 0;
+
+		if ($avatar_dir = @opendir($phpbb_root_path . $config['avatar_path']))
+		{
+			while ($file = readdir($avatar_dir))
+			{
+				if ($file{0} != '.')
+				{
+					$avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file);
+				}
+			}
+			@closedir($avatar_dir);
+
+			// This bit of code translates the avatar directory size into human readable format
+			// Borrowed the code from the PHP.net annoted manual, origanally written by:
+			// Jesse (jesse@jess.on.ca)
+			$avatar_dir_size = ($avatar_dir_size >= 1048576) ? sprintf('%.2f ' . $user->lang['MB'], ($avatar_dir_size / 1048576)) : (($avatar_dir_size >= 1024) ? sprintf('%.2f ' . $user->lang['KB'], ($avatar_dir_size / 1024)) : sprintf('%.2f ' . $user->lang['BYTES'], $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;
+		}
+
+		$dbsize = get_database_size();
+		$s_action_options = build_select(array('online' => 'RESET_ONLINE', 'date' => 'RESET_DATE', 'stats' => 'RESYNC_STATS', 'user' => 'RESYNC_POSTCOUNTS'));
+
+		$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,
+			'GZIP_COMPRESSION'	=> ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF'],
+
+			'U_ACTION'			=> "{$phpbb_admin_path}index.$phpEx$SID",
+
+			'S_ACTION_OPTIONS'	=> $s_action_options,
+			)
+		);
+
+		view_log('admin', $log_data, $log_count, 5);
+
+		foreach ($log_data as $row)
+		{
+			$template->assign_block_vars('log', array(
+				'USERNAME'	=> $row['username'],
+				'IP'		=> $row['ip'],
+				'DATE'		=> $user->format_date($row['time']),
+				'ACTION'	=> $row['action'])
+			);
+		}
+		
+		if ($auth->acl_get('a_user'))
+		{
+			$sql = 'SELECT user_id, username, user_regdate
+				FROM ' . USERS_TABLE . ' 
+				WHERE user_type = ' . USER_INACTIVE . ' 
+				ORDER BY user_regdate ASC';
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$template->assign_block_vars('inactive', array(
+					'DATE'			=> $user->format_date($row['user_regdate']),
+					'USER_ID'		=> $row['user_id'],
+					'USERNAME'		=> $row['username'],
+					'U_USER_ADMIN'	=> "{$phpbb_admin_path}admin_users.$phpEx$SID&amp;u={$row['user_id']}")
+				);
+			}
+
+			$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))
+			);
+		}
+		
+		$this->tpl_name = 'acp_main';
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_main_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_main',
+			'title'		=> 'ACP Index',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'main'		=> array('title' => 'Index', 'auth' => ''),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+?>
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -0,0 +1,105 @@
+<?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_php_info
+{
+	function main($id, $mode)
+	{
+		global $db, $user, $auth, $template;
+		global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		if ($mode != 'info')
+		{
+			trigger_error('NO_MODE');
+		}
+
+		$this->tpl_name = 'acp_php_info';
+		
+		ob_start(); 
+		phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES); 
+		$phpinfo = ob_get_contents(); 
+		ob_end_clean(); 
+
+		// Get used layout
+		$layout = (preg_match('#bgcolor#i', $phpinfo)) ? 'old' : 'new';
+
+		// 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>#siU', $phpinfo, $output); 
+
+		switch ($layout)
+		{
+			case 'old':
+				$output = preg_replace('#<table#', '<table', $output[1][0]);
+				$output = preg_replace('# bgcolor="\#(\w){6}"#', '', $output);
+				$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
+				$output = preg_replace('#border="0" cellpadding="3" cellspacing="1" width="600"#', 'border="0" cellspacing="1" cellpadding="4" width="95%"', $output);
+				$output = preg_replace('#<tr valign="top"><td align="left">(.*?<a .*?</a>)(.*?)</td></tr>#s', '<tr class="row1"><td style="{background-color: #9999cc;}"><table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td style="{background-color: #9999cc;}">\2</td><td style="{background-color: #9999cc;}">\1</td></tr></table></td></tr>', $output);
+				$output = preg_replace('#<tr valign="baseline"><td[ ]{0,1}><b>(.*?)</b>#', '<tr><td class="row1" nowrap="nowrap">\1', $output);
+				$output = preg_replace('#<td align="(center|left)">#', '<td class="row2">', $output);
+				$output = preg_replace('#<td>#', '<td class="row2">', $output);
+				$output = preg_replace('#valign="middle"#', '', $output);
+				$output = preg_replace('#<tr >#', '<tr>', $output);
+				$output = preg_replace('#<hr(.*?)>#', '', $output);
+				$output = preg_replace('#<h1 align="center">#i', '<h1>', $output);
+				$output = preg_replace('#<h2 align="center">#i', '<h2>', $output);
+			break;
+
+			case 'new':
+				$output = preg_replace('#(\w),(\w)#', '\1, \2', $output[1][0]);
+				$output = preg_replace('#<tr class="v"><td>(.*?<a .*?</a>)(.*?)</td></tr>#s', '<tr class="row1"><td><table class="type2"><tr><td>\2</td><td>\1</td></tr></table></td></tr>', $output);
+				$output = preg_replace('#class="e"#', 'class="row1"', $output);
+				$output = preg_replace('#class="v"#', 'class="row2"', $output);
+				$output = preg_replace('#class="h"#', '', $output);
+				$output = preg_replace('#<hr />#', '', $output);
+				$output = preg_replace('#<table [^<]+>#i', '<table>', $output);
+				$output = preg_replace('#<img border="0"#i', '<img', $output);
+				$output = str_replace(array('<font', '</font>'), array('<span', '</span>'), $output);
+				
+				preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output); 
+				$output = $output[1][0];
+			break;
+		}
+
+		$template->assign_var('PHPINFO', $output);
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_php_info_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_php_info',
+			'title'		=> 'ACP_PHP_INFO',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'info'		=> array('title' => 'ACP_PHP_INFO', 'auth' => 'acl_a_server'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+?>