[ros-diffs] [cfinck] 33641: Part 2 of the phpBB 3.x RosCMS Integration - The Login System - Change the login_box function to use roscms_subsys_login and don't use the auto-refresh pages. - Change ucp.php to disable some commands, which have to be done by RosCMS and use the /roscms/?page=logout for logging out. - Write a new authorization module "roscms", make it the default at installation. - Remove all other authorization modules we don't need. - Remove the "Delete Board Cookies" feature (makes no sense as

Author: cfinck
Date: Thu May 22 11:22:57 2008
New Revision: 33641

URL: http://svn.reactos.org/svn/reactos?rev=33641&view=rev
Log:
Part 2 of the phpBB 3.x RosCMS Integration - The Login System
- Change the login_box function to use roscms_subsys_login and don't use the
auto-refresh pages.
- Change ucp.php to disable some commands, which have to be done by RosCMS and use the
/roscms/?page=logout for logging out.
- Write a new authorization module "roscms", make it the default at
installation.
- Remove all other authorization modules we don't need.
- Remove the "Delete Board Cookies" feature (makes no sense as it doesn't
delete the RosCMS cookies) and the quick login on the board index.

phpBB 3 is now ready for the Website! :-)

Added:
    trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php
Removed:
    trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php
    trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php
    trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php
Modified:
    trunk/web/reactos.org/htdocs/forum/   (props changed)
    trunk/web/reactos.org/htdocs/forum/includes/functions.php
    trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql
    trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html
    trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
    trunk/web/reactos.org/htdocs/forum/ucp.php

Propchange: trunk/web/reactos.org/htdocs/forum/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May 22 11:22:57 2008
@@ -1,0 +1,1 @@
+config.php

Removed: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php [iso-8859-1]
(original)
+++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php (removed)
@@ -1,241 +1,0 @@
-<?php
-/**
-* Apache auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* @package login
-* @version $Id: auth_apache.php 8479 2008-03-29 00:22:48Z naderman $
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Checks whether the user is identified to apache
-* Only allow changing authentication to apache if the user is identified
-* Called in acp_board while setting authentication plugins
-*
-* @return boolean|string false if the user is identified and else an error message
-*/
-function init_apache()
-{
-	global $user;
-
-	if (!isset($_SERVER['PHP_AUTH_USER']) || $user->data['username'] !==
$_SERVER['PHP_AUTH_USER'])
-	{
-		return $user->lang['APACHE_SETUP_BEFORE_USE'];
-	}
-	return false;
-}
-
-/**
-* Login function
-*/
-function login_apache(&$username, &$password)
-{
-	global $db;
-
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!isset($_SERVER['PHP_AUTH_USER']))
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$php_auth_user = $_SERVER['PHP_AUTH_USER'];
-	$php_auth_pw = $_SERVER['PHP_AUTH_PW'];
-
-	if (!empty($php_auth_user) && !empty($php_auth_pw))
-	{
-		if ($php_auth_user !== $username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email,
user_type
-			FROM ' . USERS_TABLE . "
-			WHERE username = '" . $db->sql_escape($php_auth_user) .
"'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			// User inactive...
-			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] ==
USER_IGNORE)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ACTIVE,
-					'error_msg'		=> 'ACTIVE_ERROR',
-					'user_row'		=> $row,
-				);
-			}
-	
-			// Successful login...
-			return array(
-				'status'		=> LOGIN_SUCCESS,
-				'error_msg'		=> false,
-				'user_row'		=> $row,
-			);
-		}
-
-		// this is the user's first login so create an empty profile
-		return array(
-			'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-			'error_msg'		=> false,
-			'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
-		);
-	}
-
-	// Not logged into apache
-	return array(
-		'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-		'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-		'user_row'		=> array('user_id' => ANONYMOUS),
-	);
-}
-
-/**
-* Autologin function
-*
-* @return array containing the user row or empty if no auto login should take place
-*/
-function autologin_apache()
-{
-	global $db;
-
-	if (!isset($_SERVER['PHP_AUTH_USER']))
-	{
-		return array();
-	}
-
-	$php_auth_user = $_SERVER['PHP_AUTH_USER'];
-	$php_auth_pw = $_SERVER['PHP_AUTH_PW'];
-
-	if (!empty($php_auth_user) && !empty($php_auth_pw))
-	{
-		set_var($php_auth_user, $php_auth_user, 'string');
-		set_var($php_auth_pw, $php_auth_pw, 'string');
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE username = '" . $db->sql_escape($php_auth_user) .
"'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return ($row['user_type'] == USER_INACTIVE || $row['user_type'] ==
USER_IGNORE) ? array() : $row;
-		}
-
-		if (!function_exists('user_add'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-		}
-
-		// create the user if he does not exist yet
-		user_add(user_row_apache($php_auth_user, $php_auth_pw));
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" .
$db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return $row;
-		}
-	}
-
-	return array();
-}
-
-/**
-* This function generates an array which can be passed to the user_add function in order
to create a user
-*/
-function user_row_apache($username, $password)
-{
-	global $db, $config, $user;
-	// first retrieve default group id
-	$sql = 'SELECT group_id
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name = '" . $db->sql_escape('REGISTERED') .
"'
-			AND group_type = " . GROUP_SPECIAL;
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	if (!$row)
-	{
-		trigger_error('NO_GROUP');
-	}
-
-	// generate user account data
-	return array(
-		'username'		=> $username,
-		'user_password'	=> phpbb_hash($password),
-		'user_email'	=> '',
-		'group_id'		=> (int) $row['group_id'],
-		'user_type'		=> USER_NORMAL,
-		'user_ip'		=> $user->ip,
-	);
-}
-
-/**
-* The session validation function checks whether the user is still logged in
-*
-* @return boolean true if the given user is authenticated or false if the session should
be closed
-*/
-function validate_session_apache(&$user)
-{
-	if (!isset($_SERVER['PHP_AUTH_USER']))
-	{
-		return false;
-	}
-
-	$php_auth_user = '';
-	set_var($php_auth_user, $_SERVER['PHP_AUTH_USER'], 'string');
-
-	return ($php_auth_user === $user['username']) ? true : false;
-}
-
-?>

Removed: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php (removed)
@@ -1,235 +1,0 @@
-<?php
-/**
-* Database auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* This is for authentication via the integrated user table
-*
-* @package login
-* @version $Id: auth_db.php 8479 2008-03-29 00:22:48Z naderman $
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Login function
-*/
-function login_db(&$username, &$password)
-{
-	global $db, $config;
-
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert,
user_email, user_type, user_login_attempts
-		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_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	// If there are too much login attempts, we need to check for an confirm image
-	// Every auth module is able to define what to do by itself...
-	if ($config['max_login_attempts'] && $row['user_login_attempts']
>= $config['max_login_attempts'])
-	{
-		$confirm_id = request_var('confirm_id', '');
-		$confirm_code = request_var('confirm_code', '');
-
-		// Visual Confirmation handling
-		if (!$confirm_id)
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_ATTEMPTS,
-				'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-				'user_row'		=> $row,
-			);
-		}
-		else
-		{
-			global $user;
-
-			$sql = 'SELECT code
-				FROM ' . CONFIRM_TABLE . "
-				WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
-					AND session_id = '" . $db->sql_escape($user->session_id) .
"'
-					AND confirm_type = " . CONFIRM_LOGIN;
-			$result = $db->sql_query($sql);
-			$confirm_row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if ($confirm_row)
-			{
-				if (strcasecmp($confirm_row['code'], $confirm_code) === 0)
-				{
-					$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
-						WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
-							AND session_id = '" . $db->sql_escape($user->session_id) .
"'
-							AND confirm_type = " . CONFIRM_LOGIN;
-					$db->sql_query($sql);
-				}
-				else
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_ATTEMPTS,
-						'error_msg'		=> 'CONFIRM_CODE_WRONG',
-						'user_row'		=> $row,
-					);
-				}
-			}
-			else
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ATTEMPTS,
-					'error_msg'		=> 'CONFIRM_CODE_WRONG',
-					'user_row'		=> $row,
-				);
-			}
-		}
-	}
-
-	// 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']) ? (string)
$_REQUEST['password'] : '';
-		$password_old_format = (!STRIP) ? addslashes($password_old_format) :
$password_old_format;
-		$password_new_format = '';
-
-		set_var($password_new_format, stripslashes($password_old_format), 'string');
-
-		if ($password == $password_new_format)
-		{
-			if (!function_exists('utf8_to_cp1252'))
-			{
-				global $phpbb_root_path, $phpEx;
-				include($phpbb_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 = 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);
-
-				return array(
-					'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
-					'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
-					'user_row'		=> $row,
-				);
-			}
-		}
-	}
-
-	// Check password ...
-	if (!$row['user_pass_convert'] && phpbb_check_hash($password,
$row['user_password']))
-	{
-		// Check for old password hash...
-		if (strlen($row['user_password']) == 32)
-		{
-			$hash = phpbb_hash($password);
-
-			// Update the password in the users table to the new format
-			$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_password'] = $hash;
-		}
-
-		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)
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_ACTIVE,
-				'error_msg'		=> 'ACTIVE_ERROR',
-				'user_row'		=> $row,
-			);
-		}
-
-		// Successful login... set user_login_attempts to zero...
-		return array(
-			'status'		=> LOGIN_SUCCESS,
-			'error_msg'		=> false,
-			'user_row'		=> $row,
-		);
-	}
-
-	// Password incorrect - increase login attempts
-	$sql = 'UPDATE ' . USERS_TABLE . '
-		SET user_login_attempts = user_login_attempts + 1
-		WHERE user_id = ' . $row['user_id'];
-	$db->sql_query($sql);
-
-	// Give status about wrong password...
-	return array(
-		'status'		=> LOGIN_ERROR_PASSWORD,
-		'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-		'user_row'		=> $row,
-	);
-}
-
-?>

Removed: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php [iso-8859-1]
(original)
+++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php (removed)
@@ -1,343 +1,0 @@
-<?php
-/**
-*
-* LDAP auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* @package login
-* @version $Id: auth_ldap.php 8479 2008-03-29 00:22:48Z naderman $
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Connect to ldap server
-* Only allow changing authentication to ldap if we can connect to the ldap server
-* Called in acp_board while setting authentication plugins
-*/
-function init_ldap()
-{
-	global $config, $user;
-
-	if (!@extension_loaded('ldap'))
-	{
-		return $user->lang['LDAP_NO_LDAP_EXTENSION'];
-	}
-
-	$config['ldap_port'] = (int) $config['ldap_port'];
-	if ($config['ldap_port'])
-	{
-		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
-	}
-	else
-	{
-		$ldap = @ldap_connect($config['ldap_server']);
-	}
-
-	if (!$ldap)
-	{
-		return $user->lang['LDAP_NO_SERVER_CONNECTION'];
-	}
-
-	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-	if ($config['ldap_user'] || $config['ldap_password'])
-	{
-		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']),
htmlspecialchars_decode($config['ldap_password'])))
-		{
-			return $user->lang['LDAP_INCORRECT_USER_PASSWORD'];
-		}
-	}
-
-	// ldap_connect only checks whether the specified server is valid, so the connection
might still fail
-	$search = @ldap_search(
-		$ldap,
-		$config['ldap_base_dn'],
-		ldap_user_filter($user->data['username']),
-		(empty($config['ldap_email'])) ? array($config['ldap_uid']) :
array($config['ldap_uid'], $config['ldap_email']),
-		0,
-		1
-	);
-
-	if ($search === false)
-	{
-		return $user->lang['LDAP_NO_SERVER_CONNECTION'];
-	}
-
-	$result = @ldap_get_entries($ldap, $search);
-
-	@ldap_close($ldap);
-
-
-	if (!is_array($result) || sizeof($result) < 2)
-	{
-		return sprintf($user->lang['LDAP_NO_IDENTITY'],
$user->data['username']);
-	}
-
-	if (!empty($config['ldap_email']) &&
!isset($result[0][$config['ldap_email']]))
-	{
-		return $user->lang['LDAP_NO_EMAIL'];
-	}
-
-	return false;
-}
-
-/**
-* Login function
-*/
-function login_ldap(&$username, &$password)
-{
-	global $db, $config, $user;
-
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!@extension_loaded('ldap'))
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$config['ldap_port'] = (int) $config['ldap_port'];
-	if ($config['ldap_port'])
-	{
-		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
-	}
-	else
-	{
-		$ldap = @ldap_connect($config['ldap_server']);
-	}
-
-	if (!$ldap)
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-	if ($config['ldap_user'] || $config['ldap_password'])
-	{
-		if (!@ldap_bind($ldap, $config['ldap_user'],
htmlspecialchars_decode($config['ldap_password'])))
-		{
-			return $user->lang['LDAP_NO_SERVER_CONNECTION'];
-		}
-	}
-
-	$search = @ldap_search(
-		$ldap,
-		$config['ldap_base_dn'],
-		ldap_user_filter($username),
-		(empty($config['ldap_email'])) ? array($config['ldap_uid']) :
array($config['ldap_uid'], $config['ldap_email']),
-		0,
-		1
-	);
-
-	$ldap_result = @ldap_get_entries($ldap, $search);
-
-	if (is_array($ldap_result) && sizeof($ldap_result) > 1)
-	{
-		if (@ldap_bind($ldap, $ldap_result[0]['dn'],
htmlspecialchars_decode($password)))
-		{
-			@ldap_close($ldap);
-
-			$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)
-			{
-				unset($ldap_result);
-
-				// User inactive...
-				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] ==
USER_IGNORE)
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_ACTIVE,
-						'error_msg'		=> 'ACTIVE_ERROR',
-						'user_row'		=> $row,
-					);
-				}
-
-				// Successful login... set user_login_attempts to zero...
-				return array(
-					'status'		=> LOGIN_SUCCESS,
-					'error_msg'		=> false,
-					'user_row'		=> $row,
-				);
-			}
-			else
-			{
-				// retrieve default group id
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . "
-					WHERE group_name = '" . $db->sql_escape('REGISTERED') .
"'
-						AND group_type = " . GROUP_SPECIAL;
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error('NO_GROUP');
-				}
-
-				// generate user account data
-				$ldap_user_row = array(
-					'username'		=> $username,
-					'user_password'	=> phpbb_hash($password),
-					'user_email'	=> (!empty($config['ldap_email'])) ?
$ldap_result[0][$config['ldap_email']][0] : '',
-					'group_id'		=> (int) $row['group_id'],
-					'user_type'		=> USER_NORMAL,
-					'user_ip'		=> $user->ip,
-				);
-
-				unset($ldap_result);
-
-				// this is the user's first login so create an empty profile
-				return array(
-					'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-					'error_msg'		=> false,
-					'user_row'		=> $ldap_user_row,
-				);
-			}
-		}
-		else
-		{
-			unset($ldap_result);
-			@ldap_close($ldap);
-
-			// Give status about wrong password...
-			return array(
-				'status'		=> LOGIN_ERROR_PASSWORD,
-				'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-	}
-
-	@ldap_close($ldap);
-
-	return array(
-		'status'	=> LOGIN_ERROR_USERNAME,
-		'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-		'user_row'	=> array('user_id' => ANONYMOUS),
-	);
-}
-
-/**
-* Generates a filter string for ldap_search to find a user
-*
-* @param	$username	string	Username identifying the searched user
-*
-* @return				string	A filter string for ldap_search
-*/
-function ldap_user_filter($username)
-{
-	global $config;
-
-	$filter = '(' . $config['ldap_uid'] . '=' .
ldap_escape(htmlspecialchars_decode($username)) . ')';
-	if ($config['ldap_user_filter'])
-	{
-		$filter = "(&$filter({$config['ldap_user_filter']}))";
-	}
-	return $filter;
-}
-
-/**
-* Escapes an LDAP AttributeValue
-*/
-function ldap_escape($string)
-{
-	return str_replace(array('*', '\\', '(', ')'),
array('\\*', '\\\\', '\\(', '\\)'), $string);
-}
-
-/**
-* This function is used to output any required fields in the authentication
-* admin panel. It also defines any required configuration table fields.
-*/
-function acp_ldap(&$new)
-{
-	global $user;
-
-	$tpl = '
-
-	<dl>
-		<dt><label for="ldap_server">' .
$user->lang['LDAP_SERVER'] . ':</label><br /><span>'
. $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_server"
size="40" name="config[ldap_server]" value="' .
$new['ldap_server'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_port">' .
$user->lang['LDAP_PORT'] . ':</label><br /><span>' .
$user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_port" size="40"
name="config[ldap_port]" value="' . $new['ldap_port'] .
'" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_dn">' .
$user->lang['LDAP_DN'] . ':</label><br /><span>' .
$user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_dn" size="40"
name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] .
'" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_uid">' .
$user->lang['LDAP_UID'] . ':</label><br /><span>' .
$user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_uid" size="40"
name="config[ldap_uid]" value="' . $new['ldap_uid'] .
'" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user_filter">' .
$user->lang['LDAP_USER_FILTER'] . ':</label><br
/><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] .
'</span></dt>
-		<dd><input type="text" id="ldap_user_filter"
size="40" name="config[ldap_user_filter]" value="' .
$new['ldap_user_filter'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_email">' .
$user->lang['LDAP_EMAIL'] . ':</label><br /><span>' .
$user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_email" size="40"
name="config[ldap_email]" value="' . $new['ldap_email'] .
'" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user">' .
$user->lang['LDAP_USER'] . ':</label><br /><span>' .
$user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_user" size="40"
name="config[ldap_user]" value="' . $new['ldap_user'] .
'" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_password">' .
$user->lang['LDAP_PASSWORD'] . ':</label><br
/><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] .
'</span></dt>
-		<dd><input type="password" id="ldap_password"
size="40" name="config[ldap_password]" value="' .
$new['ldap_password'] . '" /></dd>
-	</dl>
-	';
-
-	// These are fields required in the config table
-	return array(
-		'tpl'		=> $tpl,
-		'config'	=> array('ldap_server', 'ldap_port',
'ldap_base_dn', 'ldap_uid', 'ldap_user_filter',
'ldap_email', 'ldap_user', 'ldap_password')
-	);
-}
-
-?>

Added: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php (added)
+++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] Thu May
22 11:22:57 2008
@@ -1,0 +1,103 @@
+<?php
+/**
+* RosCMS auth plug-in for phpBB3
+* Written by Colin Finck (mail(a)colinfinck.de) based on the DB plug-in
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Login function
+*/
+define(ROSCMS_DB_NAME, "roscms");
+
+function login_roscms(&$userid, &$password)
+{
+	global $db, $config;
+	
+	// We only check the User ID here.
+	if (!$userid)
+	{
+		return array(
+			'status'	=> LOGIN_ERROR_USERNAME,
+			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+			'user_row'	=> array('user_id' => ANONYMOUS),
+		);
+	}
+
+	// Get the phpBB ID of the user belonging to the "roscmsusrkey" cookie
+	$sql = "SELECT m.map_subsys_userid " .
+	       "FROM " . ROSCMS_DB_NAME . ".user_sessions s, " .
ROSCMS_DB_NAME . ".users u, " . ROSCMS_DB_NAME . ".subsys_mappings m "
.
+	       "WHERE s.usersession_id = '" .
$db->sql_escape($_COOKIE["roscmsusrkey"]) . "' AND
(s.usersession_expires IS NULL OR NOW() <= s.usersession_expires) " .
+	       "AND u.user_id = s.usersession_user_id AND (u.user_setting_ipaddress =
'false' OR s.usersession_ipaddress = '" .
$db->sql_escape($_SERVER["REMOTE_ADDR"]) . "') " .
+	       "AND (u.user_setting_browseragent = 'false' OR
s.usersession_browseragent = '" .
$db->sql_escape($_SERVER["HTTP_USER_AGENT"]) . "') " .
+	       "AND m.map_roscms_userid = s.usersession_user_id " .
+	       "AND m.map_subsys_name = 'phpbb'";
+	$result = $db->sql_query($sql);
+	$row = $db->sql_fetchrow($result);
+	$db->sql_freeresult($result);
+	
+	// Verify this ID against $userid
+	if(!$row || $row["map_subsys_userid"] != $userid)
+	{
+		return array(
+			'status'	=> LOGIN_ERROR_USERNAME,
+			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+			'user_row'	=> array('user_id' => ANONYMOUS),
+		);
+	}
+	
+	// Now get the user information based on this ID
+	$sql = "SELECT user_id, username, user_password, user_passchg, user_pass_convert,
user_email, user_type, user_login_attempts " .
+	       "FROM " . USERS_TABLE . " " .
+	       "WHERE user_id = " . (int)$userid;
+	
+	$result = $db->sql_query($sql);
+	$row = $db->sql_fetchrow($result);
+	$db->sql_freeresult($result);
+
+	if (!$row)
+	{
+		return array(
+			'status'	=> LOGIN_ERROR_USERNAME,
+			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+			'user_row'	=> array('user_id' => ANONYMOUS),
+		);
+	}
+
+	// User inactive...
+	if ($row['user_type'] == USER_INACTIVE || $row['user_type'] ==
USER_IGNORE)
+	{
+		return array(
+			'status'		=> LOGIN_ERROR_ACTIVE,
+			'error_msg'		=> 'ACTIVE_ERROR',
+			'user_row'		=> $row,
+		);
+	}
+
+	// Successful login
+	return array(
+		'status'		=> LOGIN_SUCCESS,
+		'error_msg'		=> false,
+		'user_row'		=> $row,
+	);
+}
+
+function validate_session_roscms(&$user)
+{
+	if($user["user_id"] == ANONYMOUS && $_COOKIE["roscmsusrkey"]
!= "")
+	{
+		// The user is logged in in RosCMS, but not yet in phpBB. Do that now
+		login_box();
+	}
+	
+	return true;
+}
+
+?>

Modified: trunk/web/reactos.org/htdocs/forum/includes/functions.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/includes/functions.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/forum/includes/functions.php [iso-8859-1] Thu May 22
11:22:57 2008
@@ -15,6 +15,8 @@
 {
 	exit;
 }
+
+require_once("$phpbb_root_path/../roscms/inc/subsys_login.php");
 
 // Common global functions
 
@@ -2256,211 +2258,49 @@
 		trigger_error('NO_AUTH_ADMIN');
 	}
 
-	if (isset($_POST['login']))
-	{
-		// Get credential
-		if ($admin)
-		{
-			$credential = request_var('credential', '');
-
-			if (strspn($credential, 'abcdef0123456789') !== strlen($credential) ||
strlen($credential) != 32)
-			{
-				if ($user->data['is_registered'])
-				{
-					add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-				}
-				trigger_error('NO_AUTH_ADMIN');
-			}
-
-			$password	= request_var('password_' . $credential, '', true);
+	// Login using RosCMS
+	// The function will return the phpBB user ID if we're already logged in.
+	// Otherwise this function will be automatically called again through
validate_session_roscms, when we will be redirected to the forum.
+	$userid = roscms_subsys_login("phpbb", ROSCMS_LOGIN_REQUIRED,
"/forum");
+	
+	// If authentication is successful we redirect user to previous page
+	$result = $auth->login($userid, '', true, true, $admin);
+
+	// If admin authentication and login, we will log if it was a success or not...
+	// We also break the operation on the first non-success login - it could be argued that
the user already knows
+	if ($admin)
+	{
+		if ($result['status'] == LOGIN_SUCCESS)
+		{
+			add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS');
 		}
 		else
 		{
-			$password	= request_var('password', '', true);
-		}
-
-		$username	= request_var('username', '', true);
-		$autologin	= (!empty($_POST['autologin'])) ? true : false;
-		$viewonline = (!empty($_POST['viewonline'])) ? 0 : 1;
-		$admin 		= ($admin) ? 1 : 0;
-		$viewonline = ($admin) ? $user->data['session_viewonline'] : $viewonline;
-
-		// Check if the supplied username is equal to the one stored within the database if
re-authenticating
-		if ($admin && utf8_clean_string($username) !=
utf8_clean_string($user->data['username']))
-		{
-			// We log the attempt to use a different username...
-			add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-			trigger_error('NO_AUTH_ADMIN_USER_DIFFER');
-		}
-
-		// If authentication is successful we redirect user to previous page
-		$result = $auth->login($username, $password, $autologin, $viewonline, $admin);
-
-		// If admin authentication and login, we will log if it was a success or not...
-		// We also break the operation on the first non-success login - it could be argued that
the user already knows
-		if ($admin)
-		{
-			if ($result['status'] == LOGIN_SUCCESS)
-			{
-				add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS');
-			}
-			else
-			{
-				// Only log the failed attempt if a real user tried to.
-				// anonymous/inactive users are never able to go to the ACP even if they have the
relevant permissions
-				if ($user->data['is_registered'])
-				{
-					add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-				}
-			}
-		}
-
-		// The result parameter is always an array, holding the relevant information...
-		if ($result['status'] == LOGIN_SUCCESS)
-		{
-			$redirect = request_var('redirect',
"{$phpbb_root_path}index.$phpEx");
-			$message = ($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT'];
-			$l_redirect = ($admin) ? $user->lang['PROCEED_TO_ACP'] : (($redirect ===
"{$phpbb_root_path}index.$phpEx" || $redirect === "index.$phpEx") ?
$user->lang['RETURN_INDEX'] : $user->lang['RETURN_PAGE']);
-
-			// append/replace SID (may change during the session for AOL users)
-			$redirect = reapply_sid($redirect);
-
-			// Special case... the user is effectively banned, but we allow founders to login
-			if (defined('IN_CHECK_BAN') &&
$result['user_row']['user_type'] != USER_FOUNDER)
-			{
-				return;
-			}
-
-			meta_refresh(3, $redirect);
-			trigger_error($message . '<br /><br />' . sprintf($l_redirect,
'<a href="' . $redirect . '">', '</a>'));
-		}
-
-		// Something failed, determine what...
-		if ($result['status'] == LOGIN_BREAK)
-		{
-			trigger_error($result['error_msg']);
-		}
-
-		// Special cases... determine
-		switch ($result['status'])
-		{
-			case LOGIN_ERROR_ATTEMPTS:
-
-				// Show confirm image
-				$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
-					WHERE session_id = '" . $db->sql_escape($user->session_id) .
"'
-						AND confirm_type = " . CONFIRM_LOGIN;
-				$db->sql_query($sql);
-
-				// Generate code
-				$code = gen_rand_string(mt_rand(5, 8));
-				$confirm_id = md5(unique_id($user->ip));
-				$seed = hexdec(substr(unique_id(), 4, 10));
-
-				// compute $seed % 0x7fffffff
-				$seed -= 0x7fffffff * floor($seed / 0x7fffffff);
-
-				$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' .
$db->sql_build_array('INSERT', array(
-					'confirm_id'	=> (string) $confirm_id,
-					'session_id'	=> (string) $user->session_id,
-					'confirm_type'	=> (int) CONFIRM_LOGIN,
-					'code'			=> (string) $code,
-					'seed'			=> (int) $seed)
-				);
-				$db->sql_query($sql);
-
-				$template->assign_vars(array(
-					'S_CONFIRM_CODE'			=> true,
-					'CONFIRM_ID'				=> $confirm_id,
-					'CONFIRM_IMAGE'				=> '<img src="' .
append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=confirm&amp;id=' .
$confirm_id . '&amp;type=' . CONFIRM_LOGIN) . '" alt=""
title="" />',
-					'L_LOGIN_CONFIRM_EXPLAIN'	=>
sprintf($user->lang['LOGIN_CONFIRM_EXPLAIN'], '<a
href="mailto:' . htmlspecialchars($config['board_contact']) .
'">', '</a>'),
-				));
-
-				$err = $user->lang[$result['error_msg']];
-
-			break;
-
-			case LOGIN_ERROR_PASSWORD_CONVERT:
-				$err = sprintf(
-					$user->lang[$result['error_msg']],
-					($config['email_enable']) ? '<a href="' .
append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') .
'">' : '',
-					($config['email_enable']) ? '</a>' : '',
-					($config['board_contact']) ? '<a href="mailto:' .
htmlspecialchars($config['board_contact']) . '">' : '',
-					($config['board_contact']) ? '</a>' : ''
-				);
-			break;
-
-			// Username, password, etc...
-			default:
-				$err = $user->lang[$result['error_msg']];
-
-				// Assign admin contact to some error messages
-				if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' ||
$result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
-				{
-					$err = (!$config['board_contact']) ?
sprintf($user->lang[$result['error_msg']], '', '') :
sprintf($user->lang[$result['error_msg']], '<a href="mailto:' .
htmlspecialchars($config['board_contact']) . '">',
'</a>');
-				}
-
-			break;
-		}
-	}
-
-	if (!$redirect)
-	{
-		// We just use what the session code determined...
-		// If we are not within the admin directory we use the page dir...
-		$redirect = '';
-
-		if (!$admin)
-		{
-			$redirect .= ($user->page['page_dir']) ? $user->page['page_dir']
. '/' : '';
-		}
-
-		$redirect .= $user->page['page_name'] .
(($user->page['query_string']) ? '?' .
htmlspecialchars($user->page['query_string']) : '');
-	}
-
-	// Assign credential for username/password pair
-	$credential = ($admin) ? md5(unique_id()) : false;
-
-	$s_hidden_fields = array(
-		'redirect'	=> $redirect,
-		'sid'		=> $user->session_id,
-	);
-
-	if ($admin)
-	{
-		$s_hidden_fields['credential'] = $credential;
-	}
-
-	$s_hidden_fields = build_hidden_fields($s_hidden_fields);
-
-	$template->assign_vars(array(
-		'LOGIN_ERROR'		=> $err,
-		'LOGIN_EXPLAIN'		=> $l_explain,
-
-		'U_SEND_PASSWORD' 		=> ($config['email_enable']) ?
append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') :
'',
-		'U_RESEND_ACTIVATION'	=> ($config['require_activation'] !=
USER_ACTIVATION_NONE && $config['email_enable']) ?
append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') :
'',
-		'U_TERMS_USE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx",
'mode=terms'),
-		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx",
'mode=privacy'),
-
-		'S_DISPLAY_FULL_LOGIN'	=> ($s_display) ? true : false,
-		'S_LOGIN_ACTION'		=> (!$admin) ?
append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') :
append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay
index.$phpEx because we are within the admin directory
-		'S_HIDDEN_FIELDS' 		=> $s_hidden_fields,
-
-		'S_ADMIN_AUTH'			=> $admin,
-		'USERNAME'				=> ($admin) ? $user->data['username'] :
'',
-
-		'USERNAME_CREDENTIAL'	=> 'username',
-		'PASSWORD_CREDENTIAL'	=> ($admin) ? 'password_' . $credential :
'password',
-	));
-
-	page_header($user->lang['LOGIN'], false);
-
-	$template->set_filenames(array(
-		'body' => 'login_body.html')
-	);
-	make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));
-
-	page_footer();
+			// Only log the failed attempt if a real user tried to.
+			// anonymous/inactive users are never able to go to the ACP even if they have the
relevant permissions
+			if ($user->data['is_registered'])
+			{
+				add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
+			}
+		}
+	}
+
+	// The result parameter is always an array, holding the relevant information...
+	if ($result['status'] == LOGIN_SUCCESS)
+	{
+		$redirect = $admin ? "{$phpbb_root_path}adm/index.$phpEx" :
"{$phpbb_root_path}index.$phpEx";
+		
+		// append/replace SID (may change during the session for AOL users)
+		$redirect = reapply_sid($redirect);
+
+		// Special case... the user is effectively banned, but we allow founders to login
+		if (defined('IN_CHECK_BAN') &&
$result['user_row']['user_type'] != USER_FOUNDER)
+		{
+			return;
+		}
+
+		header("Location: $redirect");
+	}
 }
 
 /**

Modified: trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/insta…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql [iso-8859-1]
(original)
+++ trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql [iso-8859-1] Thu
May 22 11:22:57 2008
@@ -37,7 +37,7 @@
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm',
'1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm',
'0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm',
'1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method',
'db');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method',
'roscms');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_smilies_pm',
'1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize',
'6144');
 INSERT INTO phpbb_config (config_name, config_value) VALUES
('avatar_gallery_path', 'images/avatars/gallery');

Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html [iso-8859-1]
(original)
+++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html [iso-8859-1]
Thu May 22 11:22:57 2008
@@ -13,20 +13,6 @@
 <!-- ENDIF -->
 
 <!-- INCLUDE forumlist_body.html -->
-
-<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
-	<form method="post" action="{S_LOGIN_ACTION}"
class="headerspace">
-	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!--
IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a
href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
-		<fieldset class="quick-login">
-			<label for="username">{L_USERNAME}:</label>&nbsp;<input
type="text" name="username" id="username"
size="10" class="inputbox" title="{L_USERNAME}" />  
-			<label for="password">{L_PASSWORD}:</label>&nbsp;<input
type="password" name="password" id="password"
size="10" class="inputbox" title="{L_PASSWORD}" />
-			<!-- IF S_AUTOLOGIN_ENABLED -->
-				| <label for="autologin">{L_LOG_ME_IN} <input
type="checkbox" name="autologin" id="autologin"
/></label>
-			<!-- ENDIF -->
-			<input type="submit" name="login" value="{L_LOGIN}"
class="button2" />
-		</fieldset>
-	</form>
-<!-- ENDIF -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a
href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE
--><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->

Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
[iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
[iso-8859-1] Thu May 22 11:22:57 2008
@@ -13,7 +13,7 @@
 					<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a
href="{U_BOOKMARK_TOPIC}"
title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!--
ENDIF -->
 					<!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a
href="{U_BUMP_TOPIC}"
title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF
-->
 				<!-- ENDIF -->
-			<li class="rightside"><a
href="{U_TEAM}">{L_THE_TEAM}</a> &bull; <!-- IF not S_IS_BOT
--><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> &bull;
<!-- ENDIF -->{S_TIMEZONE}</li>
+			<li class="rightside"><a
href="{U_TEAM}">{L_THE_TEAM}</a> &bull; {S_TIMEZONE}</li>
 		</ul>
 
 		<span
class="corners-bottom"><span></span></span></div>

Modified: trunk/web/reactos.org/htdocs/forum/ucp.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/ucp.p…
==============================================================================
--- trunk/web/reactos.org/htdocs/forum/ucp.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/forum/ucp.php [iso-8859-1] Thu May 22 11:22:57 2008
@@ -41,35 +41,20 @@
 switch ($mode)
 {
 	case 'activate':
-		$module->load('ucp', 'activate');
-		$module->display($user->lang['UCP_ACTIVATE']);
-
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
-	break;
-
+	case 'confirm':
+	case 'delete_cookies':
 	case 'resend_act':
-		$module->load('ucp', 'resend');
-		$module->display($user->lang['UCP_RESEND']);
-	break;
-
 	case 'sendpassword':
-		$module->load('ucp', 'remind');
-		$module->display($user->lang['UCP_REMIND']);
-	break;
+		die("Please go to RosCMS to do this!");
 
 	case 'register':
 		if ($user->data['is_registered'] || isset($_REQUEST['not_agreed']))
 		{
 			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
 		}
-
-		$module->load('ucp', 'register');
-		$module->display($user->lang['REGISTER']);
-	break;
-
-	case 'confirm':
-		$module->load('ucp', 'confirm');
-		exit_handler();
+		
+		header("Location: /roscms/?page=register&amp;target=/forum");
+		exit;
 	break;
 
 	case 'login':
@@ -86,7 +71,8 @@
 		{
 			$user->session_kill();
 			$user->session_begin();
-			$message = $user->lang['LOGOUT_REDIRECT'];
+			header("Location: /roscms/?page=logout");
+			exit;
 		}
 		else
 		{
@@ -134,47 +120,6 @@
 
 	break;
 
-	case 'delete_cookies':
-		
-		// Delete Cookies with dynamic names (do NOT delete poll cookies)
-		if (confirm_box(true))
-		{
-			$set_time = time() - 31536000;
-
-			foreach ($_COOKIE as $cookie_name => $cookie_data)
-			{
-				$cookie_name = str_replace($config['cookie_name'] . '_', '',
$cookie_name);
-
-				// Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed,
therefore checking for poll_
-				if (strpos($cookie_name, 'poll_') !== 0)
-				{
-					$user->set_cookie($cookie_name, '', $set_time);
-				}
-			}
-
-			$user->set_cookie('track', '', $set_time);
-			$user->set_cookie('u', '', $set_time);
-			$user->set_cookie('k', '', $set_time);
-			$user->set_cookie('sid', '', $set_time);
-
-			// We destroy the session here, the user will be logged out nevertheless
-			$user->session_kill();
-			$user->session_begin();
-
-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
-
-			$message = $user->lang['COOKIES_DELETED'] . '<br /><br
/>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' .
append_sid("{$phpbb_root_path}index.$phpEx") . '">',
'</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			confirm_box(false, 'DELETE_COOKIES', '');
-		}
-
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
-
-	break;
-
 	case 'switch_perm':
 
 		$user_id = request_var('u', 0);