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

[ticket/9549] Fix some minor issues with descriptions and coding-guidelines.

Browse source 
PHPBB3-9549
This commit is contained in:
Joas Schilling 2011-02-16 10:47:41 +01:00
parent ad05f32c49
commit d2e2ccf8a4
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_groups_position.html
View file

@ -155,4 +155,4 @@
</fieldset> </fieldset>
</form> </form>
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

11
phpBB/includes/group_positions.php
View file

@ -2,8 +2,7 @@
/** /**
* *
* @package phpBB3 * @package phpBB3
* @version $Id$ * @copyright (c) 2011 phpBB Group
* @copyright (c) 2005 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */
@ -125,10 +124,10 @@ class phpbb_group_positions
} }
/** /**
* Deletes a group by group_id * Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
* *
* @param int $group_id group_id of the group to be deleted * @param int $group_id group_id of the group to be deleted
* @param bool $skip_group Skip the group itself, to save the query, when you need to update it anyway. * @param bool $skip_group Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
* @return void * @return void
*/ */
public function delete_group($group_id, $skip_group = false) public function delete_group($group_id, $skip_group = false)
@ -177,7 +176,7 @@ class phpbb_group_positions
$this->db->sql_query($sql); $this->db->sql_query($sql);
$sql = 'UPDATE ' . GROUPS_TABLE . ' $sql = 'UPDATE ' . GROUPS_TABLE . '
SET group_' . $this->field . ' = ' . ($current_value - 1) . ' SET group_' . $this->field . ' = group_' . $this->field . ' - 1
WHERE group_id = ' . (int) $group_id; WHERE group_id = ' . (int) $group_id;
$this->db->sql_query($sql); $this->db->sql_query($sql);
@ -208,7 +207,7 @@ class phpbb_group_positions
{ {
// Only update when we move another one up, otherwise it was the last. // Only update when we move another one up, otherwise it was the last.
$sql = 'UPDATE ' . GROUPS_TABLE . ' $sql = 'UPDATE ' . GROUPS_TABLE . '
SET group_' . $this->field . ' = ' . ($current_value + 1) . ' SET group_' . $this->field . ' = group_' . $this->field . ' + 1
WHERE group_id = ' . (int) $group_id; WHERE group_id = ' . (int) $group_id;
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }

4
phpBB/language/en/acp/groups.php
View file

@ -110,7 +110,7 @@ $lang = array_merge($lang, array(
'LEGEND_EXPLAIN' => 'These are the groups, which are viewed on the group legend:', 'LEGEND_EXPLAIN' => 'These are the groups, which are viewed on the group legend:',
'LEGEND_SETTINGS' => 'Legend settings', 'LEGEND_SETTINGS' => 'Legend settings',
'LEGEND_SORT_GROUPNAME' => 'Sort legend by group name', 'LEGEND_SORT_GROUPNAME' => 'Sort legend by group name',
'LEGEND_SORT_GROUPNAME_EXPLAIN' => 'The order from bellow is ignored when this option is enabled.', 'LEGEND_SORT_GROUPNAME_EXPLAIN' => 'The order below is ignored when this option is enabled.',
'MANAGE_LEGEND' => 'Manage group legend', 'MANAGE_LEGEND' => 'Manage group legend',
'MANAGE_TEAMPAGE' => 'Manage teampage', 'MANAGE_TEAMPAGE' => 'Manage teampage',
@ -131,7 +131,7 @@ $lang = array_merge($lang, array(
'TEAMPAGE_EXPLAIN' => 'These are the groups, which are viewed on the teampage:', 'TEAMPAGE_EXPLAIN' => 'These are the groups, which are viewed on the teampage:',
'TEAMPAGE_FORUMS' => 'Display moderator forums', 'TEAMPAGE_FORUMS' => 'Display moderator forums',
'TEAMPAGE_FORUMS_EXPLAIN' => 'If set to yes, moderators will have a list with all of the forums, where they have moderator permissions, in their row. This can be very SQL intensive for big boards.', 'TEAMPAGE_FORUMS_EXPLAIN' => 'If set to yes, moderators will have a list with all of the forums, where they have moderator permissions, in their row. This can be very database intensive for big boards.',
'TEAMPAGE_MULTIPLE' => 'Display users in all groups', 'TEAMPAGE_MULTIPLE' => 'Display users in all groups',
'TEAMPAGE_MULTIPLE_EXPLAIN' => 'If set to no, the users will only be displayed in their first group.', 'TEAMPAGE_MULTIPLE_EXPLAIN' => 'If set to no, the users will only be displayed in their first group.',
'TEAMPAGE_SETTINGS' => 'Teampage settings', 'TEAMPAGE_SETTINGS' => 'Teampage settings',

2
tests/group_positions/group_positions_test.php
View file

@ -2,7 +2,7 @@
/** /**
* *
* @package testing * @package testing
* @copyright (c) 2008 phpBB Group * @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */