mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 09:16:55 +02:00
Code Issues Releases Wiki Activity

some fixes today

Browse Source 
- most important change is the consolidation of the display attachment functions; merging them together to have one function we need to call.


git-svn-id: file:///svn/phpbb/trunk@6803 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-12-24 13:11:54 +00:00
parent 9cc0b364bc
commit ae1cb0316e
20 changed files with 506 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
phpBB/includes/session.php
View File

@@ -651,7 +651,7 @@ class session
* and update the users information from the relevant session data. It will then
* grab guest user information.
*/
function session_kill()
function session_kill($new_session = true)
{
global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx;
@@ -712,7 +712,10 @@ class session
$this->session_id = $_SID = '';
// To make sure a valid session is created we create one for the anonymous user
$this->session_create(ANONYMOUS);
if ($new_session)
{
$this->session_create(ANONYMOUS);
}
return true;
}
@@ -820,6 +823,11 @@ class session
{
global $config, $db;
if (defined('IN_CHECK_BAN'))
{
return;
}
$banned = false;
$sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end
@@ -927,6 +935,23 @@ class session
$this->session_kill();
}
// We show a login box here to allow founders accessing the board if banned by IP
if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS)
{
global $phpEx;
// Set as a precaution to allow login_box() handling this case correctly as well as this function not being executed again.
define('IN_CHECK_BAN', 1);
$this->setup('ucp');
$this->data['is_registered'] = $this->data['is_bot'] = false;
login_box("index.$phpEx");
// The false here is needed, else the user is able to circumvent the ban.
$this->session_kill(false);
}
// Determine which message to output
$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';
$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';