mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

[ticket/11031] Correctly add groups to teampage

Browse Source 
PHPBB3-11031
This commit is contained in:
Joas Schilling 2013-11-02 12:49:28 +01:00
parent 85a12ce4f4
commit cb8cd50495
3 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/includes/functions_convert.php
View File

@ -1748,7 +1748,7 @@ function add_default_groups()
'group_type' => GROUP_SPECIAL, 'group_type' => GROUP_SPECIAL,
'group_colour' => (string) $data[0], 'group_colour' => (string) $data[0],
'group_legend' => (int) $data[1], 'group_legend' => (int) $data[1],
'group_founder_manage' => (int) $data[2] 'group_founder_manage' => (int) $data[2],
); );
} }
@ -1758,6 +1758,38 @@ function add_default_groups()
} }
} }
function add_groups_to_teampage()
{
global $db;
$teampage_groups = array(
'ADMINISTRATORS' => 1,
'GLOBAL_MODERATORS' => 2,
);
$sql = 'SELECT *
FROM ' . GROUPS_TABLE . '
WHERE ' . $db->sql_in_set('group_name', array_keys($teampage_groups));
$result = $db->sql_query($sql);
$teampage_ary = array();
while ($row = $db->sql_fetchrow($result))
{
$teampage_ary[] = array(
'group_id' => (int) $row['group_id'],
'teampage_name' => '',
'teampage_position' => (int) $teampage_groups[$row['group_name']],
'teampage_parent' => 0,
);
}
$db->sql_freeresult($result);
if (sizeof($teampage_ary))
{
$db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_ary);
}
}
/** /**
* Sync post count. We might need to do this in batches. * Sync post count. We might need to do this in batches.

6
phpBB/install/convertors/convert_phpbb20.php
View File

@ -828,7 +828,10 @@ if (!$get_info)
array( array(
'target' => GROUPS_TABLE, 'target' => GROUPS_TABLE,
'autoincrement' => 'group_id', 'autoincrement' => 'group_id',
'query_first' => array('target', $convert->truncate_statement . GROUPS_TABLE), 'query_first' => array(
array('target', $convert->truncate_statement . GROUPS_TABLE),
array('target', $convert->truncate_statement . TEAMPAGE_TABLE),
),
array('group_id', 'groups.group_id', ''), array('group_id', 'groups.group_id', ''),
array('group_type', 'groups.group_type', 'phpbb_convert_group_type'), array('group_type', 'groups.group_type', 'phpbb_convert_group_type'),
@ -845,6 +848,7 @@ if (!$get_info)
'query_first' => array('target', $convert->truncate_statement . USER_GROUP_TABLE), 'query_first' => array('target', $convert->truncate_statement . USER_GROUP_TABLE),
'execute_first' => ' 'execute_first' => '
add_default_groups(); add_default_groups();
add_groups_to_teampage();
', ',
array('group_id', 'groups.group_id', ''), array('group_id', 'groups.group_id', ''),

40
phpBB/install/convertors/functions_phpbb20.php
View File

@ -1933,3 +1933,43 @@ function phpbb_convert_timezone($timezone)
$timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools($db), $phpbb_root_path, $phpEx, $table_prefix); $timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools($db), $phpbb_root_path, $phpEx, $table_prefix);
return $timezone_migration->convert_phpbb30_timezone($timezone, 0); return $timezone_migration->convert_phpbb30_timezone($timezone, 0);
} }
function phpbb_add_notification_options($user_notify_pm)
{
global $convert_row, $db;
$user_id = phpbb_user_id($convert_row['user_id']);
if ($user_id == ANONYMOUS)
{
return;
}
$rows = array();
$rows[] = array(
'item_type' => 'post',
'item_id' => 0,
'user_id' => (int) $user_id,
'notify' => 1,
'method' => 'email',
);
$rows[] = array(
'item_type' => 'topic',
'item_id' => 0,
'user_id' => (int) $user_id,
'notify' => 1,
'method' => 'email',
);
if ($user_notify_pm)
{
$rows[] = array(
'item_type' => 'pm',
'item_id' => 0,
'user_id' => (int) $user_id,
'notify' => 1,
'method' => 'email',
);
}
$sql = $db->sql_multi_insert(USER_NOTIFICATIONS_TABLE, $rows);
}