mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-13 23:08:53 +00:00
Split words into separate file, various updates, fix for wrong template action name
git-svn-id: file:///svn/phpbb/trunk@968 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
parent
182ab7512b
commit
ad8c8ed6bf
4 changed files with 368 additions and 337 deletions
|
|
@ -23,8 +23,7 @@
|
||||||
if($setmodules == 1)
|
if($setmodules == 1)
|
||||||
{
|
{
|
||||||
$file = basename(__FILE__);
|
$file = basename(__FILE__);
|
||||||
$module['General']['Configuration'] = "$file?mode=config";
|
$module['General']['Configuration'] = "$file";
|
||||||
$module['General']['Word Censor'] = "$file?mode=words";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -33,11 +32,6 @@ if($setmodules == 1)
|
||||||
//
|
//
|
||||||
require('pagestart.inc');
|
require('pagestart.inc');
|
||||||
|
|
||||||
$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
|
|
||||||
|
|
||||||
switch($mode)
|
|
||||||
{
|
|
||||||
case 'config':
|
|
||||||
$sitename = (isset($HTTP_POST_VARS['sitename'])) ? $HTTP_POST_VARS['sitename'] : $board_config['sitename'];
|
$sitename = (isset($HTTP_POST_VARS['sitename'])) ? $HTTP_POST_VARS['sitename'] : $board_config['sitename'];
|
||||||
$require_activation = (isset($HTTP_POST_VARS['require_activation'])) ? $HTTP_POST_VARS['require_activation'] : $board_config['require_activation'];
|
$require_activation = (isset($HTTP_POST_VARS['require_activation'])) ? $HTTP_POST_VARS['require_activation'] : $board_config['require_activation'];
|
||||||
$flood_interval = (isset($HTTP_POST_VARS['flood_interval'])) ? $HTTP_POST_VARS['flood_interval'] : $board_config['flood_interval'];
|
$flood_interval = (isset($HTTP_POST_VARS['flood_interval'])) ? $HTTP_POST_VARS['flood_interval'] : $board_config['flood_interval'];
|
||||||
|
|
@ -203,169 +197,6 @@ switch($mode)
|
||||||
);
|
);
|
||||||
|
|
||||||
$template->pparse("body");
|
$template->pparse("body");
|
||||||
break;
|
|
||||||
|
|
||||||
case 'words':
|
|
||||||
$save = ($HTTP_POST_VARS['save']) ? TRUE : FALSE;
|
|
||||||
$add = ($HTTP_POST_VARS['add']) ? TRUE : FALSE;
|
|
||||||
$delete = ($HTTP_GET_VARS['delete']) ? TRUE : FALSE;
|
|
||||||
$success = FALSE;
|
|
||||||
|
|
||||||
if($HTTP_GET_VARS['edit'] || $HTTP_POST_VARS['edit'])
|
|
||||||
{
|
|
||||||
$edit = TRUE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$edit = FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(($edit || $add) && !$save)
|
|
||||||
{
|
|
||||||
$template->set_filenames(array(
|
|
||||||
"body" => "admin/words_edit_body.tpl")
|
|
||||||
);
|
|
||||||
|
|
||||||
if($edit)
|
|
||||||
{
|
|
||||||
$sql = "SELECT * FROM " . WORDS_TABLE . " WHERE word_id = " . $HTTP_GET_VARS['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="mode" value="'.$mode.'" /><input type="hidden" name="word_id" value="'.$word_info['word_id'].'" /><input type="hidden" name="edit" value="1" />';
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$s_hidden_fields = '<input type="hidden" name="mode" value="'.$mode.'" /><input type="hidden" name="add" value="1" />';
|
|
||||||
}
|
|
||||||
|
|
||||||
$template->assign_vars(array("L_WORDS_TITLE" => $lang['Words_title'],
|
|
||||||
"L_WORDS_TEXT" => $lang['Words_explain'],
|
|
||||||
"S_WORDS_ACTION" => $PHP_SELF,
|
|
||||||
"L_WORD_CENSOR" => $lang['Word_censor'],
|
|
||||||
"L_WORD" => $lang['Word'],
|
|
||||||
"L_REPLACEMENT" => $lang['Replacement'],
|
|
||||||
"WORD" => $word_info['word'],
|
|
||||||
"REPLACEMENT" => $word_info['replacement'],
|
|
||||||
"L_SUBMIT" => $lang['Submit'],
|
|
||||||
"S_HIDDEN_FIELDS" => $s_hidden_fields));
|
|
||||||
|
|
||||||
$template->pparse("body");
|
|
||||||
|
|
||||||
include('page_footer_admin.'.$phpEx);
|
|
||||||
|
|
||||||
exit();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if($save)
|
|
||||||
{
|
|
||||||
$word = trim(addslashes($HTTP_POST_VARS['word']));
|
|
||||||
$replacement = trim(addslashes($HTTP_POST_VARS['replacement']));
|
|
||||||
|
|
||||||
if(!$word || !$replacement)
|
|
||||||
{
|
|
||||||
message_die(GENERAL_ERROR, $lang['Must_enter_word'], $lang['Error']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if($edit)
|
|
||||||
{
|
|
||||||
$sql = "UPDATE " . WORDS_TABLE . " SET word = '$word', replacement = '$replacement' WHERE word_id = " . $HTTP_POST_VARS['word_id'];
|
|
||||||
$succ_msg = $lang['Word_updated'];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$sql = "INSERT INTO " . WORDS_TABLE . "(word, replacement) VALUES ('$word', '$replacement')";
|
|
||||||
$succ_msg = $lang['Word_added'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!$result = $db->sql_query($sql))
|
|
||||||
{
|
|
||||||
message_die(GENERAL_ERROR, "Could not insert data into words table", $lang['Error'], __LINE__, __FILE__, $sql);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$success = TRUE;
|
|
||||||
$msg = $succ_msg;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if($delete)
|
|
||||||
{
|
|
||||||
$word_id = $HTTP_GET_VARS['word_id'];
|
|
||||||
|
|
||||||
$sql = "DELETE FROM " . WORDS_TABLE . " WHERE word_id = $word_id";
|
|
||||||
|
|
||||||
if(!$result = $db->sql_query($sql))
|
|
||||||
{
|
|
||||||
message_die(GENERAL_ERROR, "Could not remove data from words table", $lang['Error'], __LINE__, __FILE__, $sql);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$success = TRUE;
|
|
||||||
$msg = $lang['Word_removed'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if($success)
|
|
||||||
{
|
|
||||||
$template->set_filenames(array(
|
|
||||||
"reg_header" => "error_body.tpl")
|
|
||||||
);
|
|
||||||
$template->assign_vars(array(
|
|
||||||
"ERROR_MESSAGE" => $msg)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$template->set_filenames(array(
|
|
||||||
"body" => "admin/words_list_body.tpl")
|
|
||||||
);
|
|
||||||
|
|
||||||
$sql = "SELECT * FROM " . WORDS_TABLE . " ORDER BY word";
|
|
||||||
if(!$result = $db->sql_query($sql))
|
|
||||||
{
|
|
||||||
message_die(GENERAL_ERROR, "Could not query words table", $lang['Error'], __LINE__, __FILE__, $sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
$word_rows = $db->sql_fetchrowset($result);
|
|
||||||
$word_count = count($word_rows);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$template->assign_vars(array("L_WORDS_TITLE" => $lang['Words_title'],
|
|
||||||
"L_WORDS_TEXT" => $lang['Words_explain'],
|
|
||||||
"S_WORDS_ACTION" => $PHP_SELF,
|
|
||||||
"L_WORD" => $lang['Word'],
|
|
||||||
"L_REPLACEMENT" => $lang['Replacement'],
|
|
||||||
"L_EDIT" => $lang['Edit'],
|
|
||||||
"L_DELETE" => $lang['Delete'],
|
|
||||||
"L_WORD_ADD" => $lang['Add_word_censor'],
|
|
||||||
"S_HIDDEN_FIELDS" => "<input type=\"hidden\" name=\"mode\" value=\"$mode\" />",
|
|
||||||
"L_ACTION" => $lang['Action']));
|
|
||||||
|
|
||||||
if($success)
|
|
||||||
{
|
|
||||||
$template->assign_var_from_handle("OPT_MESSAGE", "reg_header");
|
|
||||||
}
|
|
||||||
|
|
||||||
for($i = 0; $i < $word_count; $i++)
|
|
||||||
{
|
|
||||||
$word = $word_rows[$i]['word'];
|
|
||||||
$replacement = $word_rows[$i]['replacement'];
|
|
||||||
$word_id = $word_rows[$i]['word_id'];
|
|
||||||
|
|
||||||
$template->assign_block_vars("words", array("WORD" => $word,
|
|
||||||
"REPLACEMENT" => $replacement,
|
|
||||||
"U_WORD_EDIT" => append_sid("$PHP_SELF?mode=words&edit=1&word_id=$word_id"),
|
|
||||||
"U_WORD_DELETE" => append_sid("$PHP_SELF?mode=words&delete=1&word_id=$word_id")));
|
|
||||||
}
|
|
||||||
|
|
||||||
$template->pparse("body");
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
include('page_footer_admin.'.$phpEx);
|
include('page_footer_admin.'.$phpEx);
|
||||||
|
|
||||||
|
|
|
||||||
204
phpBB/admin/admin_words.php
Normal file
204
phpBB/admin/admin_words.php
Normal file
|
|
@ -0,0 +1,204 @@
|
||||||
|
<?php
|
||||||
|
/***************************************************************************
|
||||||
|
* admin_words.php
|
||||||
|
* -------------------
|
||||||
|
* begin : Thursday, Jul 12, 2001
|
||||||
|
* copyright : (C) 2001 The phpBB Group
|
||||||
|
* email : support@phpbb.com
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*
|
||||||
|
*
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
/***************************************************************************
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
if($setmodules == 1)
|
||||||
|
{
|
||||||
|
$file = basename(__FILE__);
|
||||||
|
$module['General']['Word Censor'] = "$file";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// Include required files, get $phpEx and check permissions
|
||||||
|
//
|
||||||
|
require('pagestart.inc');
|
||||||
|
|
||||||
|
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
|
||||||
|
{
|
||||||
|
$mode = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
if( $mode != "" )
|
||||||
|
{
|
||||||
|
if( $mode == "edit" || $mode == "add" )
|
||||||
|
{
|
||||||
|
$template->set_filenames(array(
|
||||||
|
"body" => "admin/words_edit_body.tpl")
|
||||||
|
);
|
||||||
|
|
||||||
|
$s_hidden_fields = '<input type="hidden" name="mode" value="save" />';
|
||||||
|
|
||||||
|
if( $mode == "edit" )
|
||||||
|
{
|
||||||
|
$sql = "SELECT *
|
||||||
|
FROM " . WORDS_TABLE . "
|
||||||
|
WHERE word_id = " . $HTTP_GET_VARS['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_info['word_id'] . '" />';
|
||||||
|
}
|
||||||
|
|
||||||
|
$template->assign_vars(array(
|
||||||
|
"WORD" => $word_info['word'],
|
||||||
|
"REPLACEMENT" => $word_info['replacement'],
|
||||||
|
|
||||||
|
"L_WORDS_TITLE" => $lang['Words_title'],
|
||||||
|
"L_WORDS_TEXT" => $lang['Words_explain'],
|
||||||
|
"L_WORD_CENSOR" => $lang['Word_censor'],
|
||||||
|
"L_WORD" => $lang['Word'],
|
||||||
|
"L_REPLACEMENT" => $lang['Replacement'],
|
||||||
|
"L_SUBMIT" => $lang['Submit'],
|
||||||
|
|
||||||
|
"S_WORDS_ACTION" => append_sid("admin_words.$phpEx"),
|
||||||
|
"S_HIDDEN_FIELDS" => $s_hidden_fields)
|
||||||
|
);
|
||||||
|
|
||||||
|
$template->pparse("body");
|
||||||
|
|
||||||
|
include('page_footer_admin.'.$phpEx);
|
||||||
|
}
|
||||||
|
else if( $mode == "save" )
|
||||||
|
{
|
||||||
|
$word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : 0;
|
||||||
|
$word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : "";
|
||||||
|
$replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : "";
|
||||||
|
|
||||||
|
if($word == ""|| $replacement == "")
|
||||||
|
{
|
||||||
|
message_die(GENERAL_MESSAGE, $lang['Must_enter_word']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if( $word_id )
|
||||||
|
{
|
||||||
|
$sql = "UPDATE " . WORDS_TABLE . "
|
||||||
|
SET word = '$word', replacement = '$replacement'
|
||||||
|
WHERE word_id = $word_id";
|
||||||
|
$message_success = $lang['Word_updated'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$sql = "INSERT INTO " . WORDS_TABLE . " (word, replacement)
|
||||||
|
VALUES ('$word', '$replacement')";
|
||||||
|
$message_success = $lang['Word_added'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!$result = $db->sql_query($sql))
|
||||||
|
{
|
||||||
|
message_die(GENERAL_ERROR, "Could not insert data into words table", $lang['Error'], __LINE__, __FILE__, $sql);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
message_die(GENERAL_MESSAGE, $message_success);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if( $mode == "delete" )
|
||||||
|
{
|
||||||
|
if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) )
|
||||||
|
{
|
||||||
|
$word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$word_id = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( $word_id )
|
||||||
|
{
|
||||||
|
$sql = "DELETE FROM " . WORDS_TABLE . "
|
||||||
|
WHERE word_id = $word_id";
|
||||||
|
|
||||||
|
if(!$result = $db->sql_query($sql))
|
||||||
|
{
|
||||||
|
message_die(GENERAL_ERROR, "Could not remove data from words table", $lang['Error'], __LINE__, __FILE__, $sql);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
message_die(GENERAL_MESSAGE, $lang['Word_removed']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
message_die(GENERAL_MESSAGE, $lang['Must_specify_word']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$template->set_filenames(array(
|
||||||
|
"body" => "admin/words_list_body.tpl")
|
||||||
|
);
|
||||||
|
|
||||||
|
$sql = "SELECT *
|
||||||
|
FROM " . WORDS_TABLE . "
|
||||||
|
ORDER BY word";
|
||||||
|
if( !$result = $db->sql_query($sql) )
|
||||||
|
{
|
||||||
|
message_die(GENERAL_ERROR, "Could not query words table", $lang['Error'], __LINE__, __FILE__, $sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
$word_rows = $db->sql_fetchrowset($result);
|
||||||
|
$word_count = count($word_rows);
|
||||||
|
|
||||||
|
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
|
||||||
|
|
||||||
|
$template->assign_vars(array(
|
||||||
|
"L_WORDS_TITLE" => $lang['Words_title'],
|
||||||
|
"L_WORDS_TEXT" => $lang['Words_explain'],
|
||||||
|
"L_WORD" => $lang['Word'],
|
||||||
|
"L_REPLACEMENT" => $lang['Replacement'],
|
||||||
|
"L_EDIT" => $lang['Edit'],
|
||||||
|
"L_DELETE" => $lang['Delete'],
|
||||||
|
"L_WORD_ADD" => $lang['Add_word_censor'],
|
||||||
|
"L_ACTION" => $lang['Action'],
|
||||||
|
|
||||||
|
"S_WORDS_ACTION" => append_sid("admin_words.$phpEx"),
|
||||||
|
"S_HIDDEN_FIELDS" => $s_hidden_fields)
|
||||||
|
);
|
||||||
|
|
||||||
|
for($i = 0; $i < $word_count; $i++)
|
||||||
|
{
|
||||||
|
$word = $word_rows[$i]['word'];
|
||||||
|
$replacement = $word_rows[$i]['replacement'];
|
||||||
|
$word_id = $word_rows[$i]['word_id'];
|
||||||
|
|
||||||
|
$template->assign_block_vars("words", array(
|
||||||
|
"WORD" => $word,
|
||||||
|
"REPLACEMENT" => $replacement,
|
||||||
|
"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&id=$word_id"),
|
||||||
|
"U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&id=$word_id"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$template->pparse("body");
|
||||||
|
|
||||||
|
include('page_footer_admin.'.$phpEx);
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
@ -5,8 +5,7 @@
|
||||||
|
|
||||||
<p>{L_WORDS_TEXT}</p>
|
<p>{L_WORDS_TEXT}</p>
|
||||||
|
|
||||||
<form method="post" action="{S_WORD_ACTION}">
|
<form method="post" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
|
||||||
<table cellspacing="1" cellpadding="4" border="0" align="center">
|
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2">{L_WORD_CENSOR}</th>
|
<th colspan="2">{L_WORD_CENSOR}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,7 @@
|
||||||
|
|
||||||
<P>{L_WORDS_TEXT}</p>
|
<P>{L_WORDS_TEXT}</p>
|
||||||
|
|
||||||
<p>{OPT_MESSAGE}</p>
|
<form method="POST" action="{S_WORDS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
|
||||||
|
|
||||||
<form method="POST" action="{S_WORDS_ACTION}">
|
|
||||||
<table cellspacing="1" cellpadding="4" border="0" align="center">
|
|
||||||
<tr>
|
<tr>
|
||||||
<th>{L_WORD}</th>
|
<th>{L_WORD}</th>
|
||||||
<th>{L_REPLACEMENT}</th>
|
<th>{L_REPLACEMENT}</th>
|
||||||
|
|
@ -23,6 +20,6 @@
|
||||||
</tr>
|
</tr>
|
||||||
<!-- END words -->
|
<!-- END words -->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="cat" 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_WORD_ADD}" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></form>
|
</table></form>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue