[mxbb-commits] core/includes/sessions/ascraeus auth.php, NONE, 1.1 bbcode.php, NONE, 1.1 constants.php, NONE, 1.1 core.php, NONE, 1.1 functions.php, NONE, 1.1 index.htm, NONE, 1.1 login.php, NONE, 1.1 session.php, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/ascraeus
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5316

Added Files:
	auth.php bbcode.php constants.php core.php functions.php 
	index.htm login.php session.php 
Log Message:


--- NEW FILE: login.php ---
<?php
/**
*
* @package MX-Publisher Core
* @version $Id: login.php,v 1.1 2014/09/15 21:14:57 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined('IN_PORTAL') )
{
	die("Hacking attempt");
}

if($mx_request_vars->is_request('login') && ($userdata['user_id'] == ANONYMOUS || $mx_request_vars->is_post('admin')) )
{
	$username = utf8_clean_string($mx_request_vars->post('username', MX_TYPE_NO_TAGS, ''));
	$password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS);
	$viewonline = $mx_request_vars->post('viewonline', MX_TYPE_INT, 0);

	$sql = "SELECT *
		FROM " . USERS_TABLE . "
		WHERE username = '" . str_replace("\\'", "''", $username) . "'
		OR username_clean = '" . str_replace("\\'", "''", $username) . "'";

	if ( !($result = $db->sql_query($sql) ) )
	{
		mx_message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql);
	}

	if( $row = $db->sql_fetchrow($result) )
	{
		//$user_type = $row['user_level']; // phpBB2
		$user_type = $row['user_type']; // phpBB3

		if( $user_type != ADMIN && $board_config['board_disable'] )
		{
			mx_redirect(mx3_append_sid("index.$phpEx", false));
		}
		else
		{
			$user_login_attempts = $row['user_login_attempts'];

			if ( $user_login_attempts && $board_config['login_reset_time'] )
			{
				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_attempts = 0 WHERE user_id = ' . $row['user_id']);
				$row['user_last_login_try'] = $row['user_login_tries'] = 0;
			}

			// Check to see if user is allowed to login again... if his tries are exceeded
			if ($user_login_attempt && $board_config['login_reset_time'] && $board_config['max_login_attempts'] && $user_login_attempts >= $board_config['max_login_attempts'] && $userdata['user_level'] != ADMIN)
			{
				mx_message_die(GENERAL_MESSAGE, sprintf($lang['Login_attempts_exceeded'], $board_config['max_login_attempts'], $board_config['login_reset_time']));
			}

			// If the password convert flag is set we need to convert it
			if ($row['user_pass_convert'])
			{
				// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
				$password_old_format = isset($_REQUEST['password']) ? $_REQUEST['password'] : $password;
				$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
				$password_new_format = '';

				phpBB3::set_var($password_new_format, stripslashes($password_old_format), 'string');

				//mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", $password_new_format, '');

				if ($password == $password_new_format)
				{
					if (!function_exists('utf8_to_cp1252'))
					{
						global $mx_root_path, $phpEx;
						include_once($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
					}

					// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
					if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])
					{
						$hash = phpBB3::phpbb_hash($password_new_format);

						// Update the password in the users table to the new format and remove user_pass_convert flag
						$sql = 'UPDATE ' . USERS_TABLE . '
							SET user_password = \'' . $db->sql_escape($hash) . '\',
								user_pass_convert = 0
							WHERE user_id = ' . $row['user_id'];
						$db->sql_query($sql);

						$row['user_pass_convert'] = 0;
						$row['user_password'] = $hash;
					}
					else
					{
						// Although we weren't able to convert this password we have to
						// increase login attempt count to make sure this cannot be exploited
						$sql = 'UPDATE ' . USERS_TABLE . '
							SET user_login_attempts = user_login_attempts + 1
							WHERE user_id = ' . $row['user_id'];
						$db->sql_query($sql);
						mx_message_die(GENERAL_MESSAGE, 'We are sorry but password convertion failed, please login direct in forums or rewuest a new activation link.');
						return array(
							'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
							'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
							'user_row'		=> $row,
						);
					}
				}
			}
			else
			{
				// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
				$password_old_format = isset($_REQUEST['password']) ? $_REQUEST['password'] : $password;
				$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
				$password_new_format = '';
				phpBB3::set_var($password_new_format, stripslashes($password_old_format), 'string');
				//mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", $password_new_format, '');

				if ($password_new_format == $password_old_format)
				{
					if (!function_exists('utf8_to_cp1252'))
					{
							global $mx_root_path, $phpEx;
							include_once($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
					}

					// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
					if (md5($password_old_format) == $row['user_password'] || md5($password) == $row['user_password'] || phpBB3::phpbb_check_hash($password, $row['user_password']))
					{
						$autologin = $mx_request_vars->is_post('autologin');
						$admin = $mx_request_vars->is_post('admin');
						$mx_user->session_create($row['user_id'], $admin, $autologin, $viewonline = true);
						$session_id = $mx_user->session_id;


						// Reset login tries
						//$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']); // phpBB2
						$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_attempts = 0 WHERE user_id = ' . $row['user_id']); // phpBB3

						if( $session_id )
						{
							$fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&amp;', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx";
							$url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : $fromurl;
							mx_redirect(mx3_append_sid($url, false, false, $session_id));
						}
						else
						{
							mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
						}
					}
					else
					{
						// Although we weren't able to convert this password we have to
						// increase login attempt count to make sure this cannot be exploited
						$sql = '	UPDATE ' . USERS_TABLE . '
							SET user_login_attempts = user_login_attempts + 1
							WHERE user_id = ' . $row['user_id'];
						$db->sql_query($sql);

						$redirect = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : '';
						$redirect = str_replace('?', '&', $redirect);

						if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r"))
						{
							mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
						}

						$template->assign_vars(array(
							'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
						);

						$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], "<a href=\"login.$phpEx?redirect=$redirect\">", '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . mx3_append_sid("index.$phpEx") . '">', '</a>');

						mx_message_die(GENERAL_MESSAGE, $message);
					}
				}
				// Check password ...
				if (!$row['user_pass_convert'] && phpBB3::phpbb_check_hash($password, $row['user_password']))
				{
					if ($row['user_login_attempts'] != 0)
					{
						// Successful, reset login attempts (the user passed all stages)
						$sql = 'UPDATE ' . USERS_TABLE . '
							SET user_login_attempts = 0
							WHERE user_id = ' . $row['user_id'];
						$db->sql_query($sql);
					}

					// User inactive...
					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
					{
						mx_message_die(GENERAL_MESSAGE, 'Inactive User');
					}

					// Successful login... set user_login_attempts to zero...
					if( $session_id )
					{
						$url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx";
						mx_redirect(mx3_append_sid($url, false));
					}
					else
					{
						mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
					}
				}
			}
		}
	}
	else
	{
		$redirect = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : '';
		$redirect = str_replace("?", "&", $redirect);

		if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r"))
		{
			mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
		}

		$template->assign_vars(array(
			'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
		);

		$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], "<a href=\"login.$phpEx?redirect=$redirect\">", '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . mx3_append_sid("index.$phpEx") . '">', '</a>');
		mx_message_die(GENERAL_MESSAGE, $message);
	}
}
else if ($mx_request_vars->is_request('logout') && $userdata['session_logged_in'] )
{
	// session id check
	if ($sid == '' || $sid != $userdata['session_id'])
	{
		mx_message_die(GENERAL_ERROR, 'Invalid_session' . $userdata['session_id']);
	}

	if( $userdata['session_logged_in'] )
	{
		$mx_user->session_kill();
	}

	if (!$mx_request_vars->is_empty_request('redirect'))
	{
		$url = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS);
		$url = str_replace('&amp;', '&', $url);
		mx_redirect(mx3_append_sid($url, false));
	}
	else
	{
		mx_redirect(mx3_append_sid("index.$phpEx", false));
	}
}
else
{
	$url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&amp;', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx";
	mx_redirect(mx3_append_sid($url, false));
}
?>
--- NEW FILE: functions.php ---
<?php
/**
*
* @package Auth
* @version $Id: functions.php,v 1.1 2014/09/15 21:14:57 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined( 'IN_PORTAL' ) )
{
	die( "Hacking attempt" );
}

/**
* Ascraeus Parse cfg file
*/
function mx_parse_cfg_file($filename, $lines = false)
{
	$parsed_items = array();

	if ($lines === false)
	{
		$lines = file($filename);
	}

	foreach ($lines as $line)
	{
		$line = trim($line);

		if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false)
		{
			continue;
		}

		// Determine first occurrence, since in values the equal sign is allowed
		$key = htmlspecialchars(strtolower(trim(substr($line, 0, $delim_pos))));
		$value = trim(substr($line, $delim_pos + 1));

		if (in_array($value, array('off', 'false', '0')))
		{
			$value = false;
		}
		else if (in_array($value, array('on', 'true', '1')))
		{
			$value = true;
		}
		else if (!trim($value))
		{
			$value = '';
		}
		else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"'))
		{
			$value = htmlspecialchars(substr($value, 1, sizeof($value)-2));
		}
		else
		{
			$value = htmlspecialchars($value);
		}

		$parsed_items[$key] = $value;
	}

	if (isset($parsed_items['parent']) && isset($parsed_items['name']) && $parsed_items['parent'] == $parsed_items['name'])
	{
		unset($parsed_items['parent']);
	}

	return $parsed_items;
}

/**
* Add log event
*/
function mx_add_log()
{
	global $db, $mx_user;

	$args = func_get_args();

	$mode			= array_shift($args);
	$reportee_id	= ($mode == 'user') ? intval(array_shift($args)) : '';
	$forum_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
	$topic_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
	$action			= array_shift($args);
	$data			= (!sizeof($args)) ? '' : serialize($args);

	$sql_ary = array(
		'user_id'		=> (empty($mx_user->data)) ? ANONYMOUS : $mx_user->data['user_id'],
		'log_ip'		=> $mx_user->ip,
		'log_time'		=> time(),
		'log_operation'	=> $action,
		'log_data'		=> $data,
	);

	switch ($mode)
	{
		case 'admin':
			$sql_ary['log_type'] = LOG_ADMIN;
		break;

		case 'mod':
			$sql_ary += array(
				'log_type'	=> LOG_MOD,
				'forum_id'	=> $forum_id,
				'topic_id'	=> $topic_id
			);
		break;

		case 'user':
			$sql_ary += array(
				'log_type'		=> LOG_USERS,
				'reportee_id'	=> $reportee_id
			);
		break;

		case 'critical':
			$sql_ary['log_type'] = LOG_CRITICAL;
		break;

		default:
			return false;
	}

	$db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));

	return $db->sql_nextid();
}

/**
* Generate sort selection fields
*/
function mx_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)
{
	global $mx_user;

	$sort_dir_text = array('a' => $mx_user->lang['ASCENDING'], 'd' => $mx_user->lang['DESCENDING']);

	// Check if the key is selectable. If not, we reset to the first key found.
	// This ensures the values are always valid.
	if (!isset($limit_days[$sort_days]))
	{
		@reset($limit_days);
		$sort_days = key($limit_days);
	}

	if (!isset($sort_by_text[$sort_key]))
	{
		@reset($sort_by_text);
		$sort_key = key($sort_by_text);
	}

	if (!isset($sort_dir_text[$sort_dir]))
	{
		@reset($sort_dir_text);
		$sort_dir = key($sort_dir_text);
	}

	$s_limit_days = '<select name="st">';
	foreach ($limit_days as $day => $text)
	{
		$selected = ($sort_days == $day) ? ' selected="selected"' : '';
		$s_limit_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
	}
	$s_limit_days .= '</select>';

	$s_sort_key = '<select name="sk">';
	foreach ($sort_by_text as $key => $text)
	{
		$selected = ($sort_key == $key) ? ' selected="selected"' : '';
		$s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
	}
	$s_sort_key .= '</select>';

	$s_sort_dir = '<select name="sd">';
	foreach ($sort_dir_text as $key => $value)
	{
		$selected = ($sort_dir == $key) ? ' selected="selected"' : '';
		$s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
	}
	$s_sort_dir .= '</select>';

	$u_sort_param = "st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";

	return;
}

/**
* Get username details for placing into templates.
*
* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour) or full (for obtaining a html string representing a coloured link to the users profile).
* @param int $user_id The users id
* @param string $username The users name
* @param string $username_colour The users colour
* @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
* @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
*
* @return string A string consisting of what is wanted based on $mode.
*/
function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
{
	global $phpbb_root_path, $phpEx, $mx_user, $phpbb_auth;

	$profile_url = '';
	$username_colour = ($username_colour) ? '#' . $username_colour : '';

	if ($guest_username === false)
	{
		$username = ($username) ? $username : $mx_user->lang['GUEST'];
	}
	else
	{
		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']);
	}

	// Only show the link if not anonymous
	if ($user_id && $user_id != ANONYMOUS)
	{
		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
		// For all others the link leads to a login page or the profile.
		if ($mx_user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
		{
			$profile_url = '';
		}
		else
		{
			$profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
			$profile_url .= '&amp;u=' . (int) $user_id;
		}
	}
	else
	{
		$profile_url = '';
	}

	switch ($mode)
	{
		case 'profile':
			return $profile_url;
		break;

		case 'username':
			return $username;
		break;

		case 'colour':
			return $username_colour;
		break;

		case 'full':
		default:

			$tpl = '';
			if (!$profile_url && !$username_colour)
			{
				$tpl = '{USERNAME}';
			}
			else if (!$profile_url && $username_colour)
			{
				$tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
			}
			else if ($profile_url && !$username_colour)
			{
				$tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>';
			}
			else if ($profile_url && $username_colour)
			{
				$tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
			}

			return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl);
		break;
	}
}
?>
--- NEW FILE: core.php ---
<?php
/**
*
* @package Auth
* @version $Id: core.php,v 1.1 2014/09/15 21:14:56 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined( 'IN_PORTAL' ) )
{
	die( "Hacking attempt" );
}

//
// First off, include common vanilla phpBB functions, from our shared dir
// Note: These functions will later be accessible wrapped as phpBBX::orig_functionname()
[...1519 lines suppressed...]
				$phpbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
			}
			else
			{
				$phpbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
			}
		}

		$phpbb_version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>';

		return $phpbb_version_info;
	}
}

//
// Now load some bbcodes, to be extended for this backend (see below)
//
include_once($mx_root_path . 'includes/sessions/ascraeus/bbcode.' . $phpEx); // BBCode associated functions

?>
--- NEW FILE: constants.php ---
<?php
/**
*
* @package Style
* @version $Id: constants.php,v 1.1 2014/09/15 21:14:56 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

/**
* Modifications:
* define -> @define
* to supress any notices since in mx_constants.php some are allready @@defined
*/

// User related
@define('ANONYMOUS', 1);

@define('USER_ACTIVATION_NONE', 0);
@define('USER_ACTIVATION_SELF', 1);
@define('USER_ACTIVATION_ADMIN', 2);
@define('USER_ACTIVATION_DISABLE', 3);

@define('AVATAR_UPLOAD', 1);
@define('AVATAR_REMOTE', 2);
@define('AVATAR_GALLERY', 3);

@define('USER_NORMAL', 0);
@define('USER_INACTIVE', 1);
@define('USER_IGNORE', 2);
@define('USER_FOUNDER', 3);

@define('INACTIVE_REGISTER', 1);
@define('INACTIVE_PROFILE', 2);
@define('INACTIVE_MANUAL', 3);
@define('INACTIVE_REMIND', 4);

// ACL
@define('ACL_NEVER', 0);
@define('ACL_YES', 1);
@define('ACL_NO', -1);

// Login error codes
@define('LOGIN_CONTINUE', 1);
@define('LOGIN_BREAK', 2);
@define('LOGIN_SUCCESS', 3);
@define('LOGIN_SUCCESS_CREATE_PROFILE', 20);
@define('LOGIN_ERROR_USERNAME', 10);
@define('LOGIN_ERROR_PASSWORD', 11);
@define('LOGIN_ERROR_ACTIVE', 12);
@define('LOGIN_ERROR_ATTEMPTS', 13);
@define('LOGIN_ERROR_EXTERNAL_AUTH', 14);
@define('LOGIN_ERROR_PASSWORD_CONVERT', 15);

// SQL codes phpBB2
@define('BEGIN_TRANSACTION', 1);
@define('END_TRANSACTION', 2);

// Error codes (from phpbb2)
@define('GENERAL_MESSAGE', 200);
@define('GENERAL_ERROR', 202);
@define('CRITICAL_MESSAGE', 203);
@define('CRITICAL_ERROR', 204);

// Group settings
@define('GROUP_OPEN', 0);
@define('GROUP_CLOSED', 1);
@define('GROUP_HIDDEN', 2);
@define('GROUP_SPECIAL', 3);
@define('GROUP_FREE', 4);

// Forum/Topic states
@define('FORUM_CAT', 0);
@define('FORUM_POST', 1);
@define('FORUM_LINK', 2);
@define('ITEM_UNLOCKED', 0);
@define('ITEM_LOCKED', 1);
@define('ITEM_MOVED', 2);

// Forum Flags
@define('FORUM_FLAG_LINK_TRACK', 1);
@define('FORUM_FLAG_PRUNE_POLL', 2);
@define('FORUM_FLAG_PRUNE_ANNOUNCE', 4);
@define('FORUM_FLAG_PRUNE_STICKY', 8);
@define('FORUM_FLAG_ACTIVE_TOPICS', 16);
@define('FORUM_FLAG_POST_REVIEW', 32);

// Optional text flags
@define('OPTION_FLAG_BBCODE', 1);
@define('OPTION_FLAG_SMILIES', 2);
@define('OPTION_FLAG_LINKS', 4);

// Topic types
@define('POST_NORMAL', 0);
@define('POST_STICKY', 1);
@define('POST_ANNOUNCE', 2);
@define('POST_GLOBAL', 3);

// Lastread types
@define('TRACK_NORMAL', 0);
@define('TRACK_POSTED', 1);

// Notify methods
@define('NOTIFY_EMAIL', 0);
@define('NOTIFY_IM', 1);
@define('NOTIFY_BOTH', 2);

// Email Priority Settings
@define('MAIL_LOW_PRIORITY', 4);
@define('MAIL_NORMAL_PRIORITY', 3);
@define('MAIL_HIGH_PRIORITY', 2);

// Log types
@define('LOG_ADMIN', 0);
@define('LOG_MOD', 1);
@define('LOG_CRITICAL', 2);
@define('LOG_USERS', 3);

// Private messaging - Do NOT change these values
@define('PRIVMSGS_HOLD_BOX', -4);
@define('PRIVMSGS_NO_BOX', -3);
@define('PRIVMSGS_OUTBOX', -2);
@define('PRIVMSGS_SENTBOX', -1);
@define('PRIVMSGS_INBOX', 0);

// Full Folder Actions
@define('FULL_FOLDER_NONE', -3);
@define('FULL_FOLDER_DELETE', -2);
@define('FULL_FOLDER_HOLD', -1);

// Download Modes - Attachments
@define('INLINE_LINK', 1);
// This mode is only used internally to allow modders extending the attachment functionality
@define('PHYSICAL_LINK', 2);

// Confirm types
@define('CONFIRM_REG', 1);
@define('CONFIRM_LOGIN', 2);
@define('CONFIRM_POST', 3);

// Categories - Attachments
@define('ATTACHMENT_CATEGORY_NONE', 0);
@define('ATTACHMENT_CATEGORY_IMAGE', 1); // Inline Images
@define('ATTACHMENT_CATEGORY_WM', 2); // Windows Media Files - Streaming
@define('ATTACHMENT_CATEGORY_RM', 3); // Real Media Files - Streaming
@define('ATTACHMENT_CATEGORY_THUMB', 4); // Not used within the database, only while displaying posts
@define('ATTACHMENT_CATEGORY_FLASH', 5); // Flash/SWF files
@define('ATTACHMENT_CATEGORY_QUICKTIME', 6); // Quicktime/Mov files

// BBCode UID length
@define('BBCODE_UID_LEN', 5);

// Number of core BBCodes
@define('NUM_CORE_BBCODES', 12);

// Magic url types
@define('MAGIC_URL_EMAIL', 1);
@define('MAGIC_URL_FULL', 2);
@define('MAGIC_URL_LOCAL', 3);
@define('MAGIC_URL_WWW', 4);

// Profile Field Types
@define('FIELD_INT', 1);
@define('FIELD_STRING', 2);
@define('FIELD_TEXT', 3);
@define('FIELD_BOOL', 4);
@define('FIELD_DROPDOWN', 5);
@define('FIELD_DATE', 6);

// referer validation
define('REFERER_VALIDATE_NONE', 0);
define('REFERER_VALIDATE_HOST', 1);
define('REFERER_VALIDATE_PATH', 2);

// phpbb_chmod() permissions
@define('CHMOD_ALL', 7);
@define('CHMOD_READ', 4);
@define('CHMOD_WRITE', 2);
@define('CHMOD_EXECUTE', 1);

// Captcha code length
define('CAPTCHA_MIN_CHARS', 4);
define('CAPTCHA_MAX_CHARS', 7);

// Additional constants
define('VOTE_CONVERTED', 127);

// Additional constants
@define('RANKS_PATH', 'images/ranks/');

// Table names
@define('ACL_GROUPS_TABLE',			$table_prefix . 'acl_groups');
@define('ACL_OPTIONS_TABLE',			$table_prefix . 'acl_options');
@define('ACL_ROLES_DATA_TABLE',		$table_prefix . 'acl_roles_data');
@define('ACL_ROLES_TABLE',			$table_prefix . 'acl_roles');
@define('ACL_USERS_TABLE',			$table_prefix . 'acl_users');
@define('ATTACHMENTS_TABLE',			$table_prefix . 'attachments');
@define('BANLIST_TABLE',				$table_prefix . 'banlist');
@define('BBCODES_TABLE',				$table_prefix . 'bbcodes');
@define('BOOKMARKS_TABLE',			$table_prefix . 'bookmarks');
@define('BOTS_TABLE',				$table_prefix . 'bots');
@define('CONFIG_TABLE',				$table_prefix . 'config');
@define('CONFIRM_TABLE',				$table_prefix . 'confirm');
@define('DISALLOW_TABLE',			$table_prefix . 'disallow');
@define('DRAFTS_TABLE',				$table_prefix . 'drafts');
@define('EXTENSIONS_TABLE',			$table_prefix . 'extensions');
@define('EXTENSION_GROUPS_TABLE',	$table_prefix . 'extension_groups');
@define('FORUMS_TABLE',				$table_prefix . 'forums');
@define('FORUMS_ACCESS_TABLE',		$table_prefix . 'forums_access');
@define('FORUMS_TRACK_TABLE',		$table_prefix . 'forums_track');
@define('FORUMS_WATCH_TABLE',		$table_prefix . 'forums_watch');
@define('GROUPS_TABLE',				$table_prefix . 'groups');
@define('ICONS_TABLE',				$table_prefix . 'icons');
@define('LANG_TABLE',				$table_prefix . 'lang');
@define('LOG_TABLE',					$table_prefix . 'log');
@define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
@define('MODULES_TABLE',				$table_prefix . 'modules');
@define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
@define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
@define('POSTS_TABLE',				$table_prefix . 'posts');
@define('PRIVMSGS_TABLE',			$table_prefix . 'privmsgs');
@define('PRIVMSGS_FOLDER_TABLE',		$table_prefix . 'privmsgs_folder');
@define('PRIVMSGS_RULES_TABLE',		$table_prefix . 'privmsgs_rules');
@define('PRIVMSGS_TO_TABLE',			$table_prefix . 'privmsgs_to');
@define('PROFILE_FIELDS_TABLE',		$table_prefix . 'profile_fields');
@define('PROFILE_FIELDS_DATA_TABLE',	$table_prefix . 'profile_fields_data');
@define('PROFILE_FIELDS_LANG_TABLE',	$table_prefix . 'profile_fields_lang');
@define('PROFILE_LANG_TABLE',		$table_prefix . 'profile_lang');
@define('RANKS_TABLE',				$table_prefix . 'ranks');
@define('REPORTS_TABLE',				$table_prefix . 'reports');
@define('REPORTS_REASONS_TABLE',		$table_prefix . 'reports_reasons');
@define('SEARCH_RESULTS_TABLE',		$table_prefix . 'search_results');
@define('SEARCH_WORDLIST_TABLE',		$table_prefix . 'search_wordlist');
@define('SEARCH_WORDMATCH_TABLE',	$table_prefix . 'search_wordmatch');
@define('SESSIONS_TABLE',			$table_prefix . 'sessions');
@define('SESSIONS_KEYS_TABLE',		$table_prefix . 'sessions_keys');
@define('SITELIST_TABLE',			$table_prefix . 'sitelist');
@define('SMILIES_TABLE',				$table_prefix . 'smilies');
@define('STYLES_TABLE',				$table_prefix . 'styles');
@define('STYLES_TEMPLATE_TABLE',		$table_prefix . 'styles_template');
@define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data');
@define('STYLES_THEME_TABLE',		$table_prefix . 'styles_theme');
@define('STYLES_IMAGESET_TABLE',		$table_prefix . 'styles_imageset');
@define('STYLES_IMAGESET_DATA_TABLE',$table_prefix . 'styles_imageset_data');
@define('TOPICS_TABLE',				$table_prefix . 'topics');
@define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
@define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
@define('TOPICS_WATCH_TABLE',		$table_prefix . 'topics_watch');
@define('USER_GROUP_TABLE',			$table_prefix . 'user_group');
@define('USERS_TABLE',				$table_prefix . 'users');
@define('WARNINGS_TABLE',			$table_prefix . 'warnings');
@define('WORDS_TABLE',				$table_prefix . 'words');
@define('ZEBRA_TABLE',				$table_prefix . 'zebra');

// Additional tables

// Additional constants
@define('INHERIT_LANG_NONE', 0);
@define('INHERIT_LANG_EN', 1);
@define('INHERIT_LANG_DEFAULT', 2);
?>
--- NEW FILE: bbcode.php ---
<?php
/**
*
* @package Functions_phpBB
* @version $Id: bbcode.php,v 1.1 2014/09/15 21:14:56 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if (!defined('IN_PORTAL'))
{
	exit;
}

/*
* Here comes a mxp version of phpbb2 bbcode.php ported to phpbb3 backend
* Last in file are the mxp wrapper functions
[...2040 lines suppressed...]
						'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies"))
					);
				}

				$template->assign_vars(array(
					'L_EMOTICONS' => $lang['Emoticons'],
					'L_CLOSE_WINDOW' => $lang['Close_window'],
					'S_SMILIES_COLSPAN' => $s_colspan)
				);
			}
		}

		if ($mode == 'window')
		{
			$template->pparse('smiliesbody');
			include($mx_root_path . 'includes/page_tail.'.$phpEx);
		}
	}
}
?>
--- NEW FILE: session.php ---
<?php
/**
*
* @package Style
* @version $Id: session.php,v 1.1 2014/09/15 21:14:57 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2005 The phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
*/

if ( !defined('IN_PORTAL') )
{
	die("Hacking attempt");
}

/**
 * Modifications:
 *		- replaced $config -> $board_config - by Jon
[...3761 lines suppressed...]
				case 'zh':
					$lang_name = 'chinese';
				break;
				case 'zh_cmn_hans':
					$lang_name = 'chinese_simplified';
				break;
				case 'zh_cmn_hant':
					$lang_name = 'chinese_traditional';
				break;
				case 'zu':
					$lang_name = 'zulu';
				break;
				default:
					$lang_name = $lang;
					break;
			}
		return $lang_name;
	}
}
?>
--- NEW FILE: auth.php ---
<?php
/**
*
* @package Auth
* @version $Id: auth.php,v 1.1 2014/09/15 21:14:56 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://mxpcms.sourceforge.net/
*
namespace phpbb\phpbb_auth;
*/
if ( !defined( 'IN_PORTAL' ) )
{
	die( "Hacking attempt" );
}
/**
* Permission/Auth class for phpBB3 forums
* @package MX-Publisher
*/
class phpbb_auth_base
{
	var $acl = array();
	var $cache = array();
	var $acl_options = array();
	var $acl_forum_ids = false;

	/**
	* Init permissions
	*/
	function acl(&$userdata)
	{
		global $db, $mx_cache;

		$this->acl = $this->cache = $this->acl_options = array();
		$this->acl_forum_ids = false;

		if (($this->acl_options = $mx_cache->get('_acl_options')) === false)
		{
			$sql = 'SELECT auth_option_id, auth_option, is_global, is_local
				FROM ' . ACL_OPTIONS_TABLE . '
				ORDER BY auth_option_id';
			$result = $db->sql_query($sql);

			$global = $local = 0;
			$this->acl_options = array();
			while ($row = $db->sql_fetchrow($result))
			{
				if ($row['is_global'])
				{
					$this->acl_options['global'][$row['auth_option']] = $global++;
				}

				if ($row['is_local'])
				{
					$this->acl_options['local'][$row['auth_option']] = $local++;
				}
				$this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id'];
				$this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option'];
			}
			$db->sql_freeresult($result);

			$mx_cache->put('_acl_options', $this->acl_options);
			$this->acl_cache($userdata);
		}
		else if (!trim($userdata['user_permissions']))
		{
			$this->acl_cache($userdata);
		}

		$user_permissions = explode("\n", $userdata['user_permissions']);

		foreach ($user_permissions as $f => $seq)
		{
			if ($seq)
			{
				$i = 0;

				if (!isset($this->acl[$f]))
				{
					$this->acl[$f] = '';
				}

				while ($subseq = substr($seq, $i, 6))
				{
					// We put the original bitstring into the acl array
					$this->acl[$f] .= str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
					$i += 6;
				}
			}
		}

		return;
	}

	/**
	* Look up an option
	* if the option is prefixed with !, then the result becomes negated
	*
	* If a forum id is specified the local option will be combined with a global option if one exist.
	* If a forum id is not specified, only the global option will be checked.
	*/
	function acl_get($opt, $f = 0)
	{
		$negate = false;

		if (strpos($opt, '!') === 0)
		{
			$negate = true;
			$opt = substr($opt, 1);
		}

		if (!isset($this->cache[$f][$opt]))
		{
			// We combine the global/local option with an OR because some options are global and local.
			// If the user has the global permission the local one is true too and vice versa
			$this->cache[$f][$opt] = false;

			// Is this option a global permission setting?
			if (isset($this->acl_options['global'][$opt]))
			{
				if (isset($this->acl[0]))
				{
					$this->cache[$f][$opt] = $this->acl[0][$this->acl_options['global'][$opt]];
				}
			}

			// Is this option a local permission setting?
			// But if we check for a global option only, we won't combine the options...
			if ($f != 0 && isset($this->acl_options['local'][$opt]))
			{
				if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]]))
				{
					$this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
				}
			}
		}

		// Founder always has all global options set to true...
		return ($negate) ? !$this->cache[$f][$opt] : $this->cache[$f][$opt];
	}

	/**
	* Get forums with the specified permission setting
	* if the option is prefixed with !, then the result becomes nagated
	*
	* @param bool $clean set to true if only values needs to be returned which are set/unset
	*/
	function acl_getf($opt, $clean = false)
	{
		$acl_f = array();
		$negate = false;

		if (strpos($opt, '!') === 0)
		{
			$negate = true;
			$opt = substr($opt, 1);
		}

		// If we retrieve a list of forums not having permissions in, we need to get every forum_id
		if ($negate)
		{
			if ($this->acl_forum_ids === false)
			{
				global $db;

				$sql = 'SELECT forum_id
					FROM ' . FORUMS_TABLE;

				if (sizeof($this->acl))
				{
					$sql .= ' WHERE ' . $db->sql_in_set('forum_id', array_keys($this->acl), true);
				}
				$result = $db->sql_query($sql);

				$this->acl_forum_ids = array();
				while ($row = $db->sql_fetchrow($result))
				{
					$this->acl_forum_ids[] = $row['forum_id'];
				}
				$db->sql_freeresult($result);
			}
		}

		if (isset($this->acl_options['local'][$opt]))
		{
			foreach ($this->acl as $f => $bitstring)
			{
				// Skip global settings
				if (!$f)
				{
					continue;
				}

				$allowed = (!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt];

				if (!$clean)
				{
					$acl_f[$f][$opt] = ($negate) ? !$allowed : $allowed;
				}
				else
				{
					if (($negate && !$allowed) || (!$negate && $allowed))
					{
						$acl_f[$f][$opt] = 1;
					}
				}
			}
		}

		// If we get forum_ids not having this permission, we need to fill the remaining parts
		if ($negate && sizeof($this->acl_forum_ids))
		{
			foreach ($this->acl_forum_ids as $f)
			{
				$acl_f[$f][$opt] = 1;
			}
		}

		return $acl_f;
	}

	/**
	* Get local permission state for any forum.
	*
	* Returns true if user has the permission in one or more forums, false if in no forum.
	* If global option is checked it returns the global state (same as acl_get($opt))
	* Local option has precedence...
	*/
	function acl_getf_global($opt)
	{
		if (is_array($opt))
		{
			// evaluates to true as soon as acl_getf_global is true for one option
			foreach ($opt as $check_option)
			{
				if ($this->acl_getf_global($check_option))
				{
					return true;
				}
			}

			return false;
		}

		if (isset($this->acl_options['local'][$opt]))
		{
			foreach ($this->acl as $f => $bitstring)
			{
				// Skip global settings
				if (!$f)
				{
					continue;
				}

				// as soon as the user has any permission we're done so return true
				if ((!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt])
				{
					return true;
				}
			}
		}
		else if (isset($this->acl_options['global'][$opt]))
		{
			return $this->acl_get($opt);
		}

		return false;
	}

	/**
	* Get permission settings (more than one)
	*/
	function acl_gets()
	{
		$args = func_get_args();
		$f = array_pop($args);

		if (!is_numeric($f))
		{
			$args[] = $f;
			$f = 0;
		}

		// alternate syntax: acl_gets(array('m_', 'a_'), $forum_id)
		if (is_array($args[0]))
		{
			$args = $args[0];
		}

		$acl = 0;
		foreach ($args as $opt)
		{
			$acl |= $this->acl_get($opt, $f);
		}

		return $acl;
	}

	/**
	* Get permission listing based on user_id/options/forum_ids
	*/
	function acl_get_list($user_id = false, $opts = false, $forum_id = false)
	{
		if ($user_id !== false && !is_array($user_id) && $opts === false && $forum_id === false)
		{
			$hold_ary = array($user_id => $this->acl_raw_data_single_user($user_id));
		}
		else
		{
			$hold_ary = $this->acl_raw_data($user_id, $opts, $forum_id);
		}

		$auth_ary = array();
		foreach ($hold_ary as $user_id => $forum_ary)
		{
			foreach ($forum_ary as $forum_id => $auth_option_ary)
			{
				foreach ($auth_option_ary as $auth_option => $auth_setting)
				{
					if ($auth_setting)
					{
						$auth_ary[$forum_id][$auth_option][] = $user_id;
					}
				}
			}
		}

		return $auth_ary;
	}

	/**
	* Cache data to user_permissions row
	*/
	function acl_cache(&$userdata)
	{
		global $db;

		// Empty user_permissions
		$userdata['user_permissions'] = '';

		$hold_ary = $this->acl_raw_data_single_user($userdata['user_id']);

		// Key 0 in $hold_ary are global options, all others are forum_ids

		// If this user is founder we're going to force fill the admin options ...
		if ($userdata['user_type'] == USER_FOUNDER)
		{
			foreach ($this->acl_options['global'] as $opt => $id)
			{
				if (strpos($opt, 'a_') === 0)
				{
					$hold_ary[0][$this->acl_options['id'][$opt]] = ACL_YES;
				}
			}
		}

		$hold_str = $this->build_bitstring($hold_ary);

		if ($hold_str)
		{
			$userdata['user_permissions'] = $hold_str;

			$sql = 'UPDATE ' . USERS_TABLE . "
				SET user_permissions = '" . $db->sql_escape($userdata['user_permissions']) . "',
					user_perm_from = 0
				WHERE user_id = " . $userdata['user_id'];
			$db->sql_query($sql);
		}

		return;
	}

	/**
	* Build bitstring from permission set
	*/
	function build_bitstring(&$hold_ary)
	{
		$hold_str = '';

		if (sizeof($hold_ary))
		{
			ksort($hold_ary);

			$last_f = 0;

			foreach ($hold_ary as $f => $auth_ary)
			{
				$ary_key = (!$f) ? 'global' : 'local';

				$bitstring = array();
				foreach ($this->acl_options[$ary_key] as $opt => $id)
				{
					if (isset($auth_ary[$this->acl_options['id'][$opt]]))
					{
						$bitstring[$id] = $auth_ary[$this->acl_options['id'][$opt]];

						$option_key = substr($opt, 0, strpos($opt, '_') + 1);

						// If one option is allowed, the global permission for this option has to be allowed too
						// example: if the user has the a_ permission this means he has one or more a_* permissions
						if ($auth_ary[$this->acl_options['id'][$opt]] == ACL_YES && (!isset($bitstring[$this->acl_options[$ary_key][$option_key]]) || $bitstring[$this->acl_options[$ary_key][$option_key]] == ACL_NEVER))
						{
							$bitstring[$this->acl_options[$ary_key][$option_key]] = ACL_YES;
						}
					}
					else
					{
						$bitstring[$id] = ACL_NEVER;
					}
				}

				// Now this bitstring defines the permission setting for the current forum $f (or global setting)
				$bitstring = implode('', $bitstring);

				// The line number indicates the id, therefore we have to add empty lines for those ids not present
				$hold_str .= str_repeat("\n", $f - $last_f);

				// Convert bitstring for storage - we do not use binary/bytes because PHP's string functions are not fully binary safe
				for ($i = 0, $bit_length = strlen($bitstring); $i < $bit_length; $i += 31)
				{
					$hold_str .= str_pad(base_convert(str_pad(substr($bitstring, $i, 31), 31, 0, STR_PAD_RIGHT), 2, 36), 6, 0, STR_PAD_LEFT);
				}

				$last_f = $f;
			}
			unset($bitstring);

			$hold_str = rtrim($hold_str);
		}

		return $hold_str;
	}

	/**
	* Clear one or all users cached permission settings
	*/
	function acl_clear_prefetch($user_id = false)
	{
		global $db, $mx_cache;

		// Rebuild options cache
		$mx_cache->destroy('_role_cache');

		$sql = 'SELECT *
			FROM ' . ACL_ROLES_DATA_TABLE . '
			ORDER BY role_id ASC';
		$result = $db->sql_query($sql);

		$this->role_cache = array();
		while ($row = $db->sql_fetchrow($result))
		{
			$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting'];
		}
		$db->sql_freeresult($result);

		foreach ($this->role_cache as $role_id => $role_options)
		{
			$this->role_cache[$role_id] = serialize($role_options);
		}

		$mx_cache->put('_role_cache', $this->role_cache);

		// Now empty user permissions

		$where_sql = '';

		if ($user_id !== false)
		{
			$user_id = (!is_array($user_id)) ? $user_id = array((int) $user_id) : array_map('intval', $user_id);
			$where_sql = ' WHERE ' . $db->sql_in_set('user_id', $user_id);
		}

		$sql = 'UPDATE ' . USERS_TABLE . "
			SET user_permissions = '',
				user_perm_from = 0
			$where_sql";
		$db->sql_query($sql);

		return;
	}

	/**
	* Get assigned roles
	*/
	function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false)
	{
		global $db;

		$roles = array();

		$sql_id = ($user_type == 'user') ? 'user_id' : 'group_id';

		$sql_ug = ($ug_id !== false) ? ((!is_array($ug_id)) ? "AND a.$sql_id = $ug_id" : 'AND ' . $db->sql_in_set("a.$sql_id", $ug_id)) : '';
		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND ' . $db->sql_in_set('a.forum_id', $forum_id)) : '';

		// Grab assigned roles...
		$sql = 'SELECT a.auth_role_id, a.' . $sql_id . ', a.forum_id
			FROM ' . (($user_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE) . ' a, ' . ACL_ROLES_TABLE . " r
			WHERE a.auth_role_id = r.role_id
				AND r.role_type = '" . $db->sql_escape($role_type) . "'
				$sql_ug
				$sql_forum
			ORDER BY r.role_order ASC";
		$result = $db->sql_query($sql);

		while ($row = $db->sql_fetchrow($result))
		{
			$roles[$row[$sql_id]][$row['forum_id']] = $row['auth_role_id'];
		}
		$db->sql_freeresult($result);

		return $roles;
	}

	/**
	* Get raw acl data based on user/option/forum
	*/
	function acl_raw_data($user_id = false, $opts = false, $forum_id = false)
	{
		global $db;

		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : '';
		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';

		$sql_opts = $sql_opts_select = $sql_opts_from = '';
		$hold_ary = array();

		if ($opts !== false)
		{
			$sql_opts_select = ', ao.auth_option';
			$sql_opts_from = ', ' . ACL_OPTIONS_TABLE . ' ao';
			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
		}

		$sql_ary = array();

		// Grab non-role settings - user-specific
		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . '
			FROM ' . ACL_USERS_TABLE . ' a' . $sql_opts_from . '
			WHERE a.auth_role_id = 0 ' .
				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') .
				(($sql_user) ? 'AND a.' . $sql_user : '') . "
				$sql_forum
				$sql_opts";

		// Now the role settings - user-specific
		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . '
			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . '
			WHERE a.auth_role_id = r.role_id ' .
				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') .
				(($sql_user) ? 'AND a.' . $sql_user : '') . "
				$sql_forum
				$sql_opts";

		foreach ($sql_ary as $sql)
		{
			$result = $db->sql_query($sql);

			while ($row = $db->sql_fetchrow($result))
			{
				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']];
				$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting'];
			}
			$db->sql_freeresult($result);
		}

		$sql_ary = array();

		// Now grab group settings - non-role specific...
		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . '
			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug' . $sql_opts_from . '
			WHERE a.auth_role_id = 0 ' .
				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . '
				AND a.group_id = ug.group_id
				AND ug.user_pending = 0
				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
				$sql_forum
				$sql_opts";

		// Now grab group settings - role specific...
		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . '
			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . '
			WHERE a.auth_role_id = r.role_id ' .
				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . '
				AND a.group_id = ug.group_id
				AND ug.user_pending = 0
				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
				$sql_forum
				$sql_opts";

		foreach ($sql_ary as $sql)
		{
			$result = $db->sql_query($sql);

			while ($row = $db->sql_fetchrow($result))
			{
				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']];

				if (!isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) || (isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) && $hold_ary[$row['user_id']][$row['forum_id']][$option] != ACL_NEVER))
				{
					$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting'];

					// If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again)
					if ($row['auth_setting'] == ACL_NEVER)
					{
						$flag = substr($option, 0, strpos($option, '_') + 1);

						if (isset($hold_ary[$row['user_id']][$row['forum_id']][$flag]) && $hold_ary[$row['user_id']][$row['forum_id']][$flag] == ACL_YES)
						{
							unset($hold_ary[$row['user_id']][$row['forum_id']][$flag]);

/*							if (in_array(ACL_YES, $hold_ary[$row['user_id']][$row['forum_id']]))
							{
								$hold_ary[$row['user_id']][$row['forum_id']][$flag] = ACL_YES;
							}
*/
						}
					}
				}
			}
			$db->sql_freeresult($result);
		}

		return $hold_ary;
	}

	/**
	* Get raw user based permission settings
	*/
	function acl_user_raw_data($user_id = false, $opts = false, $forum_id = false)
	{
		global $db;

		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : '';
		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';

		$sql_opts = '';
		$hold_ary = $sql_ary = array();

		if ($opts !== false)
		{
			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
		}

		// Grab user settings - non-role specific...
		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
			WHERE a.auth_role_id = 0
				AND a.auth_option_id = ao.auth_option_id ' .
				(($sql_user) ? 'AND a.' . $sql_user : '') . "
				$sql_forum
				$sql_opts
			ORDER BY a.forum_id, ao.auth_option";

		// Now the role settings - user-specific
		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id, ao.auth_option
			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
			WHERE a.auth_role_id = r.role_id
				AND r.auth_option_id = ao.auth_option_id ' .
				(($sql_user) ? 'AND a.' . $sql_user : '') . "
				$sql_forum
				$sql_opts
			ORDER BY a.forum_id, ao.auth_option";

		foreach ($sql_ary as $sql)
		{
			$result = $db->sql_query($sql);

			while ($row = $db->sql_fetchrow($result))
			{
				$hold_ary[$row['user_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting'];
			}
			$db->sql_freeresult($result);
		}
		return $hold_ary;
	}

	/**
	* Get raw group based permission settings
	*/
	function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)
	{
		global $db;

		$sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : '';
		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';

		$sql_opts = '';
		$hold_ary = $sql_ary = array();

		if ($opts !== false)
		{
			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
		}

		// Grab group settings - non-role specific...
		$sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
			WHERE a.auth_role_id = 0
				AND a.auth_option_id = ao.auth_option_id ' .
				(($sql_group) ? 'AND a.' . $sql_group : '') . "
				$sql_forum
				$sql_opts
			ORDER BY a.forum_id, ao.auth_option";

		// Now grab group settings - role specific...
		$sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option
			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
			WHERE a.auth_role_id = r.role_id
				AND r.auth_option_id = ao.auth_option_id ' .
				(($sql_group) ? 'AND a.' . $sql_group : '') . "
				$sql_forum
				$sql_opts
			ORDER BY a.forum_id, ao.auth_option";

		foreach ($sql_ary as $sql)
		{
			$result = $db->sql_query($sql);

			while ($row = $db->sql_fetchrow($result))
			{
				$hold_ary[$row['group_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting'];
			}
			$db->sql_freeresult($result);
		}

		return $hold_ary;
	}

	/**
	* Get raw acl data based on user for caching user_permissions
	* This function returns the same data as acl_raw_data(), but without the user id as the first key within the array.
	*/
	function acl_raw_data_single_user($user_id)
	{
		global $db, $mx_cache;

		// Check if the role-cache is there
		if (($this->role_cache = $mx_cache->get('_role_cache')) === false)
		{
			$this->role_cache = array();

			// We pre-fetch roles
			$sql = 'SELECT *
				FROM ' . ACL_ROLES_DATA_TABLE . '
				ORDER BY role_id ASC';
			$result = $db->sql_query($sql);

			while ($row = $db->sql_fetchrow($result))
			{
				$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting'];
			}
			$db->sql_freeresult($result);

			foreach ($this->role_cache as $role_id => $role_options)
			{
				$this->role_cache[$role_id] = serialize($role_options);
			}

			$mx_cache->put('_role_cache', $this->role_cache);
		}

		$hold_ary = array();

		// Grab user-specific permission settings
		$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting
			FROM ' . ACL_USERS_TABLE . '
			WHERE user_id = ' . $user_id;
		$result = $db->sql_query($sql);

		while ($row = $db->sql_fetchrow($result))
		{
			// If a role is assigned, assign all options included within this role. Else, only set this one option.
			if ($row['auth_role_id'])
			{
				$hold_ary[$row['forum_id']] = (empty($hold_ary[$row['forum_id']])) ? unserialize($this->role_cache[$row['auth_role_id']]) : $hold_ary[$row['forum_id']] + unserialize($this->role_cache[$row['auth_role_id']]);
			}
			else
			{
				$hold_ary[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting'];
			}
		}
		$db->sql_freeresult($result);

		// Now grab group-specific permission settings
		$sql = 'SELECT a.forum_id, a.auth_option_id, a.auth_role_id, a.auth_setting
			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug
			WHERE a.group_id = ug.group_id
				AND ug.user_pending = 0
				AND ug.user_id = ' . $user_id;
		$result = $db->sql_query($sql);

		while ($row = $db->sql_fetchrow($result))
		{
			if (!$row['auth_role_id'])
			{
				$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']);
			}
			else
			{
				foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting)
				{
					$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $option_id, $setting);
				}
			}
		}
		$db->sql_freeresult($result);

		return $hold_ary;
	}

	/**
	* Private function snippet for setting a specific piece of the hold_ary
	*/
	function _set_group_hold_ary(&$hold_ary, $option_id, $setting)
	{
		if (!isset($hold_ary[$option_id]) || (isset($hold_ary[$option_id]) && $hold_ary[$option_id] != ACL_NEVER))
		{
			$hold_ary[$option_id] = $setting;

			// If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again)
			if ($setting == ACL_NEVER)
			{
				$flag = substr($this->acl_options['option'][$option_id], 0, strpos($this->acl_options['option'][$option_id], '_') + 1);
				$flag = (int) $this->acl_options['id'][$flag];

				if (isset($hold_ary[$flag]) && $hold_ary[$flag] == ACL_YES)
				{
					unset($hold_ary[$flag]);

/*					This is uncommented, because i suspect this being slightly wrong due to mixed permission classes being possible
					if (in_array(ACL_YES, $hold_ary))
					{
						$hold_ary[$flag] = ACL_YES;
					}*/
				}
			}
		}
	}

	/**
	* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
	*/
	function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
	{
		global $board_config, $db, $mx_user, $phpbb_root_path, $phpEx;

		$method = trim(basename($board_config['auth_method']));
		include_once($mx_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
		//$provider = $phpbb_container->get('auth.provider.' . $method);
		$method = 'login_' . $method;
		if (function_exists($method))
		{
			$login = $method($username, $password);

			// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
			if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE)
			{
				// we are going to use the user_add function so include functions_user.php if it wasn't defined yet
				if (!function_exists('user_add'))
				{
					include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
				}

				user_add($login['user_row'], (isset($login['cp_data'])) ? $login['cp_data'] : false);

				$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
					FROM ' . USERS_TABLE . "
					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
				$result = $db->sql_query($sql);
				$row = $db->sql_fetchrow($result);
				$db->sql_freeresult($result);

				if (!$row)
				{
					return array(
						'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
						'error_msg'		=> 'AUTH_NO_PROFILE_CREATED',
						'user_row'		=> array('user_id' => ANONYMOUS),
					);
				}

				$login = array(
					'status'	=> LOGIN_SUCCESS,
					'error_msg'	=> false,
					'user_row'	=> $row,
				);
			}

			// If login succeeded, we will log the user in... else we pass the login array through...
			if ($login['status'] == LOGIN_SUCCESS)
			{
				$old_session_id = $mx_user->session_id;

				if ($admin)
				{
					global $SID, $_SID;

					$cookie_expire = time() - 31536000;
					$mx_user->set_cookie('u', '', $cookie_expire);
					$mx_user->set_cookie('sid', '', $cookie_expire);
					unset($cookie_expire);

					$SID = '?sid=';
					$mx_user->session_id = $_SID = '';
				}

				$result = $mx_user->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline);

				// Successful session creation
				if ($result === true)
				{
					// If admin re-authentication we remove the old session entry because a new one has been created...
					if ($admin)
					{
						// the login array is used because the user ids do not differ for re-authentication
						$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
							WHERE session_id = '" . $db->sql_escape($old_session_id) . "'
							AND session_user_id = {$login['user_row']['user_id']}";
						$db->sql_query($sql);
					}

					return array(
						'status'		=> LOGIN_SUCCESS,
						'error_msg'		=> false,
						'user_row'		=> $login['user_row'],
					);
				}

				return array(
					'status'		=> LOGIN_BREAK,
					'error_msg'		=> $result,
					'user_row'		=> $login['user_row'],
				);
			}

			return $login;
		}

		trigger_error('Authentication method not found', E_USER_ERROR);
	}

	/**
	* Fill auth_option statement for later querying based on the supplied options
	*/
	function build_auth_option_statement($key, $auth_options, &$sql_opts)
	{
		global $db;

		if (!is_array($auth_options))
		{
			if (strpos($auth_options, '%') !== false)
			{
				$sql_opts = "AND $key " . $db->sql_like_expression(str_replace('%', $db->any_char, $auth_options));
			}
			else
			{
				$sql_opts = "AND $key = '" . $db->sql_escape($auth_options) . "'";
			}
		}
		else
		{
			$is_like_expression = false;

			foreach ($auth_options as $option)
			{
				if (strpos($option, '%') !== false)
				{
					$is_like_expression = true;
				}
			}

			if (!$is_like_expression)
			{
				$sql_opts = 'AND ' . $db->sql_in_set($key, $auth_options);
			}
			else
			{
				$sql = array();

				foreach ($auth_options as $option)
				{
					if (strpos($option, '%') !== false)
					{
						$sql[] = $key . ' ' . $db->sql_like_expression(str_replace('%', $db->any_char, $option));
					}
					else
					{
						$sql[] = $key . " = '" . $db->sql_escape($option) . "'";
					}
				}

				$sql_opts = 'AND (' . implode(' OR ', $sql) . ')';
			}
		}
	}
}
?>
--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>