mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 15:57:45 +02:00
Code Issues Releases Wiki Activity

[ticket/9549] Make the class non static and extend delete_group function.

Browse Source 
delete_group() can now be used, so it does not update the actual group.
This can save a query, when you update the group anyway.

PHPBB3-9549
This commit is contained in:
Joas Schilling
2011-02-14 16:09:09 +01:00
parent 750fc3aca8
commit 8d12838aed
5 changed files with 154 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/includes/functions_user.php
View File

@@ -2495,13 +2495,15 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
if (!sizeof($error))
{
$current_legend = phpbb_group_positions::GROUP_DISABLED;
$current_teampage = phpbb_group_positions::GROUP_DISABLED;
$legend = new phpbb_group_positions($db, 'legend');
$teampage = new phpbb_group_positions($db, 'teampage');
if ($group_id)
{
$current_legend = phpbb_group_positions::get_group_value('legend', $group_id);
$current_teampage = phpbb_group_positions::get_group_value('teampage', $group_id);
$current_legend = $legend->get_group_value($group_id);
$current_teampage = $teampage->get_group_value($group_id);
}
if (isset($group_attributes['group_legend']))
@@ -2509,7 +2511,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
if (($group_id && ($current_legend == phpbb_group_positions::GROUP_DISABLED)) || !$group_id)
{
// Old group currently not in the legend or new group, add at the end.
$group_attributes['group_legend'] = 1 + phpbb_group_positions::get_group_count('legend');
$group_attributes['group_legend'] = 1 + $legend->get_group_count();
}
else
{
@@ -2520,10 +2522,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
else if ($group_id && ($current_legend > phpbb_group_positions::GROUP_DISABLED))
{
// Group is removed from the legend
$sql = 'UPDATE ' . GROUPS_TABLE . '
SET group_teampage = group_teampage - 1
WHERE group_teampage > ' . $current_legend;
$db->sql_query($sql);
$legend->delete_group($group_id, true);
$group_attributes['group_legend'] = phpbb_group_positions::GROUP_DISABLED;
}
else
@@ -2536,7 +2535,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
if (($group_id && ($current_teampage == phpbb_group_positions::GROUP_DISABLED)) || !$group_id)
{
// Old group currently not on the teampage or new group, add at the end.
$group_attributes['group_teampage'] = 1 + phpbb_group_positions::get_group_count('teampage');
$group_attributes['group_teampage'] = 1 + $teampage->get_group_count();
}
else
{
@@ -2547,10 +2546,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
else if ($group_id && ($current_teampage > phpbb_group_positions::GROUP_DISABLED))
{
// Group is removed from the teampage
$sql = 'UPDATE ' . GROUPS_TABLE . '
SET group_teampage = group_teampage - 1
WHERE group_teampage > ' . $current_teampage;
$db->sql_query($sql);
$teampage->delete_group($group_id, true);
$group_attributes['group_teampage'] = phpbb_group_positions::GROUP_DISABLED;
}
else
@@ -2558,6 +2554,10 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
$group_attributes['group_teampage'] = phpbb_group_positions::GROUP_DISABLED;
}
// Unset the objects, we don't need them anymore.
unset($legend);
unset($teampage);
$user_ary = array();
$sql_ary = array(
'group_name' => (string) $name,
@@ -2783,8 +2783,12 @@ function group_delete($group_id, $group_name = false)
while ($start);
// Delete group from legend and teampage
phpbb_group_positions::delete_group('legend', $group_id);
phpbb_group_positions::delete_group('teampage', $group_id);
$legend = new phpbb_group_positions($db, 'legend');
$legend->delete_group($group_id);
unset($legend);
$teampage = new phpbb_group_positions($db, 'teampage');
$teampage->delete_group($group_id);
unset($teampage);
// Delete group
$sql = 'DELETE FROM ' . GROUPS_TABLE . "