diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-08-31 20:32:44 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-08-31 20:32:44 +0000 |
| commit | ddf104d7817deb77c92de40653790ceab64f2c45 (patch) | |
| tree | 49f1f8c1c78699d5510113b76e4dcf689f896332 | |
| parent | 6d77d2348e36a72f1b965330b6bddf63395158cd (diff) | |
| download | forums-ddf104d7817deb77c92de40653790ceab64f2c45.tar forums-ddf104d7817deb77c92de40653790ceab64f2c45.tar.gz forums-ddf104d7817deb77c92de40653790ceab64f2c45.tar.bz2 forums-ddf104d7817deb77c92de40653790ceab64f2c45.tar.xz forums-ddf104d7817deb77c92de40653790ceab64f2c45.zip | |
Fixes for bugs 457239 and 457301
git-svn-id: file:///svn/phpbb/trunk@955 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_groups.php | 20 | ||||
| -rw-r--r-- | phpBB/db/postgres_schema.sql | 1 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 3 | ||||
| -rw-r--r-- | phpBB/modcp.php | 17 |
4 files changed, 28 insertions, 13 deletions
diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php index 76259e7f24..c0a5c0d336 100644 --- a/phpBB/admin/admin_groups.php +++ b/phpBB/admin/admin_groups.php @@ -186,7 +186,6 @@ else if( $HTTP_POST_VARS['updategroup'] == "update" ) '" . $group_moderator . "', '0' )"; - break; case 'default': @@ -200,13 +199,8 @@ else if( $HTTP_POST_VARS['updategroup'] == "update" ) } if ( $mode == "newgroup" ) { - $sql = "SELECT * FROM " . GROUPS_TABLE . " - WHERE group_name = '" . $group_name . "'"; - if ( !$result = $db->sql_query($sql) ) - { - $error = TRUE; - } - $group_info = $db->sql_fetchrow($result); + $new_group_id = $db->sql_nextid($result); + $sql = "INSERT INTO " . USER_GROUP_TABLE . " ( group_id, @@ -215,8 +209,8 @@ else if( $HTTP_POST_VARS['updategroup'] == "update" ) ) VALUES ( - '" . $group_info['group_id'] . "', - '" . $group_info['group_moderator'] . "', + '" . $new_group_id . "', + '" . $group_moderator . "', '0' )"; if ( !$result = $db->sql_query($sql) ) @@ -226,11 +220,11 @@ else if( $HTTP_POST_VARS['updategroup'] == "update" ) } if ( isset($error) ) { - message_die(GENERAL_ERROR, $lang['Error_updating_groups'], __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, $lang['Error_updating_groups'], $lang['Error'], __LINE__, __FILE__, $sql); } else { - message_die(GENERALL_MESSAGE, $lang['Success_updating_groups']); + message_die(GENERAL_MESSAGE, $lang['Success_updating_groups'], $lang['Success']); } } else @@ -268,6 +262,6 @@ else $template->pparse('body'); } -include($phpbb_root_path . 'includes/page_tail.'.$phpEx); +include('page_footer_admin.'.$phpEx); ?>
\ No newline at end of file diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql index 2364494258..c50d655f13 100644 --- a/phpBB/db/postgres_schema.sql +++ b/phpBB/db/postgres_schema.sql @@ -50,6 +50,7 @@ CREATE INDEX group_id_phpbb_auth_access_index ON phpbb_auth_access (forum_id); CREATE TABLE phpbb_groups ( group_id int DEFAULT nextval('phpbb_groups_id_seq'::text) NOT NULL, group_name varchar(40) NOT NULL, + group_type int2 DEFAULT '1' NOT NULL, group_description varchar(255) NOT NULL, group_moderator int4 DEFAULT '0' NOT NULL, group_single_user int2 DEFAULT '0' NOT NULL, diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index b36a0a16f0..62994d1218 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -118,6 +118,8 @@ $lang['Jump_to'] = "Jump to"; $lang['Select_forum'] = "Select a forum"; $lang['Go'] = "Go"; +$lang['Success'] = "Success"; + // // Global Header strings // @@ -603,6 +605,7 @@ $lang['Split_after'] = "Split from selected post"; $lang['Topic_split'] = "The selected topic has been split successfully"; $lang['Too_many_error'] = "You have selected too many posts. You can only select one post to split a topic after!"; $lang['New_forum'] = "New forum"; +$lang['None_selected'] = "You have no selected any topics to preform this operation on. Please go back and select at least one."; diff --git a/phpBB/modcp.php b/phpBB/modcp.php index 416a44a5cb..07f7454d3e 100644 --- a/phpBB/modcp.php +++ b/phpBB/modcp.php @@ -241,6 +241,10 @@ switch($mode) } else { + if(empty($HTTP_POST_VARS['preform_op']) && empty($topic_id)) + { + message_die(GENERAL_MESSAGE, $lang['None_selected'], $lang['Error']); + } $hidden_fields = '<input type="hidden" name="mode" value="'.$mode.'"><input type="hidden" name="'.POST_FORUM_URL.'" value="'.$forum_id.'"><input type="hidden" name="quick_op" value="'.$quick_op.'">'; if($HTTP_POST_VARS['preform_op']) { @@ -373,6 +377,10 @@ switch($mode) } else { + if(empty($HTTP_POST_VARS['preform_op']) && empty($topic_id)) + { + message_die(GENERAL_MESSAGE, $lang['None_selected'], $lang['Error']); + } $hidden_fields = '<input type="hidden" name="mode" value="'.$mode.'"><input type="hidden" name="'.POST_FORUM_URL.'" value="'.$forum_id.'"><input type="hidden" name="quick_op" value="'.$quick_op.'">'; $hidden_fields .= $lang['New_forum'] . ': ' . make_forum_box('new_forum'). '</select><br><br>'; if($HTTP_POST_VARS['preform_op']) @@ -442,6 +450,10 @@ switch($mode) } else { + if(empty($HTTP_POST_VARS['preform_op']) && empty($topic_id)) + { + message_die(GENERAL_MESSAGE, $lang['None_selected'], $lang['Error']); + } $hidden_fields = '<input type="hidden" name="mode" value="'.$mode.'"><input type="hidden" name="'.POST_FORUM_URL.'" value="'.$forum_id.'"><input type="hidden" name="quick_op" value="'.$quick_op.'">'; if($HTTP_POST_VARS['preform_op']) { @@ -514,6 +526,11 @@ switch($mode) } else { + if(empty($HTTP_POST_VARS['preform_op']) && empty($topic_id)) + { + message_die(GENERAL_MESSAGE, $lang['None_selected'], $lang['Error']); + } + $hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '"><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '"><input type="hidden" name="quick_op" value="' . $quick_op . '">'; if($HTTP_POST_VARS['preform_op']) |