diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-02 22:59:41 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-02 22:59:41 +0000 |
| commit | 61a1e500525ee0c0a4fc807a33635d6f89d3b79b (patch) | |
| tree | 020c31aefe26f08d617b8ed5c406400e3c8a9908 | |
| parent | dce8578de5bf86acb1848fc50a83f7f63852bf31 (diff) | |
| download | forums-61a1e500525ee0c0a4fc807a33635d6f89d3b79b.tar forums-61a1e500525ee0c0a4fc807a33635d6f89d3b79b.tar.gz forums-61a1e500525ee0c0a4fc807a33635d6f89d3b79b.tar.bz2 forums-61a1e500525ee0c0a4fc807a33635d6f89d3b79b.tar.xz forums-61a1e500525ee0c0a4fc807a33635d6f89d3b79b.zip | |
Fixed Add Word - 2
git-svn-id: file:///svn/phpbb/trunk@975 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_words.php | 51 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 4 | ||||
| -rwxr-xr-x | phpBB/templates/PSO/admin/words_list_body.tpl | 2 |
3 files changed, 40 insertions, 17 deletions
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php index dd3860265f..5d660a78c0 100644 --- a/phpBB/admin/admin_words.php +++ b/phpBB/admin/admin_words.php @@ -36,33 +36,56 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { $mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; } -else +else { - $mode = ""; + // + // These could be entered via a form button + // + if( isset($HTTP_POST_VARS['add']) ) + { + $mode = "add"; + } + else if( isset($HTTP_POST_VARS['save']) ) + { + $mode = "save"; + } + else + { + $mode = ""; + } } if( $mode != "" ) { if( $mode == "edit" || $mode == "add" ) { + $word_id = ( isset($HTTP_GET_VARS['id']) ) ? $HTTP_GET_VARS['id'] : 0; + $template->set_filenames(array( "body" => "admin/words_edit_body.tpl") ); - $s_hidden_fields = '<input type="hidden" name="mode" value="save" />'; + $s_hidden_fields = ''; if( $mode == "edit" ) { - $sql = "SELECT * - FROM " . WORDS_TABLE . " - WHERE word_id = " . $HTTP_GET_VARS['id']; - if(!$result = $db->sql_query($sql)) + if( $word_id ) { - message_die(GENERAL_ERROR, "Could not query words table", "Error", __LINE__, __FILE__, $sql); + $sql = "SELECT * + FROM " . WORDS_TABLE . " + WHERE word_id = $word_id"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not query words table", "Error", __LINE__, __FILE__, $sql); + } + + $word_info = $db->sql_fetchrow($result); + $s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />'; + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_word_selected']); } - - $word_info = $db->sql_fetchrow($result); - $s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_info['word_id'] . '" />'; } $template->assign_vars(array( @@ -166,8 +189,6 @@ else $word_rows = $db->sql_fetchrowset($result); $word_count = count($word_rows); - $s_hidden_fields = '<input type="hidden" name="mode" value="add" />'; - $template->assign_vars(array( "L_WORDS_TITLE" => $lang['Words_title'], "L_WORDS_TEXT" => $lang['Words_explain'], @@ -175,11 +196,11 @@ else "L_REPLACEMENT" => $lang['Replacement'], "L_EDIT" => $lang['Edit'], "L_DELETE" => $lang['Delete'], - "L_WORD_ADD" => $lang['Add_new_word'], + "L_ADD_WORD" => $lang['Add_new_word'], "L_ACTION" => $lang['Action'], "S_WORDS_ACTION" => append_sid("admin_words.$phpEx"), - "S_HIDDEN_FIELDS" => $s_hidden_fields) + "S_HIDDEN_FIELDS" => '') ); for($i = 0; $i < $word_count; $i++) diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index fe5ae96cb2..b7491ef1ef 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -850,10 +850,12 @@ $lang['days'] = 'Days'; $lang['Word_censor'] = "Word Censor"; $lang['Word'] = "Word"; $lang['Replacement'] = "Replacement"; -$lang['Add_new_word'] = "Add new word to list"; +$lang['Add_new_word'] = "Add new word"; +$lang['Update_word'] = "Update word censor"; $lang['Words_title'] = "Word Censors"; $lang['Words_explain'] = "From this control panel you can add, edit, and remove words that will be automatically censored on your forums. Wildcards (*) are accepted in the word field! (i.e.: *test*, test*, *test, and test are all valid)"; $lang['Must_enter_word'] = "You must enter a word and it's replacement!"; +$lang['No_word_selected'] = "No word selected for editing"; $lang['Word_updated'] = "The selected word censor has been successfully updated"; $lang['Word_added'] = "The word censor has been successfully added"; $lang['Word_removed'] = "The selected word censor has been successfully removed"; diff --git a/phpBB/templates/PSO/admin/words_list_body.tpl b/phpBB/templates/PSO/admin/words_list_body.tpl index a7aad0e78f..1e39edb767 100755 --- a/phpBB/templates/PSO/admin/words_list_body.tpl +++ b/phpBB/templates/PSO/admin/words_list_body.tpl @@ -20,6 +20,6 @@ </tr> <!-- END words --> <tr> - <td colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_WORD_ADD}" /></td> + <td colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_ADD_WORD}" /></td> </tr> </table></form> |