From ad8c8ed6bf539fabf10c00d34c8a24ee02c3e0ca Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 2 Sep 2001 13:33:23 +0000 Subject: [PATCH] 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 --- phpBB/admin/admin_board.php | 491 ++++++------------ phpBB/admin/admin_words.php | 204 ++++++++ phpBB/templates/PSO/admin/words_edit_body.tpl | 3 +- phpBB/templates/PSO/admin/words_list_body.tpl | 7 +- 4 files changed, 368 insertions(+), 337 deletions(-) create mode 100644 phpBB/admin/admin_words.php diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 3afa0b9d57..c2ac991da0 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -23,8 +23,7 @@ if($setmodules == 1) { $file = basename(__FILE__); - $module['General']['Configuration'] = "$file?mode=config"; - $module['General']['Word Censor'] = "$file?mode=words"; + $module['General']['Configuration'] = "$file"; return; } @@ -33,340 +32,172 @@ if($setmodules == 1) // require('pagestart.inc'); -$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; +$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']; +$flood_interval = (isset($HTTP_POST_VARS['flood_interval'])) ? $HTTP_POST_VARS['flood_interval'] : $board_config['flood_interval']; +$topics_per_page = (isset($HTTP_POST_VARS['topics_per_page'])) ? $HTTP_POST_VARS['topics_per_page'] : $board_config['topics_per_page']; +$posts_per_page = (isset($HTTP_POST_VARS['posts_per_page'])) ? $HTTP_POST_VARS['posts_per_page'] : $board_config['posts_per_page']; +$hot_topic = (isset($HTTP_POST_VARS['hot_topic'])) ? $HTTP_POST_VARS['hot_topic'] : $board_config['hot_threshold']; +$selected_template = (isset($HTTP_POST_VARS['template'])) ? $HTTP_POST_VARS['template'] : $board_config['default_template']; +$template_select = template_select($selected_template, "../templates"); +$theme = (isset($HTTP_POST_VARS['theme'])) ? $HTTP_POST_VARS['theme'] : $board_config['default_theme']; +$theme_select = theme_select($theme); +$language = (isset($HTTP_POST_VARS['language'])) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; +$lang_select = language_select($language, "../language"); +$timezone = (isset($HTTP_POST_VARS['timezone'])) ? $HTTP_POST_VARS['timezone'] : $board_config['default_timezone']; +$timezone_select = tz_select($timezone); +$date_format = (isset($HTTP_POST_VARS['date_format'])) ? $HTTP_POST_VARS['date_format'] : $board_config['default_dateformat']; +$gzip = (isset($HTTP_POST_VARS['gzip'])) ? $HTTP_POST_VARS['gzip'] : $board_config['gzip_compress']; +$allow_html = (isset($HTTP_POST_VARS['allow_html'])) ? $HTTP_POST_VARS['allow_html'] : $board_config['allow_html']; +$allow_bbcode = (isset($HTTP_POST_VARS['allow_bbcode'])) ? $HTTP_POST_VARS['allow_bbcode'] : $board_config['allow_bbcode']; +$allow_smile = (isset($HTTP_POST_VARS['allow_smile'])) ? $HTTP_POST_VARS['allow_smile'] : $board_config['allow_smilies']; +$allow_sig = (isset($HTTP_POST_VARS['allow_sig'])) ? $HTTP_POST_VARS['allow_sig'] : $board_config['allow_sig']; +$allow_namechange = (isset($HTTP_POST_VARS['allow_namechange'])) ? $HTTP_POST_VARS['allow_namechange'] : $board_config['allow_namechange']; +$allow_avatars_local = (isset($HTTP_POST_VARS['allow_avatars_local'])) ? $HTTP_POST_VARS['allow_avatars_local'] : $board_config['allow_avatar_local']; +$allow_avatars_remote = (isset($HTTP_POST_VARS['allow_avatars_remote'])) ? $HTTP_POST_VARS['allow_avatars_remote'] : $board_config['allow_avatar_remote']; +$allow_avatars_upload = (isset($HTTP_POST_VARS['allow_avatars_upload'])) ? $HTTP_POST_VARS['allow_avatars_upload'] : $board_config['allow_avatar_upload']; +$avatar_filesize = (isset($HTTP_POST_VARS['avatar_filesize'])) ? $HTTP_POST_VARS['avatar_filesize'] : $board_config['avatar_filesize']; +$avatar_height = (isset($HTTP_POST_VARS['avatar_height'])) ? $HTTP_POST_VARS['avatar_height'] : $board_config['avatar_max_height']; +$avatar_width = (isset($HTTP_POST_VARS['avatar_width'])) ? $HTTP_POST_VARS['avatar_width'] : $board_config['avatar_max_width']; +$avatar_path = (isset($HTTP_POST_VARS['avatar_path'])) ? $HTTP_POST_VARS['avatar_path'] : $board_config['avatar_path']; +$admin_email = (isset($HTTP_POST_VARS['admin_email'])) ? $HTTP_POST_VARS['admin_email'] : $board_config['board_email_from']; +$email_sig = (isset($HTTP_POST_VARS['email_sig'])) ? $HTTP_POST_VARS['email_sig'] : $board_config['board_email']; +$use_smtp = (isset($HTTP_POST_VARS['use_smtp'])) ? $HTTP_POST_VARS['use_smtp'] : $board_config['smtp_delivery']; +$smtp_server = (isset($HTTP_POST_VARS['smtp_server'])) ? $HTTP_POST_VARS['smtp_server'] : $board_config['smtp_host']; -switch($mode) +$html_yes = ($allow_html) ? "CHECKED" : ""; +$html_no = (!$allow_html) ? "CHECKED" : ""; +$bbcode_yes = ($allow_bbcode) ? "CHECKED" : ""; +$bbcode_no = (!$allow_bbcode) ? "CHECKED" : ""; +$activation_yes = ($require_activation) ? "CHECKED" : ""; +$activation_no = (!$require_activation) ? "CHECKED" : ""; +$gzip_yes = ($gzip) ? "CHECKED" : ""; +$gzip_no = (!$gzip) ? "CHECKED" : ""; +$smile_yes = ($allow_smile) ? "CHECKED" : ""; +$smile_no = (!$allow_smile) ? "CHECKED" : ""; +$sig_yes = ($allow_sig) ? "CHECKED" : ""; +$sig_no = (!$allow_sig) ? "CHECKED" : ""; +$namechange_yes = ($allow_namechange) ? "CHECKED" : ""; +$namechange_no = (!$allow_namechange) ? "CHECKED" : ""; +$avatars_local_yes = ($allow_avatars_local) ? "CHECKED" : ""; +$avatars_local_no = (!$allow_avatars_local) ? "CHECKED" : ""; +$avatars_remote_yes = ($allow_avatars_remote) ? "CHECKED" : ""; +$avatars_remote_no = (!$allow_avatars_remote) ? "CHECKED" : ""; +$avatars_upload_yes = ($allow_avatars_upload) ? "CHECKED" : ""; +$avatars_upload_no = (!$allow_avatars_upload) ? "CHECKED" : ""; +$smtp_yes = ($use_smtp) ? "CHECKED" : ""; +$smtp_no = (!$use_smtp) ? "CHECKED" : ""; + + +if($HTTP_POST_VARS['submit']) { - case 'config': - $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']; - $flood_interval = (isset($HTTP_POST_VARS['flood_interval'])) ? $HTTP_POST_VARS['flood_interval'] : $board_config['flood_interval']; - $topics_per_page = (isset($HTTP_POST_VARS['topics_per_page'])) ? $HTTP_POST_VARS['topics_per_page'] : $board_config['topics_per_page']; - $posts_per_page = (isset($HTTP_POST_VARS['posts_per_page'])) ? $HTTP_POST_VARS['posts_per_page'] : $board_config['posts_per_page']; - $hot_topic = (isset($HTTP_POST_VARS['hot_topic'])) ? $HTTP_POST_VARS['hot_topic'] : $board_config['hot_threshold']; - $selected_template = (isset($HTTP_POST_VARS['template'])) ? $HTTP_POST_VARS['template'] : $board_config['default_template']; - $template_select = template_select($selected_template, "../templates"); - $theme = (isset($HTTP_POST_VARS['theme'])) ? $HTTP_POST_VARS['theme'] : $board_config['default_theme']; - $theme_select = theme_select($theme); - $language = (isset($HTTP_POST_VARS['language'])) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; - $lang_select = language_select($language, "../language"); - $timezone = (isset($HTTP_POST_VARS['timezone'])) ? $HTTP_POST_VARS['timezone'] : $board_config['default_timezone']; - $timezone_select = tz_select($timezone); - $date_format = (isset($HTTP_POST_VARS['date_format'])) ? $HTTP_POST_VARS['date_format'] : $board_config['default_dateformat']; - $gzip = (isset($HTTP_POST_VARS['gzip'])) ? $HTTP_POST_VARS['gzip'] : $board_config['gzip_compress']; - $allow_html = (isset($HTTP_POST_VARS['allow_html'])) ? $HTTP_POST_VARS['allow_html'] : $board_config['allow_html']; - $allow_bbcode = (isset($HTTP_POST_VARS['allow_bbcode'])) ? $HTTP_POST_VARS['allow_bbcode'] : $board_config['allow_bbcode']; - $allow_smile = (isset($HTTP_POST_VARS['allow_smile'])) ? $HTTP_POST_VARS['allow_smile'] : $board_config['allow_smilies']; - $allow_sig = (isset($HTTP_POST_VARS['allow_sig'])) ? $HTTP_POST_VARS['allow_sig'] : $board_config['allow_sig']; - $allow_namechange = (isset($HTTP_POST_VARS['allow_namechange'])) ? $HTTP_POST_VARS['allow_namechange'] : $board_config['allow_namechange']; - $allow_avatars_local = (isset($HTTP_POST_VARS['allow_avatars_local'])) ? $HTTP_POST_VARS['allow_avatars_local'] : $board_config['allow_avatar_local']; - $allow_avatars_remote = (isset($HTTP_POST_VARS['allow_avatars_remote'])) ? $HTTP_POST_VARS['allow_avatars_remote'] : $board_config['allow_avatar_remote']; - $allow_avatars_upload = (isset($HTTP_POST_VARS['allow_avatars_upload'])) ? $HTTP_POST_VARS['allow_avatars_upload'] : $board_config['allow_avatar_upload']; - $avatar_filesize = (isset($HTTP_POST_VARS['avatar_filesize'])) ? $HTTP_POST_VARS['avatar_filesize'] : $board_config['avatar_filesize']; - $avatar_height = (isset($HTTP_POST_VARS['avatar_height'])) ? $HTTP_POST_VARS['avatar_height'] : $board_config['avatar_max_height']; - $avatar_width = (isset($HTTP_POST_VARS['avatar_width'])) ? $HTTP_POST_VARS['avatar_width'] : $board_config['avatar_max_width']; - $avatar_path = (isset($HTTP_POST_VARS['avatar_path'])) ? $HTTP_POST_VARS['avatar_path'] : $board_config['avatar_path']; - $admin_email = (isset($HTTP_POST_VARS['admin_email'])) ? $HTTP_POST_VARS['admin_email'] : $board_config['board_email_from']; - $email_sig = (isset($HTTP_POST_VARS['email_sig'])) ? $HTTP_POST_VARS['email_sig'] : $board_config['board_email']; - $use_smtp = (isset($HTTP_POST_VARS['use_smtp'])) ? $HTTP_POST_VARS['use_smtp'] : $board_config['smtp_delivery']; - $smtp_server = (isset($HTTP_POST_VARS['smtp_server'])) ? $HTTP_POST_VARS['smtp_server'] : $board_config['smtp_host']; - $html_yes = ($allow_html) ? "CHECKED" : ""; - $html_no = (!$allow_html) ? "CHECKED" : ""; - $bbcode_yes = ($allow_bbcode) ? "CHECKED" : ""; - $bbcode_no = (!$allow_bbcode) ? "CHECKED" : ""; - $activation_yes = ($require_activation) ? "CHECKED" : ""; - $activation_no = (!$require_activation) ? "CHECKED" : ""; - $gzip_yes = ($gzip) ? "CHECKED" : ""; - $gzip_no = (!$gzip) ? "CHECKED" : ""; - $smile_yes = ($allow_smile) ? "CHECKED" : ""; - $smile_no = (!$allow_smile) ? "CHECKED" : ""; - $sig_yes = ($allow_sig) ? "CHECKED" : ""; - $sig_no = (!$allow_sig) ? "CHECKED" : ""; - $namechange_yes = ($allow_namechange) ? "CHECKED" : ""; - $namechange_no = (!$allow_namechange) ? "CHECKED" : ""; - $avatars_local_yes = ($allow_avatars_local) ? "CHECKED" : ""; - $avatars_local_no = (!$allow_avatars_local) ? "CHECKED" : ""; - $avatars_remote_yes = ($allow_avatars_remote) ? "CHECKED" : ""; - $avatars_remote_no = (!$allow_avatars_remote) ? "CHECKED" : ""; - $avatars_upload_yes = ($allow_avatars_upload) ? "CHECKED" : ""; - $avatars_upload_no = (!$allow_avatars_upload) ? "CHECKED" : ""; - $smtp_yes = ($use_smtp) ? "CHECKED" : ""; - $smtp_no = (!$use_smtp) ? "CHECKED" : ""; + $sql = "UPDATE ".CONFIG_TABLE." SET + sitename = '$sitename', + allow_html = '$allow_html', + allow_bbcode = '$allow_bbcode', + allow_smilies = '$allow_smile', + allow_sig = '$allow_sig', + allow_namechange = '$allow_namechange', + allow_avatar_local = '$allow_avatars_local', + allow_avatar_remote = '$allow_avatars_remote', + allow_avatar_upload = '$allow_avatars_upload', + posts_per_page = '$posts_per_page', + topics_per_page = '$topics_per_page', + hot_threshold = '$hot_topic', + email_sig = '".addslashes($email_sig)."', + email_from = '".addslashes($admin_email)."', + smtp_delivery = '$use_smtp', + smtp_host = '".addslashes($smtp_server)."', + require_activation = '$require_activation', + flood_interval = '$flood_interval', + avatar_filesize = '$avatar_filesize', + avatar_max_width = '$avatar_width', + avatar_max_height = '$avatar_height', + avatar_path = '".addslashes($avatar_path)."', + default_theme = '$theme', + default_lang = '$language', + default_dateformat = '$date_format', + system_timezone = '$timezone', + sys_template = '$selected_template', + gzip_compress = '$gzip' WHERE config_id = 1"; - - if($HTTP_POST_VARS['submit']) - { - - $sql = "UPDATE ".CONFIG_TABLE." SET - sitename = '$sitename', - allow_html = '$allow_html', - allow_bbcode = '$allow_bbcode', - allow_smilies = '$allow_smile', - allow_sig = '$allow_sig', - allow_namechange = '$allow_namechange', - allow_avatar_local = '$allow_avatars_local', - allow_avatar_remote = '$allow_avatars_remote', - allow_avatar_upload = '$allow_avatars_upload', - posts_per_page = '$posts_per_page', - topics_per_page = '$topics_per_page', - hot_threshold = '$hot_topic', - email_sig = '".addslashes($email_sig)."', - email_from = '".addslashes($admin_email)."', - smtp_delivery = '$use_smtp', - smtp_host = '".addslashes($smtp_server)."', - require_activation = '$require_activation', - flood_interval = '$flood_interval', - avatar_filesize = '$avatar_filesize', - avatar_max_width = '$avatar_width', - avatar_max_height = '$avatar_height', - avatar_path = '".addslashes($avatar_path)."', - default_theme = '$theme', - default_lang = '$language', - default_dateformat = '$date_format', - system_timezone = '$timezone', - sys_template = '$selected_template', - gzip_compress = '$gzip' WHERE config_id = 1"; - - if($db->sql_query($sql)) - { - message_die(GENERAL_MESSAGE, $lang['Config_updated'], "Success", __LINE__, __FILE__, $sql); - } - else - { - $error = 1; - $error_arr = $db->sql_error(); - $error_msg = "Error updating database!
Reason: " . $error_arr['message']; - } - } - - // - // Error occured, show the error box - // - if($error) - { - $template->set_filenames(array( - "reg_header" => "error_body.tpl") - ); - $template->assign_vars(array( - "ERROR_MESSAGE" => $error_msg) - ); - $template->pparse("reg_header"); - } - - $template->set_filenames(array( - "body" => "admin/admin_config_body.tpl") - ); - - $template->assign_vars(array( - "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), - "SITENAME" => $sitename, - "ACTIVATION_YES" => $activation_yes, - "ACTIVATION_NO" => $activation_no, - "FLOOD_INTERVAL" => $flood_interval, - "TOPICS_PER_PAGE" => $topics_per_page, - "POSTS_PER_PAGE" => $posts_per_page, - "HOT_TOPIC" => $hot_topic, - "TEMPLATE_SELECT" => $template_select, - "THEME_SELECT" => $theme_select, - "LANG_SELECT" => $lang_select, - "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], - "DATE_FORMAT" => $date_format, - "TIMEZONE_SELECT" => $timezone_select, - "GZIP_YES" => $gzip_yes, - "GZIP_NO" => $gzip_no, - "HTML_YES" => $html_yes, - "HTML_NO" => $html_no, - "BBCODE_YES" => $bbcode_yes, - "BBCODE_NO" => $bbcode_no, - "SMILE_YES" => $smile_yes, - "SMILE_NO" => $smile_no, - "SIG_YES" => $sig_yes, - "SIG_NO" => $sig_no, - "NAMECHANGE_YES" => $namechange_yes, - "NAMECHANGE_NO" => $namechange_no, - "AVATARS_LOCAL_YES" => $avatars_local_yes, - "AVATARS_LOCAL_NO" => $avatars_local_no, - "AVATARS_REMOTE_YES" => $avatars_remote_yes, - "AVATARS_REMOTE_NO" => $avatars_remote_no, - "AVATARS_UPLOAD_YES" => $avatars_upload_yes, - "AVATARS_UPLOAD_NO" => $avatars_upload_no, - "AVATAR_FILESIZE" => $avatar_filesize, - "AVATAR_HEIGHT" => $avatar_height, - "AVATAR_WIDTH" => $avatar_width, - "AVATAR_PATH" => $avatar_path, - "ADMIN_EMAIL" => $admin_email, - "EMAIL_SIG" => $email_sig, - "SMTP_YES" => $smtp_yes, - "SMTP_NO" => $smtp_no, - "SMTP_SERVER" => $smtp_server) - ); - - $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 = ''; - } - else - { - $s_hidden_fields = ''; - } - - $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" => "", - "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; + if($db->sql_query($sql)) + { + message_die(GENERAL_MESSAGE, $lang['Config_updated'], "Success", __LINE__, __FILE__, $sql); + } + else + { + $error = 1; + $error_arr = $db->sql_error(); + $error_msg = "Error updating database!
Reason: " . $error_arr['message']; + } } +// +// Error occured, show the error box +// +if($error) +{ + $template->set_filenames(array( + "reg_header" => "error_body.tpl") + ); + $template->assign_vars(array( + "ERROR_MESSAGE" => $error_msg) + ); + $template->pparse("reg_header"); +} + +$template->set_filenames(array( + "body" => "admin/admin_config_body.tpl") +); + +$template->assign_vars(array( + "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), + "SITENAME" => $sitename, + "ACTIVATION_YES" => $activation_yes, + "ACTIVATION_NO" => $activation_no, + "FLOOD_INTERVAL" => $flood_interval, + "TOPICS_PER_PAGE" => $topics_per_page, + "POSTS_PER_PAGE" => $posts_per_page, + "HOT_TOPIC" => $hot_topic, + "TEMPLATE_SELECT" => $template_select, + "THEME_SELECT" => $theme_select, + "LANG_SELECT" => $lang_select, + "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], + "DATE_FORMAT" => $date_format, + "TIMEZONE_SELECT" => $timezone_select, + "GZIP_YES" => $gzip_yes, + "GZIP_NO" => $gzip_no, + "HTML_YES" => $html_yes, + "HTML_NO" => $html_no, + "BBCODE_YES" => $bbcode_yes, + "BBCODE_NO" => $bbcode_no, + "SMILE_YES" => $smile_yes, + "SMILE_NO" => $smile_no, + "SIG_YES" => $sig_yes, + "SIG_NO" => $sig_no, + "NAMECHANGE_YES" => $namechange_yes, + "NAMECHANGE_NO" => $namechange_no, + "AVATARS_LOCAL_YES" => $avatars_local_yes, + "AVATARS_LOCAL_NO" => $avatars_local_no, + "AVATARS_REMOTE_YES" => $avatars_remote_yes, + "AVATARS_REMOTE_NO" => $avatars_remote_no, + "AVATARS_UPLOAD_YES" => $avatars_upload_yes, + "AVATARS_UPLOAD_NO" => $avatars_upload_no, + "AVATAR_FILESIZE" => $avatar_filesize, + "AVATAR_HEIGHT" => $avatar_height, + "AVATAR_WIDTH" => $avatar_width, + "AVATAR_PATH" => $avatar_path, + "ADMIN_EMAIL" => $admin_email, + "EMAIL_SIG" => $email_sig, + "SMTP_YES" => $smtp_yes, + "SMTP_NO" => $smtp_no, + "SMTP_SERVER" => $smtp_server) +); + +$template->pparse("body"); + include('page_footer_admin.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php new file mode 100644 index 0000000000..0c242bdfc9 --- /dev/null +++ b/phpBB/admin/admin_words.php @@ -0,0 +1,204 @@ +set_filenames(array( + "body" => "admin/words_edit_body.tpl") + ); + + $s_hidden_fields = ''; + + 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 .= ''; + } + + $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 = ''; + + $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); + +?> \ No newline at end of file diff --git a/phpBB/templates/PSO/admin/words_edit_body.tpl b/phpBB/templates/PSO/admin/words_edit_body.tpl index 0b6635889a..b3312a9198 100755 --- a/phpBB/templates/PSO/admin/words_edit_body.tpl +++ b/phpBB/templates/PSO/admin/words_edit_body.tpl @@ -5,8 +5,7 @@

{L_WORDS_TEXT}

-
- +
diff --git a/phpBB/templates/PSO/admin/words_list_body.tpl b/phpBB/templates/PSO/admin/words_list_body.tpl index 903e43911f..a7aad0e78f 100755 --- a/phpBB/templates/PSO/admin/words_list_body.tpl +++ b/phpBB/templates/PSO/admin/words_list_body.tpl @@ -5,10 +5,7 @@

{L_WORDS_TEXT}

-

{OPT_MESSAGE}

- - -
{L_WORD_CENSOR}
+
@@ -23,6 +20,6 @@ - +
{L_WORD} {L_REPLACEMENT}
{S_HIDDEN_FIELDS}{S_HIDDEN_FIELDS}