diff options
| author | the_systech <the_systech@users.sourceforge.net> | 2002-02-15 15:27:09 +0000 |
|---|---|---|
| committer | the_systech <the_systech@users.sourceforge.net> | 2002-02-15 15:27:09 +0000 |
| commit | 1d42ad5083a22aea88a2fde806c2e1a27c090507 (patch) | |
| tree | 6631af1833f42e29dd5e4106f852095f3b7f2e0a /phpBB | |
| parent | 3a87c855dc56695c6b161a852d804d062845e9b8 (diff) | |
| download | forums-1d42ad5083a22aea88a2fde806c2e1a27c090507.tar forums-1d42ad5083a22aea88a2fde806c2e1a27c090507.tar.gz forums-1d42ad5083a22aea88a2fde806c2e1a27c090507.tar.bz2 forums-1d42ad5083a22aea88a2fde806c2e1a27c090507.tar.xz forums-1d42ad5083a22aea88a2fde806c2e1a27c090507.zip | |
Fix for bug #517442... Disabled HTML in Site_Name and documented in admin.. Also changed so that in both site_name and site_desc "'s are changed to "
git-svn-id: file:///svn/phpbb/trunk@2157 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/admin/admin_board.php | 5 | ||||
| -rw-r--r-- | phpBB/language/lang_english/lang_admin.php | 3 | ||||
| -rw-r--r-- | phpBB/templates/Euclid/admin/admin_config_body.tpl | 2 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/admin/board_config_body.tpl | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index b7c324b793..b85256770a 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -126,8 +126,8 @@ $template->set_filenames(array( // Escape any quotes in the site description for proper display in the text // box on the admin page // -$new['site_desc'] = htmlspecialchars($new['site_desc']); -$new['sitename'] = htmlspecialchars($new['sitename']); +$new['site_desc'] = str_replace('"', '"', $new['site_desc']); +$new['sitename'] = str_replace('"', '"', strip_tags($new['sitename'])); $template->assign_vars(array( "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), @@ -143,6 +143,7 @@ $template->assign_vars(array( "L_SCRIPT_PATH" => $lang['Script_path'], "L_SCRIPT_PATH_EXPLAIN" => $lang['Script_path_explain'], "L_SITE_NAME" => $lang['Site_name'], + "L_SITE_NAME_EXPLAIN" => $lang['Site_name_explain'], "L_SITE_DESCRIPTION" => $lang['Site_desc'], "L_DISABLE_BOARD" => $lang['Board_disable'], "L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'], diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index 534168162c..98bef0fd2b 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -244,6 +244,7 @@ $lang['Script_path_explain'] = "The path where phpBB2 is located relative to the $lang['Server_port'] = "Server Port"; $lang['Server_port_explain'] = "The port your server is running on, usually 80, only change if different"; $lang['Site_name'] = "Site name"; +$lang['Site_name_explain'] = "No html tags allowed!"; $lang['Site_desc'] = "Site description"; $lang['Board_disable'] = "Disable board"; $lang['Board_disable_explain'] = "This will make the board unavailable to users. Do not logout when you disable the board, you will not be able to log back in!"; @@ -716,4 +717,4 @@ $lang['Install_No_PCRE'] = "phpBB2 Requires the Perl-Compatible Regular Expressi // That's all Folks! // ------------------------------------------------- -?>
\ No newline at end of file +?> diff --git a/phpBB/templates/Euclid/admin/admin_config_body.tpl b/phpBB/templates/Euclid/admin/admin_config_body.tpl index a0978180b3..c91f7a9240 100644 --- a/phpBB/templates/Euclid/admin/admin_config_body.tpl +++ b/phpBB/templates/Euclid/admin/admin_config_body.tpl @@ -9,7 +9,7 @@ <td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td> </tr> <tr> - <td class="row1"><span class="gen">{L_SITE_NAME}:</span></td> + <td class="row1"><span class="gen">{L_SITE_NAME}:</span><br /><span class="gensmall">{L_SITE_NAME_EXPLAIN}</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td> </tr> <tr> diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index 03dc556e31..3bc3d0df6f 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -20,7 +20,7 @@ <td class="row2"><input type="text" maxlength="255" name="script_path" value="{SCRIPT_PATH}" /></td> </tr> <tr> - <td class="row1">{L_SITE_NAME}</td> + <td class="row1">{L_SITE_NAME}<br /><span class="gensmall">{L_SITE_NAME_EXPLAIN}</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}" /></td> </tr> <tr> |