mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
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
This commit is contained in:
parent
3a87c855dc
commit
1d42ad5083
4 changed files with 7 additions and 5 deletions
|
@ -126,8 +126,8 @@ $template->set_filenames(array(
|
||||||
// Escape any quotes in the site description for proper display in the text
|
// Escape any quotes in the site description for proper display in the text
|
||||||
// box on the admin page
|
// box on the admin page
|
||||||
//
|
//
|
||||||
$new['site_desc'] = htmlspecialchars($new['site_desc']);
|
$new['site_desc'] = str_replace('"', '"', $new['site_desc']);
|
||||||
$new['sitename'] = htmlspecialchars($new['sitename']);
|
$new['sitename'] = str_replace('"', '"', strip_tags($new['sitename']));
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
"S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"),
|
"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" => $lang['Script_path'],
|
||||||
"L_SCRIPT_PATH_EXPLAIN" => $lang['Script_path_explain'],
|
"L_SCRIPT_PATH_EXPLAIN" => $lang['Script_path_explain'],
|
||||||
"L_SITE_NAME" => $lang['Site_name'],
|
"L_SITE_NAME" => $lang['Site_name'],
|
||||||
|
"L_SITE_NAME_EXPLAIN" => $lang['Site_name_explain'],
|
||||||
"L_SITE_DESCRIPTION" => $lang['Site_desc'],
|
"L_SITE_DESCRIPTION" => $lang['Site_desc'],
|
||||||
"L_DISABLE_BOARD" => $lang['Board_disable'],
|
"L_DISABLE_BOARD" => $lang['Board_disable'],
|
||||||
"L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'],
|
"L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'],
|
||||||
|
|
|
@ -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'] = "Server Port";
|
||||||
$lang['Server_port_explain'] = "The port your server is running on, usually 80, only change if different";
|
$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'] = "Site name";
|
||||||
|
$lang['Site_name_explain'] = "No html tags allowed!";
|
||||||
$lang['Site_desc'] = "Site description";
|
$lang['Site_desc'] = "Site description";
|
||||||
$lang['Board_disable'] = "Disable board";
|
$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!";
|
$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!
|
// That's all Folks!
|
||||||
// -------------------------------------------------
|
// -------------------------------------------------
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td>
|
<td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<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>
|
<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<td class="row2"><input type="text" maxlength="255" name="script_path" value="{SCRIPT_PATH}" /></td>
|
<td class="row2"><input type="text" maxlength="255" name="script_path" value="{SCRIPT_PATH}" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
<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>
|
<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Add table
Reference in a new issue