diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:56:22 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:56:22 +0200 |
| commit | 05a8baffdbb8bcca05ab927b11f687de99ac7ea9 (patch) | |
| tree | ac6e38907ca36a7ad0e0f20a40685c9b853e4a6e | |
| parent | 3f6119c42b5c0a3b35edaa35e2c7379b3ed089af (diff) | |
| parent | 7a3e55bdb3725665b229f47ff6a5778a6f259969 (diff) | |
| download | forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar.gz forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar.bz2 forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.tar.xz forums-05a8baffdbb8bcca05ab927b11f687de99ac7ea9.zip | |
Merge pull request #4840 from rmcgirr83/ticket_15237
[ticket/15237] Fix unguarded includes to functions_user
| -rw-r--r-- | phpBB/includes/mcp/mcp_ban.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 5 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 5 | ||||
| -rw-r--r-- | phpBB/posting.php | 5 | ||||
| -rw-r--r-- | phpBB/viewonline.php | 5 |
5 files changed, 20 insertions, 5 deletions
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index 4d2151fded..2f3405f915 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -28,7 +28,10 @@ class mcp_ban global $db, $user, $auth, $template, $request, $phpbb_dispatcher; global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_ban')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } // Include the admin banning interface... include($phpbb_root_path . 'includes/acp/acp_ban.' . $phpEx); diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index b5f2bf4f02..1cf4a74234 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -53,7 +53,10 @@ function mcp_post_details($id, $mode, $action) if ($auth->acl_get('m_info', $post_info['forum_id'])) { $ip = request_var('ip', ''); - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_ipwhois')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $template->assign_vars(array( 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&p=$post_id") . '">', '</a>'), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index b93476b3bb..b1982958d5 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -101,7 +101,10 @@ switch ($mode) { case 'team': // Display a listing of board admins, moderators - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $page_title = $user->lang['THE_TEAM']; $template_html = 'memberlist_team.html'; diff --git a/phpBB/posting.php b/phpBB/posting.php index 4651a1fd2c..3ab78b5db5 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1066,7 +1066,10 @@ if ($submit || $preview || $refresh) // Validate username if (($post_data['username'] && !$user->data['is_registered']) || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username'])) { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('validate_username')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $user->add_lang('ucp'); diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 5cb1175528..0a8af2001c 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -60,7 +60,10 @@ $order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC // Whois requested if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s |