diff options
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_ban.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 1 |
5 files changed, 22 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index e101d8514d..44049e4106 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -173,7 +173,8 @@ class acp_ban { $template->assign_block_vars('ban_length', array( '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( '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( 'BAN_ID' => $ban_id, - 'REASON' => addslashes(html_entity_decode($reason))) + 'REASON' => $reason, + 'A_REASON' => addslashes(html_entity_decode($reason))) ); } } diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 48e50881df..dad152ea87 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -523,7 +523,8 @@ class acp_groups 'GROUP_HIDDEN' => $type_hidden, '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&form=settings&name=group_colour", + 'UA_SWATCH' => "{$phpbb_admin_path}swatch.$phpEx$SID&form=settings&name=group_colour", 'U_ACTION' => "{$this->u_action}&action=$action&g=$group_id", 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)), ) diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8a163996d1..592422f85e 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -363,7 +363,7 @@ class acp_modules // 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>'; - $template->assign_block_vars('m_names', array('NAME' => str_replace("'", "\'", stripslashes($option)))); + $template->assign_block_vars('m_names', array('NAME' => $option)); // Build module modes foreach ($values['modes'] as $m_mode => $m_values) @@ -374,8 +374,10 @@ class acp_modules } $template->assign_block_vars('m_names.modes', array( - 'OPTION' => str_replace("'", "\'", stripslashes($m_mode)), - 'VALUE' => str_replace("'", "\'", stripslashes($this->lang_name($m_values['title'])))) + 'OPTION' => $m_mode, + 'VALUE' => $this->lang_name($m_values['title']), + 'A_OPTION' => addslashes($m_mode), + 'A_VALUE' => addslashes($this->lang_name($m_values['title']))) ); } } diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 468d7894d5..f9726a7df8 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -399,7 +399,8 @@ class acp_search $template->assign_vars(array( 'S_INDEX' => true, 'U_ACTION' => $this->u_action, - 'U_PROGRESS_BAR' => $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=progress_bar") // don't use & here + 'U_PROGRESS_BAR' => $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=progress_bar", + 'UA_PROGRESS_BAR' => $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=progress_bar") ); if (isset($this->state[1])) @@ -416,15 +417,18 @@ class acp_search function display_progress_bar($type) { 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( 'body' => 'search_index_progress_bar.html') ); $template->assign_vars(array( - 'L_PROGRESS' => ($type == 'create') ? $user->lang['INDEXING_IN_PROGRESS'] : $user->lang['DELETING_INDEX_IN_PROGRESS'], - 'L_PROGRESS_EXPLAIN' => ($type == 'create') ? $user->lang['INDEXING_IN_PROGRESS_EXPLAIN'] : $user->lang['DELETING_INDEX_IN_PROGRESS_EXPLAIN']) + 'L_PROGRESS' => $user->lang[$l_type], + 'L_PROGRESS_EXPLAIN' => $user->lang[$l_type . '_EXPLAIN']) ); adm_page_footer(); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 65860a48d6..cae41e8d25 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1223,6 +1223,7 @@ class acp_users 'S_DATEFORMAT_OPTIONS' => $dateformat_options, 'S_CUSTOM_DATEFORMAT' => $s_custom, 'DEFAULT_DATEFORMAT' => $config['default_dateformat'], + 'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']), 'S_LANG_OPTIONS' => language_select($lang), 'S_STYLE_OPTIONS' => style_select($style), |