makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Weee! My turn to bug things up :D

Browse source 
- A moved topic has _two_ forum_ids, we must update the tracking info on the "fake" forum and the "real" forum.
- Welcome back to register_globals! :P


git-svn-id: file:///svn/phpbb/trunk@5608 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-03-06 23:45:21 +00:00
parent 21f3fbc4be
commit 91720e826f
3 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
phpBB/common.php
View file

@ -27,13 +27,44 @@ error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitia
//error_reporting(E_ALL); //error_reporting(E_ALL);
set_magic_quotes_runtime(0); set_magic_quotes_runtime(0);
// Be paranoid with passed vars // Protect against GLOBALS tricks
if (@ini_get('register_globals')) if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']))
{ {
foreach ($_REQUEST as $var_name => $void) exit;
}
// Protect against _SESSION tricks
if (isset($_SESSION) && !is_array($_SESSION))
{
exit;
}
// Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
{
$not_unset = array('_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_SESSION', '_ENV', '_FILES', 'phpEx', 'phpbb_root_path');
// Not only will array_merge give a warning if a parameter
// is not an array, it will actually fail. So we check if
// _SESSION has been initialised.
if (!isset($_SESSION) || !is_array($_SESSION))
{ {
unset(${$var_name}); $_SESSION = array();
} }
// Merge all into one extremely huge array; unset
// this later
$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_SESSION, $_ENV, $_FILES);
foreach ($input as $varname => $void)
{
if (!in_array($varname, $not_unset))
{
unset(${$varname});
}
}
unset($input);
} }
if (defined('IN_CRON')) if (defined('IN_CRON'))

3
phpBB/install/install.php
View file

@ -363,9 +363,8 @@ if ($stage == 0)
<tr> <tr>
<td>&bull;&nbsp;<b><?php echo $lang['PHP_REGISTER_GLOBALS']; ?>: </b></td> <td>&bull;&nbsp;<b><?php echo $lang['PHP_REGISTER_GLOBALS']; ?>: </b></td>
<td><?php <td><?php
if (@ini_get('register_globals') || strtolower(@ini_get('register_globals')) == 'on') if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
{ {
$passed['db'] = false;
echo '<b style="color:red">' . $lang['NO'] . '</b>'; echo '<b style="color:red">' . $lang['NO'] . '</b>';
} }
else else

7
phpBB/viewtopic.php
View file

@ -210,6 +210,7 @@ if (!($topic_data = $db->sql_fetchrow($result)))
trigger_error('NO_TOPIC'); trigger_error('NO_TOPIC');
} }
$old_forum_id = $forum_id;
$forum_id = (int) $topic_data['forum_id']; $forum_id = (int) $topic_data['forum_id'];
$topic_id = (int) $topic_data['topic_id']; $topic_id = (int) $topic_data['topic_id'];
@ -1363,6 +1364,12 @@ if (isset($user->data['session_page']) && !preg_match("#&t=$topic_id#", $user->d
if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id]) if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id])
{ {
markread('topic', $forum_id, $topic_id, $max_post_time); markread('topic', $forum_id, $topic_id, $max_post_time);
// The topic has two different forum_id numbers, we have to update the other forum
if ($old_forum_id !== $forum_id)
{
markread('topic', $old_forum_id, $topic_id, $max_post_time);
}
} }
// Change encoding if appropriate // Change encoding if appropriate