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

fix permission bug for added categories during conversion as well as lowering the maximum execution limit.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6972 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-02-07 16:32:15 +00:00
parent 0fc55efc7d
commit 458bd5b3cd
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_convert.php
View file

@ -34,10 +34,10 @@ function still_on_time()
// If zero, then set to something higher to not let the user catch the ten seconds barrier. // If zero, then set to something higher to not let the user catch the ten seconds barrier.
if ($max_execution_time === 0) if ($max_execution_time === 0)
{ {
$max_execution_time = 250; $max_execution_time = 65;
} }
$max_execution_time = min(max(10, ($max_execution_time - 15)), 250); $max_execution_time = min(max(10, ($max_execution_time - 15)), 50);
// For debugging purposes // For debugging purposes
// $max_execution_time = 10; // $max_execution_time = 10;

15
phpBB/install/convertors/functions_phpbb20.php
View file

@ -900,6 +900,7 @@ function phpbb_convert_authentication($mode)
if ($row['parent_id'] == 0) if ($row['parent_id'] == 0)
{ {
mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL'); mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL');
mass_auth('group_role', $row['forum_id'], 'global_moderators', 'FORUM_FULL');
$parent_forums[] = $row; $parent_forums[] = $row;
} }
else else
@ -936,6 +937,20 @@ function phpbb_convert_authentication($mode)
{ {
mass_auth('group', $row['forum_id'], 'guests', 'f_list', ACL_YES); mass_auth('group', $row['forum_id'], 'guests', 'f_list', ACL_YES);
mass_auth('group', $row['forum_id'], 'registered', 'f_list', ACL_YES); mass_auth('group', $row['forum_id'], 'registered', 'f_list', ACL_YES);
mass_auth('group', $row['forum_id'], 'registered_coppa', 'f_list', ACL_YES);
mass_auth('group', $row['forum_id'], 'bots', 'f_list', ACL_YES);
}
else
{
// Now make sure the user is able to read these forums
$hold_ary = $auth->acl_group_raw_data(get_group_id('registered'), 'f_list', $forum_ids);
if (!empty($hold_ary))
{
mass_auth('group', $row['forum_id'], 'registered', 'f_list', ACL_YES);
mass_auth('group', $row['forum_id'], 'registered_coppa', 'f_list', ACL_YES);
mass_auth('group', $row['forum_id'], 'bots', 'f_list', ACL_YES);
}
} }
} }
} }