mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 08:05:25 +02:00
Code Issues Releases Wiki Activity

- introduce LA_, UA_ and A_ template variables (they allow styles to use template variables used for javascript in subSilver outside javascript in their own template while they won't break our javascript if they contain quotes) also fixes [Bug #1116]

Browse Source 
- corrected page title for search indexing progress bar [Bug #1695]
- correct poster name for the anonymous user in mcp_queue and mcp_reports


git-svn-id: file:///svn/phpbb/trunk@5888 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-05-06 15:15:40 +00:00
parent 3640410cc0
commit 2ee2701eb1
30 changed files with 116 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/adm/style/acp_ban.html
View File

@ -14,19 +14,19 @@
var ban_length = new Array(); var ban_length = new Array();
ban_length[-1] = ""; ban_length[-1] = "";
<!-- BEGIN ban_length --> <!-- BEGIN ban_length -->
ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}"; ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
<!-- END ban_length --> <!-- END ban_length -->
var ban_reason = new Array(); var ban_reason = new Array();
ban_reason[-1] = ""; ban_reason[-1] = "";
<!-- BEGIN ban_reason --> <!-- BEGIN ban_reason -->
ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}"; ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
<!-- END ban_reason --> <!-- END ban_reason -->
var ban_give_reason = new Array(); var ban_give_reason = new Array();
ban_give_reason[-1] = ""; ban_give_reason[-1] = "";
<!-- BEGIN ban_give_reason --> <!-- BEGIN ban_give_reason -->
ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.REASON}"; ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
<!-- END ban_give_reason --> <!-- END ban_give_reason -->
function display_details(option) function display_details(option)
@ -88,15 +88,15 @@
</dl> </dl>
<dl> <dl>
<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt> <dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
<dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" /></dd> <dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" disabled="disabled" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt> <dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
<dd><input style="border: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" /></dd> <dd><input style="border: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" disabled="disabled" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt> <dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
<dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" /></dd> <dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd>
</dl> </dl>
</fieldset> </fieldset>

4
phpBB/adm/style/acp_modules.html
View File

@ -36,8 +36,8 @@
if (value == '{m_names.NAME}') if (value == '{m_names.NAME}')
{ {
<!-- BEGIN modes --> <!-- BEGIN modes -->
item.options[j] = new Option('{m_names.modes.VALUE}'); item.options[j] = new Option('{m_names.modes.A_VALUE}');
item.options[j].value = '{m_names.modes.OPTION}'; item.options[j].value = '{m_names.modes.A_OPTION}';
j++; j++;
<!-- END modes --> <!-- END modes -->
} }

2
phpBB/adm/style/acp_permissions.html
View File

@ -347,7 +347,7 @@
<script type="text/javascript" src="style/tooltip.js"></script> <script type="text/javascript" src="style/tooltip.js"></script>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
window.onload = function(){enable_tooltips_select('set_permissions', '{L_ROLE_DESCRIPTION}', 'role')}; window.onload = function(){enable_tooltips_select('set_permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
//--> //-->
</script> </script>

2
phpBB/adm/style/acp_search.html
View File

@ -63,7 +63,7 @@
function popup_progress_bar(progress_type) function popup_progress_bar(progress_type)
{ {
close_waitscreen = 0; close_waitscreen = 0;
window.open('{U_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=300,resizable=yes,scrollbars=no,WIDTH=400');
} }
//--> //-->
</script> </script>

28
phpBB/adm/style/acp_users.html
View File

@ -348,7 +348,7 @@
</dl> </dl>
<dl> <dl>
<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> <dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd> <dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" /></div></dd> <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" /></div></dd>
</dl> </dl>
</fieldset> </fieldset>
@ -539,19 +539,19 @@
imageTag = false; imageTag = false;
// Helpline messages // Helpline messages
b_help = "{L_BBCODE_B_HELP}"; b_help = "{LA_BBCODE_B_HELP}";
i_help = "{L_BBCODE_I_HELP}"; i_help = "{LA_BBCODE_I_HELP}";
u_help = "{L_BBCODE_U_HELP}"; u_help = "{LA_BBCODE_U_HELP}";
q_help = "{L_BBCODE_Q_HELP}"; q_help = "{LA_BBCODE_Q_HELP}";
c_help = "{L_BBCODE_C_HELP}"; c_help = "{LA_BBCODE_C_HELP}";
l_help = "{L_BBCODE_L_HELP}"; l_help = "{LA_BBCODE_L_HELP}";
o_help = "{L_BBCODE_O_HELP}"; o_help = "{LA_BBCODE_O_HELP}";
p_help = "{L_BBCODE_P_HELP}"; p_help = "{LA_BBCODE_P_HELP}";
w_help = "{L_BBCODE_W_HELP}"; w_help = "{LA_BBCODE_W_HELP}";
a_help = "{L_BBCODE_A_HELP}"; a_help = "{LA_BBCODE_A_HELP}";
s_help = "{L_BBCODE_S_HELP}"; s_help = "{LA_BBCODE_S_HELP}";
f_help = "{L_BBCODE_F_HELP}"; f_help = "{LA_BBCODE_F_HELP}";
e_help = "{L_BBCODE_E_HELP}"; e_help = "{LA_BBCODE_E_HELP}";
//--> //-->
</script> </script>

4
phpBB/adm/style/overall_header.html
View File

@ -12,7 +12,7 @@
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
var jump_page = '{L_JUMP_PAGE}:'; var jump_page = '{LA_JUMP_PAGE}:';
var on_page = '{ON_PAGE}'; var on_page = '{ON_PAGE}';
var per_page = '{PER_PAGE}'; var per_page = '{PER_PAGE}';
var base_url = '{BASE_URL}'; var base_url = '{BASE_URL}';
@ -80,7 +80,7 @@ function trace(link)
<!-- IF S_INCLUDE_SWATCH --> <!-- IF S_INCLUDE_SWATCH -->
function swatch() function swatch()
{ {
window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
return false; return false;
} }
<!-- ENDIF --> <!-- ENDIF -->

4
phpBB/adm/style/simple_header.html
View File

@ -12,7 +12,7 @@
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
var jump_page = '{L_JUMP_PAGE}:'; var jump_page = '{LA_JUMP_PAGE}:';
var on_page = '{ON_PAGE}'; var on_page = '{ON_PAGE}';
var per_page = '{PER_PAGE}'; var per_page = '{PER_PAGE}';
var base_url = '{BASE_URL}'; var base_url = '{BASE_URL}';
@ -69,7 +69,7 @@ function marklist(id, name, state)
<!-- IF S_INCLUDE_SWATCH --> <!-- IF S_INCLUDE_SWATCH -->
function swatch() function swatch()
{ {
window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
return false; return false;
} }
<!-- ENDIF --> <!-- ENDIF -->

9
phpBB/includes/acp/acp_ban.php
View File

@ -173,7 +173,8 @@ class acp_ban
{ {
$template->assign_block_vars('ban_length', array( $template->assign_block_vars('ban_length', array(
'BAN_ID' => $ban_id, 'BAN_ID' => $ban_id,
'LENGTH' => $length) 'LENGTH' => $length,
'A_LENGTH' => addslashes($length))
); );
} }
} }
@ -184,7 +185,8 @@ class acp_ban
{ {
$template->assign_block_vars('ban_reason', array( $template->assign_block_vars('ban_reason', array(
'BAN_ID' => $ban_id, 'BAN_ID' => $ban_id,
'REASON' => addslashes(html_entity_decode($reason))) 'REASON' => $reason,
'A_REASON' => addslashes(html_entity_decode($reason)))
); );
} }
} }
@ -195,7 +197,8 @@ class acp_ban
{ {
$template->assign_block_vars('ban_give_reason', array( $template->assign_block_vars('ban_give_reason', array(
'BAN_ID' => $ban_id, 'BAN_ID' => $ban_id,
'REASON' => addslashes(html_entity_decode($reason))) 'REASON' => $reason,
'A_REASON' => addslashes(html_entity_decode($reason)))
); );
} }
} }

3
phpBB/includes/acp/acp_groups.php
View File

@ -523,7 +523,8 @@ class acp_groups
'GROUP_HIDDEN' => $type_hidden, 'GROUP_HIDDEN' => $type_hidden,
'U_BACK' => $u_back, 'U_BACK' => $u_back,
'U_SWATCH' => "{$phpbb_admin_path}swatch.$phpEx$SID&form=settings&name=group_colour", 'U_SWATCH' => "{$phpbb_admin_path}swatch.$phpEx$SID&amp;form=settings&amp;name=group_colour",
'UA_SWATCH' => "{$phpbb_admin_path}swatch.$phpEx$SID&form=settings&name=group_colour",
'U_ACTION' => "{$this->u_action}&amp;action=$action&amp;g=$group_id", 'U_ACTION' => "{$this->u_action}&amp;action=$action&amp;g=$group_id",
'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)), 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)),
) )

8
phpBB/includes/acp/acp_modules.php
View File

@ -363,7 +363,7 @@ class acp_modules
// Name options // Name options
$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_name']) ? ' selected="selected"' : '') . '>' . $this->lang_name($values['title']) . ' [' . $this->module_class . '_' . $option . ']</option>'; $s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_name']) ? ' selected="selected"' : '') . '>' . $this->lang_name($values['title']) . ' [' . $this->module_class . '_' . $option . ']</option>';
$template->assign_block_vars('m_names', array('NAME' => str_replace("'", "\'", stripslashes($option)))); $template->assign_block_vars('m_names', array('NAME' => $option));
// Build module modes // Build module modes
foreach ($values['modes'] as $m_mode => $m_values) foreach ($values['modes'] as $m_mode => $m_values)
@ -374,8 +374,10 @@ class acp_modules
} }
$template->assign_block_vars('m_names.modes', array( $template->assign_block_vars('m_names.modes', array(
'OPTION' => str_replace("'", "\'", stripslashes($m_mode)), 'OPTION' => $m_mode,
'VALUE' => str_replace("'", "\'", stripslashes($this->lang_name($m_values['title'])))) 'VALUE' => $this->lang_name($m_values['title']),
'A_OPTION' => addslashes($m_mode),
'A_VALUE' => addslashes($this->lang_name($m_values['title'])))
); );
} }
} }

12
phpBB/includes/acp/acp_search.php
View File

@ -399,7 +399,8 @@ class acp_search
$template->assign_vars(array( $template->assign_vars(array(
'S_INDEX' => true, 'S_INDEX' => true,
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
'U_PROGRESS_BAR' => $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=progress_bar") // don't use &amp; here 'U_PROGRESS_BAR' => $phpbb_admin_path . "index.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;action=progress_bar",
'UA_PROGRESS_BAR' => $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=progress_bar")
); );
if (isset($this->state[1])) if (isset($this->state[1]))
@ -416,15 +417,18 @@ class acp_search
function display_progress_bar($type) function display_progress_bar($type)
{ {
global $template, $user; global $template, $user;
adm_page_header('PROGRESS_BAR');
$l_type = ($type == 'create') ? 'INDEXING_IN_PROGRESS' : 'DELETING_INDEX_IN_PROGRESS';
adm_page_header($user->lang[$l_type]);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'search_index_progress_bar.html') 'body' => 'search_index_progress_bar.html')
); );
$template->assign_vars(array( $template->assign_vars(array(
'L_PROGRESS' => ($type == 'create') ? $user->lang['INDEXING_IN_PROGRESS'] : $user->lang['DELETING_INDEX_IN_PROGRESS'], 'L_PROGRESS' => $user->lang[$l_type],
'L_PROGRESS_EXPLAIN' => ($type == 'create') ? $user->lang['INDEXING_IN_PROGRESS_EXPLAIN'] : $user->lang['DELETING_INDEX_IN_PROGRESS_EXPLAIN']) 'L_PROGRESS_EXPLAIN' => $user->lang[$l_type . '_EXPLAIN'])
); );
adm_page_footer(); adm_page_footer();

1
phpBB/includes/acp/acp_users.php
View File

@ -1223,6 +1223,7 @@ class acp_users
'S_DATEFORMAT_OPTIONS' => $dateformat_options, 'S_DATEFORMAT_OPTIONS' => $dateformat_options,
'S_CUSTOM_DATEFORMAT' => $s_custom, 'S_CUSTOM_DATEFORMAT' => $s_custom,
'DEFAULT_DATEFORMAT' => $config['default_dateformat'], 'DEFAULT_DATEFORMAT' => $config['default_dateformat'],
'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']),
'S_LANG_OPTIONS' => language_select($lang), 'S_LANG_OPTIONS' => language_select($lang),
'S_STYLE_OPTIONS' => style_select($style), 'S_STYLE_OPTIONS' => style_select($style),

4
phpBB/includes/functions.php
View File

@ -2541,9 +2541,9 @@ function page_header($page_title = '')
'U_PRIVATEMSGS' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;folder=inbox", 'U_PRIVATEMSGS' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;folder=inbox",
'U_RETURN_INBOX' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;folder=inbox", 'U_RETURN_INBOX' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;folder=inbox",
'U_JS_RETURN_INBOX' => "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&folder=inbox", 'UA_RETURN_INBOX' => "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&folder=inbox",
'U_POPUP_PM' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;mode=popup", 'U_POPUP_PM' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;mode=popup",
'U_JS_POPUP_PM' => "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=popup", 'UA_POPUP_PM' => "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=popup",
'U_MEMBERLIST' => "{$phpbb_root_path}memberlist.$phpEx$SID", 'U_MEMBERLIST' => "{$phpbb_root_path}memberlist.$phpEx$SID",
'U_MEMBERSLIST' => "{$phpbb_root_path}memberlist.$phpEx$SID", 'U_MEMBERSLIST' => "{$phpbb_root_path}memberlist.$phpEx$SID",
'U_VIEWONLINE' => "{$phpbb_root_path}viewonline.$phpEx$SID", 'U_VIEWONLINE' => "{$phpbb_root_path}viewonline.$phpEx$SID",

13
phpBB/includes/functions_posting.php
View File

@ -69,11 +69,12 @@ function generate_smilies($mode, $forum_id)
if ($row['smiley_url'] !== $last_url) if ($row['smiley_url'] !== $last_url)
{ {
$template->assign_block_vars('smiley', array( $template->assign_block_vars('smiley', array(
'SMILEY_CODE' => $row['code'], 'SMILEY_CODE' => $row['code'],
'SMILEY_IMG' => $phpbb_root_path . $config['smilies_path'] . '/' . $row['smiley_url'], 'A_SMILEY_CODE' => addslashes($row['code']),
'SMILEY_WIDTH' => $row['smiley_width'], 'SMILEY_IMG' => $phpbb_root_path . $config['smilies_path'] . '/' . $row['smiley_url'],
'SMILEY_HEIGHT' => $row['smiley_height'], 'SMILEY_WIDTH' => $row['smiley_width'],
'SMILEY_DESC' => $row['emotion']) 'SMILEY_HEIGHT' => $row['smiley_height'],
'SMILEY_DESC' => $row['emotion'])
); );
} }
$last_url = $row['smiley_url']; $last_url = $row['smiley_url'];
@ -839,7 +840,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
'U_POST_ID' => $row['post_id'], 'U_POST_ID' => $row['post_id'],
'U_MINI_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;p=" . $row['post_id'] . '#p' . $row['post_id'], 'U_MINI_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;p=" . $row['post_id'] . '#p' . $row['post_id'],
'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx$SID&amp;mode=post_details&amp;p=" . $row['post_id'] : '', 'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx$SID&amp;mode=post_details&amp;p=" . $row['post_id'] : '',
'U_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? 'javascript:addquote(' . $row['post_id'] . ", '" . str_replace("'", "\\'", $poster) . "')" : '') 'U_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? 'javascript:addquote(' . $row['post_id'] . ", '" . addslashes($poster) . "')" : '')
); );
unset($rowset[$i]); unset($rowset[$i]);
} }

4
phpBB/includes/mcp/mcp_queue.php
View File

@ -91,13 +91,13 @@ class mcp_queue
} }
// Set some vars // Set some vars
$poster = ($post_info['user_colour']) ? '<span style="color:#' . $post_info['user_colour'] . '">' . $post_info['username'] . '</span>' : $post_info['username'];
if ($post_info['user_id'] == ANONYMOUS) if ($post_info['user_id'] == ANONYMOUS)
{ {
$poster = ($post_info['post_username']) ? $post_info['post_username'] : $user->lang['GUEST']; $poster = ($post_info['post_username']) ? $post_info['post_username'] : $user->lang['GUEST'];
} }
$poster = ($post_info['user_colour']) ? '<span style="color:#' . $post_info['user_colour'] . '">' . $post_info['username'] . '</span>' : $post_info['username'];
// Process message, leave it uncensored // Process message, leave it uncensored
$message = $post_info['post_text']; $message = $post_info['post_text'];
if ($post_info['bbcode_bitfield']) if ($post_info['bbcode_bitfield'])

7
phpBB/includes/mcp/mcp_reports.php
View File

@ -98,6 +98,11 @@ class mcp_reports
} }
// Set some vars // Set some vars
if ($post_info['user_id'] == ANONYMOUS)
{
$poster = ($post_info['post_username']) ? $post_info['post_username'] : $user->lang['GUEST'];
}
$poster = ($post_info['user_colour']) ? '<span style="color:#' . $post_info['user_colour'] . '">' . $post_info['username'] . '</span>' : $post_info['username']; $poster = ($post_info['user_colour']) ? '<span style="color:#' . $post_info['user_colour'] . '">' . $post_info['username'] . '</span>' : $post_info['username'];
// Process message, leave it uncensored // Process message, leave it uncensored
@ -119,7 +124,7 @@ class mcp_reports
'S_POST_LOCKED' => $post_info['post_edit_locked'], 'S_POST_LOCKED' => $post_info['post_edit_locked'],
'S_USER_NOTES' => $auth->acl_gets('m_', 'a_') ? true : false, 'S_USER_NOTES' => $auth->acl_gets('m_', 'a_') ? true : false,
'U_VIEW_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $post_info['user_id'], 'U_VIEW_PROFILE' => ($post_info['user_id'] != ANONYMOUS) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $post_info['user_id'] : '',
'U_MCP_USER_NOTES' => "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=notes&amp;mode=user_notes&amp;u=" . $post_info['user_id'], 'U_MCP_USER_NOTES' => "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=notes&amp;mode=user_notes&amp;u=" . $post_info['user_id'],
'U_MCP_WARN_USER' => "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=warn&amp;mode=warn_user&amp;u=" . $post_info['user_id'], 'U_MCP_WARN_USER' => "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=warn&amp;mode=warn_user&amp;u=" . $post_info['user_id'],
'U_VIEW_REPORTER_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $report['user_id'], 'U_VIEW_REPORTER_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $report['user_id'],

3
phpBB/includes/ucp/ucp_groups.php
View File

@ -626,7 +626,8 @@ class ucp_groups
'GROUP_CLOSED' => $type_closed, 'GROUP_CLOSED' => $type_closed,
'GROUP_HIDDEN' => $type_hidden, 'GROUP_HIDDEN' => $type_hidden,
'U_SWATCH' => "{$phpbb_root_path}adm/swatch.$phpEx$SID&form=ucp&name=group_colour", 'U_SWATCH' => "{$phpbb_root_path}adm/swatch.$phpEx$SID&amp;form=ucp&amp;name=group_colour",
'UA_SWATCH' => "{$phpbb_root_path}adm/swatch.$phpEx$SID&form=ucp&name=group_colour",
'S_UCP_ACTION' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;g=$group_id", 'S_UCP_ACTION' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;g=$group_id",
'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024))) 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)))
); );

1
phpBB/includes/ucp/ucp_prefs.php
View File

@ -165,6 +165,7 @@ class ucp_prefs
'S_DATEFORMAT_OPTIONS' => $dateformat_options, 'S_DATEFORMAT_OPTIONS' => $dateformat_options,
'S_CUSTOM_DATEFORMAT' => $s_custom, 'S_CUSTOM_DATEFORMAT' => $s_custom,
'DEFAULT_DATEFORMAT' => $config['default_dateformat'], 'DEFAULT_DATEFORMAT' => $config['default_dateformat'],
'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']),
'S_LANG_OPTIONS' => language_select($lang), 'S_LANG_OPTIONS' => language_select($lang),
'S_STYLE_OPTIONS' => style_select($style), 'S_STYLE_OPTIONS' => style_select($style),

2
phpBB/memberlist.php
View File

@ -1225,7 +1225,7 @@ function show_profile($data)
'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '',
'U_ICQ' => ($data['user_icq']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=icq&amp;u=$user_id" : '', 'U_ICQ' => ($data['user_icq']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=icq&amp;u=$user_id" : '',
'U_AIM' => ($data['user_aim']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=aim&amp;u=$user_id" : '', 'U_AIM' => ($data['user_aim']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=aim&amp;u=$user_id" : '',
'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&.src=pg' : '', 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&amp;.src=pg' : '',
'U_MSN' => ($data['user_msnm']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=msnm&amp;u=$user_id" : '', 'U_MSN' => ($data['user_msnm']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=msnm&amp;u=$user_id" : '',
'U_JABBER' => ($data['user_jabber']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=jabber&amp;u=$user_id" : '', 'U_JABBER' => ($data['user_jabber']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=contact&amp;action=jabber&amp;u=$user_id" : '',
'LOCATION' => ($data['user_from']) ? $data['user_from'] : '', 'LOCATION' => ($data['user_from']) ? $data['user_from'] : '',

3
phpBB/posting.php
View File

@ -1155,7 +1155,8 @@ $template->assign_vars(array(
'U_VIEW_FORUM' => "viewforum.$phpEx$SID&amp;f=" . $forum_id, 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&amp;f=" . $forum_id,
'U_VIEWTOPIC' => ($mode != 'post') ? "viewtopic.$phpEx$SID&amp;$forum_id&amp;t=$topic_id" : '', 'U_VIEWTOPIC' => ($mode != 'post') ? "viewtopic.$phpEx$SID&amp;$forum_id&amp;t=$topic_id" : '',
'U_PROGRESS_BAR' => "posting.$phpEx$SID&f=$forum_id&mode=popup", // do NOT replace & with &amp; here 'U_PROGRESS_BAR' => "posting.$phpEx$SID&amp;f=$forum_id&amp;mode=popup",
'UA_PROGRESS_BAR' => "posting.$phpEx$SID&f=$forum_id&mode=popup",
'S_PRIVMSGS' => false, 'S_PRIVMSGS' => false,
'S_CLOSE_PROGRESS_WINDOW' => (isset($_POST['add_file'])) ? true : false, 'S_CLOSE_PROGRESS_WINDOW' => (isset($_POST['add_file'])) ? true : false,

12
phpBB/styles/subSilver/template/mcp_ban.html
View File

@ -6,19 +6,19 @@
var ban_length = new Array(); var ban_length = new Array();
ban_length[-1] = ""; ban_length[-1] = "";
<!-- BEGIN ban_length --> <!-- BEGIN ban_length -->
ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}"; ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
<!-- END ban_length --> <!-- END ban_length -->
var ban_reason = new Array(); var ban_reason = new Array();
ban_reason[-1] = ""; ban_reason[-1] = "";
<!-- BEGIN ban_reason --> <!-- BEGIN ban_reason -->
ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}"; ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
<!-- END ban_reason --> <!-- END ban_reason -->
var ban_give_reason = new Array(); var ban_give_reason = new Array();
ban_give_reason[-1] = ""; ban_give_reason[-1] = "";
<!-- BEGIN ban_give_reason --> <!-- BEGIN ban_give_reason -->
ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.REASON}"; ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
<!-- END ban_give_reason --> <!-- END ban_give_reason -->
function display_details(option) function display_details(option)
@ -84,15 +84,15 @@
</tr> </tr>
<tr> <tr>
<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> <td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td>
<td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanlength" /></td> <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td> <td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td>
<td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanreason" /></td> <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanreason" disabled="disabled" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td> <td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td>
<td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" /></td> <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td>
</tr> </tr>
<tr> <tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" />&nbsp; <input type="reset" value="{L_RESET}" class="btnlite" />&nbsp;</td> <td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" />&nbsp; <input type="reset" value="{L_RESET}" class="btnlite" />&nbsp;</td>

4
phpBB/styles/subSilver/template/memberlist_email.html
View File

@ -9,11 +9,11 @@ function checkForm(formObj) {
formErrors = false; formErrors = false;
if (formObj.message.value.length < 2) { if (formObj.message.value.length < 2) {
formErrors = "{L_EMPTY_MESSAGE_EMAIL}"; formErrors = "{LA_EMPTY_MESSAGE_EMAIL}";
} }
else if ( formObj.subject.value.length < 2) else if ( formObj.subject.value.length < 2)
{ {
formErrors = "{L_EMPTY_SUBJECT_EMAIL}"; formErrors = "{LA_EMPTY_SUBJECT_EMAIL}";
} }
if (formErrors) { if (formErrors) {

4
phpBB/styles/subSilver/template/overall_header.html
View File

@ -27,7 +27,7 @@
<!-- IF S_USER_PM_POPUP --> <!-- IF S_USER_PM_POPUP -->
if ({S_NEW_PM}) if ({S_NEW_PM})
{ {
window.open('{U_JS_POPUP_PM}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); window.open('{UA_POPUP_PM}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');
} }
<!-- ENDIF --> <!-- ENDIF -->
@ -39,7 +39,7 @@ function popup(url, width, height)
function jumpto() function jumpto()
{ {
var page = prompt('{L_JUMP_PAGE}:', '{ON_PAGE}'); var page = prompt('{LA_JUMP_PAGE}:', '{ON_PAGE}');
var perpage = '{PER_PAGE}'; var perpage = '{PER_PAGE}';
var base_url = '{BASE_URL}'; var base_url = '{BASE_URL}';

2
phpBB/styles/subSilver/template/posting_attach_body.html
View File

@ -3,7 +3,7 @@
function popup_progress_bar() function popup_progress_bar()
{ {
close_waitscreen = 0; close_waitscreen = 0;
window.open('{U_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); window.open('{UA_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400');
} }
//--> //-->
</script> </script>

30
phpBB/styles/subSilver/template/posting_body.html
View File

@ -16,24 +16,24 @@ bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','
imageTag = false; imageTag = false;
// Helpline messages // Helpline messages
b_help = "{L_BBCODE_B_HELP}"; b_help = "{LA_BBCODE_B_HELP}";
i_help = "{L_BBCODE_I_HELP}"; i_help = "{LA_BBCODE_I_HELP}";
u_help = "{L_BBCODE_U_HELP}"; u_help = "{LA_BBCODE_U_HELP}";
q_help = "{L_BBCODE_Q_HELP}"; q_help = "{LA_BBCODE_Q_HELP}";
c_help = "{L_BBCODE_C_HELP}"; c_help = "{LA_BBCODE_C_HELP}";
l_help = "{L_BBCODE_L_HELP}"; l_help = "{LA_BBCODE_L_HELP}";
o_help = "{L_BBCODE_O_HELP}"; o_help = "{LA_BBCODE_O_HELP}";
p_help = "{L_BBCODE_P_HELP}"; p_help = "{LA_BBCODE_P_HELP}";
w_help = "{L_BBCODE_W_HELP}"; w_help = "{LA_BBCODE_W_HELP}";
a_help = "{L_BBCODE_A_HELP}"; a_help = "{LA_BBCODE_A_HELP}";
s_help = "{L_BBCODE_S_HELP}"; s_help = "{LA_BBCODE_S_HELP}";
f_help = "{L_BBCODE_F_HELP}"; f_help = "{LA_BBCODE_F_HELP}";
e_help = "{L_BBCODE_E_HELP}"; e_help = "{LA_BBCODE_E_HELP}";
function checkForm() function checkForm()
{ {
if (document.post.message.value.length < 2) { if (document.post.message.value.length < 2) {
alert('{L_EMPTY_MESSAGE}'); alert('{LA_EMPTY_MESSAGE}');
return false; return false;
} else { } else {
// document.post.post.disabled = true; // document.post.post.disabled = true;
@ -217,7 +217,7 @@ function checkForm()
<td class="gensmall" align="center"><b>{L_SMILIES}</b></td> <td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
</tr> </tr>
<tr> <tr>
<td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.SMILEY_CODE}')" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td> <td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.A_SMILEY_CODE}')" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td>
</tr> </tr>
<!-- IF S_SHOW_SMILEY_LINK --> <!-- IF S_SHOW_SMILEY_LINK -->

2
phpBB/styles/subSilver/template/posting_smilies.html
View File

@ -24,7 +24,7 @@ function smiley(text) {
<th height="28">{L_SMILIES}</th> <th height="28">{L_SMILIES}</th>
</tr> </tr>
<tr> <tr>
<td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td> <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.A_SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>

2
phpBB/styles/subSilver/template/ucp_groups_manage.html
View File

@ -5,7 +5,7 @@
<script type="text/javascript"> <script type="text/javascript">
function swatch() function swatch()
{ {
window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
return false; return false;
} }
</script> </script>

2
phpBB/styles/subSilver/template/ucp_pm_popup.html
View File

@ -4,7 +4,7 @@
<!-- <!--
function jump_to_inbox() function jump_to_inbox()
{ {
opener.document.location.href = "{U_JS_RETURN_INBOX}"; opener.document.location.href = "{UA_RETURN_INBOX}";
window.close(); window.close();
} }
//--> //-->

2
phpBB/styles/subSilver/template/ucp_prefs_personal.html
View File

@ -72,7 +72,7 @@ function dE(n,s){
<tr> <tr>
<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td> <td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
<td class="row2"> <td class="row2">
<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }"> <select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">
{S_DATEFORMAT_OPTIONS} {S_DATEFORMAT_OPTIONS}
</select> </select>
<div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="post" style="margin-top: 3px;" /></div> <div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="post" style="margin-top: 3px;" /></div>

26
phpBB/styles/subSilver/template/ucp_profile_signature.html
View File

@ -12,19 +12,19 @@ bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','
imageTag = false; imageTag = false;
// Helpline messages // Helpline messages
b_help = "{L_BBCODE_B_HELP}"; b_help = "{LA_BBCODE_B_HELP}";
i_help = "{L_BBCODE_I_HELP}"; i_help = "{LA_BBCODE_I_HELP}";
u_help = "{L_BBCODE_U_HELP}"; u_help = "{LA_BBCODE_U_HELP}";
q_help = "{L_BBCODE_Q_HELP}"; q_help = "{LA_BBCODE_Q_HELP}";
c_help = "{L_BBCODE_C_HELP}"; c_help = "{LA_BBCODE_C_HELP}";
l_help = "{L_BBCODE_L_HELP}"; l_help = "{LA_BBCODE_L_HELP}";
o_help = "{L_BBCODE_O_HELP}"; o_help = "{LA_BBCODE_O_HELP}";
p_help = "{L_BBCODE_P_HELP}"; p_help = "{LA_BBCODE_P_HELP}";
w_help = "{L_BBCODE_W_HELP}"; w_help = "{LA_BBCODE_W_HELP}";
a_help = "{L_BBCODE_A_HELP}"; a_help = "{LA_BBCODE_A_HELP}";
s_help = "{L_BBCODE_S_HELP}"; s_help = "{LA_BBCODE_S_HELP}";
f_help = "{L_BBCODE_F_HELP}"; f_help = "{LA_BBCODE_F_HELP}";
e_help = "{L_BBCODE_E_HELP}"; e_help = "{LA_BBCODE_E_HELP}";
//--> //-->
</script> </script>