diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-03 02:46:11 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-03 02:46:11 +0000 |
| commit | 40931f12ba11c9fcfe6fae289f00ec689aa455b6 (patch) | |
| tree | 02509f503b45d85d5c016b7bf7e45c3a68911669 /phpBB | |
| parent | e2862f3ebd79459c8227566269fc14d54d168c08 (diff) | |
| download | forums-40931f12ba11c9fcfe6fae289f00ec689aa455b6.tar forums-40931f12ba11c9fcfe6fae289f00ec689aa455b6.tar.gz forums-40931f12ba11c9fcfe6fae289f00ec689aa455b6.tar.bz2 forums-40931f12ba11c9fcfe6fae289f00ec689aa455b6.tar.xz forums-40931f12ba11c9fcfe6fae289f00ec689aa455b6.zip | |
bah ... went the sheep
git-svn-id: file:///svn/phpbb/trunk@4787 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/admin_groups.php | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php index ad53feff0a..75e2e6c126 100644 --- a/phpBB/adm/admin_groups.php +++ b/phpBB/adm/admin_groups.php @@ -238,53 +238,53 @@ function marklist(match, status) trigger_error($user->lang['NO_GROUP']); } - $name = request_var('group_name', ''); - $desc = request_var('group_description', ''); - $type = request_var('group_type', 0); + // Did we submit? + if ($update) + { + $group_name = request_var('group_name', ''); + $group_desc = request_var('group_description', ''); + $group_type = request_var('group_type', 0); - $colour = request_var('group_colour', ''); - $rank = request_var('group_rank', 0); + $colour = request_var('group_colour', ''); + $rank = request_var('group_rank', 0); - $data['uploadurl'] = request_var('uploadurl', ''); - $data['remotelink'] = request_var('remotelink', ''); - $delete = request_var('delete', ''); + $data['uploadurl'] = request_var('uploadurl', ''); + $data['remotelink'] = request_var('remotelink', ''); + $delete = request_var('delete', ''); - if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) - { - $data['width'] = request_var('width', ''); - $data['height'] = request_var('height', ''); - - // Avatar stuff - $var_ary = array( - 'uploadurl' => array('string', true, 5, 255), - 'remotelink' => array('string', true, 5, 255), - 'width' => array('string', true, 1, 3), - 'height' => array('string', true, 1, 3), - ); - - if (!($error = validate_data($data, $var_ary))) + if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) { - $data['user_id'] = "g$group_id"; - - if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) + $data['width'] = request_var('width', ''); + $data['height'] = request_var('height', ''); + + // Avatar stuff + $var_ary = array( + 'uploadurl' => array('string', true, 5, 255), + 'remotelink' => array('string', true, 5, 255), + 'width' => array('string', true, 1, 3), + 'height' => array('string', true, 1, 3), + ); + + if (!($error = validate_data($data, $var_ary))) { - list($avatar_type, $avatar, $avatar_width, $avatar_height) = avatar_upload($data, $error); - } - else if ($data['remotelink']) - { - list($avatar_type, $avatar, $avatar_width, $avatar_height) = avatar_remote($data, $error); + $data['user_id'] = "g$group_id"; + + if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) + { + list($avatar_type, $avatar, $avatar_width, $avatar_height) = avatar_upload($data, $error); + } + else if ($data['remotelink']) + { + list($avatar_type, $avatar, $avatar_width, $avatar_height) = avatar_remote($data, $error); + } } } - } - else if ($delete) - { - $avatar = ''; - $avatar_type = $avatar_width = $avatar_height = 0; - } + else if ($delete) + { + $avatar = ''; + $avatar_type = $avatar_width = $avatar_height = 0; + } - // Did we submit? - if ($update) - { if (($avatar && $group_avatar != $avatar) || $delete) { avatar_delete($group_avatar); @@ -293,7 +293,7 @@ function marklist(match, status) // Only set the rank, colour, etc. if it's changed or if we're adding a new // group. This prevents existing group members being updated if no changes // were made. - foreach (array('name', 'desc', 'type', 'rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height') as $test) + foreach (array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height') as $test) { ${'group_' . $test} = ($action == 'add' || (isset($$test) && $$test != ${'group_' . $test})) ? $$test : false; } |