mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Adding a few safeguards to stop people from breaking their own boards ;)

Browse Source 
Translators, I'm sorry but this means some work for you.


git-svn-id: file:///svn/phpbb/trunk@7713 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2007-06-04 10:44:09 +00:00
parent 498b87df10
commit 22f5b1aff6
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/includes/acp/acp_styles.php
View File

@@ -1462,12 +1462,14 @@ parse_css_file = {PARSE_CSS_FILE}
$new_id = request_var('new_id', 0);
$update = (isset($_POST['update'])) ? true : false;
$sql_where = '';
switch ($mode)
{
case 'style':
$sql_from = STYLES_TABLE;
$sql_select = 'style_name';
$sql_where = 'AND style_active = 1';
break;
case 'template':
@@ -1502,7 +1504,8 @@ parse_css_file = {PARSE_CSS_FILE}
$sql = "SELECT {$mode}_id, {$mode}_name
FROM $sql_from
WHERE {$mode}_id <> $style_id
WHERE {$mode}_id <> $style_id
$sql_where
ORDER BY {$mode}_name ASC";
$result = $db->sql_query($sql);
@@ -1545,14 +1548,14 @@ parse_css_file = {PARSE_CSS_FILE}
set_config('default_style', $new_id);
}
}
else if ($mode == 'imageset')
{
$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
WHERE imageset_id = $style_id";
$db->sql_query($sql);
}
else
{
if ($mode == 'imageset')
{
$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
WHERE imageset_id = $style_id";
$db->sql_query($sql);
}
$sql = 'UPDATE ' . STYLES_TABLE . "
SET {$mode}_id = $new_id
WHERE {$mode}_id = $style_id";

29
phpBB/includes/ucp/ucp_groups.php
View File

@@ -943,14 +943,14 @@ class ucp_groups
$user->add_lang(array('acp/groups', 'acp/common'));
$name_ary = request_var('usernames', '', true);
$names = request_var('usernames', '', true);
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . $return_page);
}
if (!$name_ary)
if (!$names)
{
trigger_error($user->lang['NO_USERS'] . $return_page);
}
@@ -966,15 +966,30 @@ class ucp_groups
trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
}
$name_ary = array_unique(explode("\n", $name_ary));
$name_ary = array_unique(explode("\n", $names));
$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
$default = request_var('default', 0);
// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
if (confirm_box(true))
{
trigger_error($user->lang[$error] . $return_page);
// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
{
trigger_error($user->lang[$error] . $return_page);
}
}
else
{
$s_hidden_fields = array(
'default' => $default,
'usernames' => $names,
'g' => $group_id,
'i' => $id,
'mode' => $mode,
'action' => $action
);
confirm_box(false, sprintf($user->lang['GROUP_CONFIRM_ADD_USER' . ((sizeof($name_ary) == 1) ? '' : 'S')], implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields));
}
trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));