Browse Source

! More housecleaning

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 years ago
parent
commit
1e5ecef200

+ 2 - 2
Sources/ManageBoards.php

@@ -614,7 +614,7 @@ function EditBoard()
  */
 function EditBoard2()
 {
-	global $txt, $sourcedir, $modSettings, $smcFunc, $context;
+	global $txt, $sourcedir, $smcFunc, $context;
 
 	$_POST['boardid'] = (int) $_POST['boardid'];
 	checkSession();
@@ -809,7 +809,7 @@ function ModifyCat()
  */
 function EditBoardSettings($return_config = false)
 {
-	global $context, $txt, $sourcedir, $modSettings, $scripturl, $smcFunc;
+	global $context, $txt, $sourcedir, $scripturl, $smcFunc;
 
 	// Load the boards list - for the recycle bin!
 	$recycle_boards = array('');

+ 1 - 1
Sources/ManageLanguages.php

@@ -26,7 +26,7 @@ if (!defined('SMF'))
  */
 function ManageLanguages()
 {
-	global $context, $txt, $scripturl, $modSettings;
+	global $context, $txt, $scripturl;
 
 	loadTemplate('ManageLanguages');
 	loadLanguage('ManageSettings');

+ 2 - 2
Sources/ManageMail.php

@@ -23,7 +23,7 @@ if (!defined('SMF'))
  */
 function ManageMail()
 {
-	global $context, $txt, $scripturl, $modSettings, $sourcedir;
+	global $context, $txt, $scripturl, $sourcedir;
 
 	// You need to be an admin to edit settings!
 	isAllowedTo('admin_forum');
@@ -65,7 +65,7 @@ function ManageMail()
  */
 function BrowseMailQueue()
 {
-	global $scripturl, $context, $modSettings, $txt, $smcFunc;
+	global $scripturl, $context, $txt, $smcFunc;
 	global $sourcedir;
 
 	// First, are we deleting something from the queue?

+ 3 - 3
Sources/ManageMaintenance.php

@@ -22,7 +22,7 @@ if (!defined('SMF'))
  */
 function ManageMaintenance()
 {
-	global $txt, $modSettings, $scripturl, $context;
+	global $txt, $scripturl, $context;
 
 	// You absolutely must be an admin by here!
 	isAllowedTo('admin_forum');
@@ -2179,7 +2179,7 @@ function MaintainRecountPosts()
  */
 function list_integration_hooks()
 {
-	global $sourcedir, $scripturl, $context, $txt, $modSettings, $settings;
+	global $sourcedir, $scripturl, $context, $txt, $settings;
 
 	$context['filter_url'] = '';
 	$context['current_filter'] = '';
@@ -2389,7 +2389,7 @@ function get_files_recursive($dir_path)
  */
 function get_integration_hooks_data($start, $per_page, $sort)
 {
-	global $boarddir, $sourcedir, $settings, $txt, $context, $scripturl, $modSettings;
+	global $boarddir, $sourcedir, $settings, $txt, $context, $scripturl;
 
 	$hooks = $temp_hooks = get_integration_hooks();
 	$hooks_data = $temp_data = $hook_status = array();

+ 1 - 1
Sources/ManageMembergroups.php

@@ -1188,7 +1188,7 @@ function EditMembergroup()
  */
 function ModifyMembergroupsettings()
 {
-	global $context, $sourcedir, $scripturl, $modSettings, $txt;
+	global $context, $sourcedir, $scripturl, $txt;
 
 	$context['sub_template'] = 'show_settings';
 	$context['page_title'] = $txt['membergroups_settings'];

+ 2 - 2
Sources/ManageNews.php

@@ -490,7 +490,7 @@ function prepareMailingForPreview ()
  */
 function ComposeMailing()
 {
-	global $txt, $sourcedir, $context, $smcFunc, $scripturl, $modSettings;
+	global $txt, $sourcedir, $context, $smcFunc, $scripturl;
 
 	// Setup the template!
 	$context['page_title'] = $txt['admin_newsletters'];
@@ -1040,7 +1040,7 @@ function SendMailing($clean_only = false)
  */
 function ModifyNewsSettings($return_config = false)
 {
-	global $context, $sourcedir, $modSettings, $txt, $scripturl;
+	global $context, $sourcedir, $txt, $scripturl;
 
 	$config_vars = array(
 		array('title', 'settings'),

+ 2 - 2
Sources/ManagePaid.php

@@ -389,7 +389,7 @@ function ViewSubscriptions()
  */
 function ModifySubscription()
 {
-	global $context, $txt, $modSettings, $smcFunc;
+	global $context, $txt, $smcFunc;
 
 	$context['sub_id'] = isset($_REQUEST['sid']) ? (int) $_REQUEST['sid'] : 0;
 	$context['action_type'] = $context['sub_id'] ? (isset($_REQUEST['delete']) ? 'delete' : 'edit') : 'add';
@@ -650,7 +650,7 @@ function ModifySubscription()
  */
 function ViewSubscribedUsers()
 {
-	global $context, $txt, $modSettings, $scripturl, $smcFunc, $sourcedir;
+	global $context, $txt, $scripturl, $smcFunc, $sourcedir;
 
 	// Setup the template.
 	$context['page_title'] = $txt['viewing_users_subscribed'];

+ 3 - 3
Sources/ManagePermissions.php

@@ -347,7 +347,7 @@ function PermissionIndex()
  */
 function PermissionByBoard()
 {
-	global $context, $modSettings, $txt, $smcFunc, $sourcedir, $cat_tree, $boardList, $boards;
+	global $context, $txt, $smcFunc, $sourcedir, $cat_tree, $boardList, $boards;
 
 	$context['page_title'] = $txt['permissions_boards'];
 	$context['edit_all'] = isset($_GET['edit']);
@@ -685,7 +685,7 @@ function SetQuickGroups()
  */
 function ModifyMembergroup()
 {
-	global $context, $txt, $modSettings, $smcFunc, $sourcedir;
+	global $context, $txt, $smcFunc, $sourcedir;
 
 	if (!isset($_GET['group']))
 		fatal_lang_error('no_access', false);
@@ -820,7 +820,7 @@ function ModifyMembergroup()
  */
 function ModifyMembergroup2()
 {
-	global $modSettings, $smcFunc, $context;
+	global $smcFunc, $context;
 
 	checkSession();
 	validateToken('admin-mp');

+ 1 - 1
Sources/ManagePosts.php

@@ -349,7 +349,7 @@ function ModifyBBCSettings($return_config = false)
  */
 function ModifyTopicSettings($return_config = false)
 {
-	global $context, $txt, $modSettings, $sourcedir, $scripturl;
+	global $context, $txt, $sourcedir, $scripturl;
 
 	// Here are all the topic settings.
 	$config_vars = array(

+ 1 - 1
Sources/ManageRegistration.php

@@ -28,7 +28,7 @@ if (!defined('SMF'))
  */
 function RegCenter()
 {
-	global $modSettings, $context, $txt, $scripturl;
+	global $context, $txt, $scripturl;
 
 	// Old templates might still request this.
 	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse')

+ 3 - 3
Sources/ManageScheduledTasks.php

@@ -26,7 +26,7 @@ if (!defined('SMF'))
  */
 function ManageScheduledTasks()
 {
-	global $context, $txt, $modSettings;
+	global $context, $txt;
 
 	isAllowedTo('admin_forum');
 
@@ -73,7 +73,7 @@ function ManageScheduledTasks()
  */
 function ScheduledTasks()
 {
-	global $context, $txt, $sourcedir, $smcFunc, $user_info, $modSettings, $scripturl;
+	global $context, $txt, $sourcedir, $smcFunc, $user_info, $scripturl;
 
 	// Mama, setup the template first - cause it's like the most important bit, like pickle in a sandwich.
 	// ... ironically I don't like pickle. </grudge>
@@ -323,7 +323,7 @@ function list_getScheduledTasks($start, $items_per_page, $sort)
  */
 function EditTask()
 {
-	global $context, $txt, $sourcedir, $smcFunc, $user_info, $modSettings;
+	global $context, $txt, $sourcedir, $smcFunc, $user_info;
 
 	// Just set up some lovely context stuff.
 	$context[$context['admin_menu_name']]['current_subsection'] = 'tasks';

+ 1 - 1
Sources/ManageSearchEngines.php

@@ -71,7 +71,7 @@ function SearchEngines()
  */
 function ManageSearchEngineSettings($return_config = false)
 {
-	global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc;
+	global $context, $txt, $scripturl, $sourcedir, $smcFunc;
 
 	$config_vars = array(
 		// How much detail?

+ 2 - 2
Sources/ManageServer.php

@@ -339,7 +339,7 @@ function ModifyCookieSettings($return_config = false)
  */
 function ModifyGeneralSecuritySettings($return_config = false)
 {
-	global $txt, $scripturl, $context, $sc, $modSettings;
+	global $txt, $scripturl, $context, $sc;
 
 	$config_vars = array(
 			array('int', 'failed_login_threshold'),
@@ -881,7 +881,7 @@ function prepareDBSettingContext(&$config_vars)
  */
 function saveSettings(&$config_vars)
 {
-	global $boarddir, $sc, $cookiename, $modSettings, $user_settings;
+	global $boarddir, $sc, $cookiename, $user_settings;
 	global $sourcedir, $context, $cachedir;
 
 	validateToken('admin-ssc');

+ 4 - 4
Sources/ManageSettings.php

@@ -48,7 +48,7 @@ function loadGeneralSettingParameters($subActions = array(), $defaultAction = ''
  */
 function ModifyFeatureSettings()
 {
-	global $context, $txt, $scripturl, $modSettings, $settings;
+	global $context, $txt, $scripturl, $settings;
 
 	$context['page_title'] = $txt['modSettings_title'];
 
@@ -95,7 +95,7 @@ function ModifyFeatureSettings()
  */
 function ModifyModSettings()
 {
-	global $context, $txt, $scripturl, $modSettings;
+	global $context, $txt, $scripturl;
 
 	$context['page_title'] = $txt['admin_modifications'];
 
@@ -1123,7 +1123,7 @@ function pauseSignatureApplySettings()
 function ShowCustomProfiles()
 {
 	global $txt, $scripturl, $context, $sc, $smcFunc;
-	global $modSettings, $sourcedir;
+	global $sourcedir;
 
 	$context['page_title'] = $txt['custom_profile_title'];
 	$context['sub_template'] = 'show_custom_profile';
@@ -1954,7 +1954,7 @@ function ModifyLogSettings($return_config = false)
  */
 function ModifyGeneralModSettings($return_config = false)
 {
-	global $txt, $scripturl, $context, $sc, $modSettings;
+	global $txt, $scripturl, $context, $sc;
 
 	$config_vars = array(
 		// Mod authors, add any settings UNDER this line. Include a comma at the end of the line and don't remove this statement!!

+ 2 - 2
Sources/ManageSmileys.php

@@ -1240,7 +1240,7 @@ function list_getNumSmileys()
  */
 function EditSmileyOrder()
 {
-	global $modSettings, $context, $txt, $boarddir, $smcFunc;
+	global $context, $txt, $boarddir, $smcFunc;
 
 	// Move smileys to another position.
 	if (isset($_REQUEST['reorder']))
@@ -1699,7 +1699,7 @@ function ImportSmileys($smileyPath)
  */
 function EditMessageIcons()
 {
-	global $user_info, $modSettings, $context, $settings, $txt;
+	global $user_info, $context, $settings, $txt;
 	global $boarddir, $smcFunc, $scripturl, $sourcedir;
 
 	// Get a list of icons.

+ 7 - 7
Sources/ModerationCenter.php

@@ -227,7 +227,7 @@ function ModerationMain($dont_call = false)
  */
 function ModerationHome()
 {
-	global $txt, $context, $scripturl, $modSettings, $user_info, $user_settings, $options;
+	global $txt, $context, $scripturl, $user_info, $user_settings, $options;
 
 	loadTemplate('ModerationCenter');
 	loadJavascriptFile('admin.js', array('default_theme' => true), 'admin.js');
@@ -551,7 +551,7 @@ function ModBlockGroupRequests()
  */
 function ReportedPosts()
 {
-	global $txt, $context, $scripturl, $modSettings, $user_info, $smcFunc;
+	global $txt, $context, $scripturl, $user_info, $smcFunc;
 
 	loadTemplate('ModerationCenter');
 
@@ -816,7 +816,7 @@ function ReportedPosts()
  */
 function ModerateGroups()
 {
-	global $txt, $context, $scripturl, $modSettings, $user_info;
+	global $txt, $context, $scripturl, $user_info;
 
 	// You need to be allowed to moderate groups...
 	if ($user_info['mod_cache']['gq'] == '0=1')
@@ -1727,7 +1727,7 @@ function ViewWarningLog()
  */
 function list_getWarningCount()
 {
-	global $smcFunc, $modSettings;
+	global $smcFunc;
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
@@ -1752,7 +1752,7 @@ function list_getWarningCount()
  */
 function list_getWarnings($start, $items_per_page, $sort)
 {
-	global $smcFunc, $txt, $scripturl, $modSettings, $user_info;
+	global $smcFunc, $txt, $scripturl, $user_info;
 
 	$request = $smcFunc['db_query']('', '
 		SELECT IFNULL(mem.id_member, 0) AS id_member, IFNULL(mem.real_name, lc.member_name) AS member_name_col,
@@ -1942,7 +1942,7 @@ function ViewWarningTemplates()
   */
 function list_getWarningTemplateCount()
 {
-	global $smcFunc, $modSettings, $user_info;
+	global $smcFunc, $user_info;
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
@@ -1970,7 +1970,7 @@ function list_getWarningTemplateCount()
  */
 function list_getWarningTemplates($start, $items_per_page, $sort)
 {
-	global $smcFunc, $txt, $scripturl, $modSettings, $user_info;
+	global $smcFunc, $txt, $scripturl, $user_info;
 
 	$request = $smcFunc['db_query']('', '
 		SELECT lc.id_comment, IFNULL(mem.id_member, 0) AS id_member,

+ 1 - 1
Sources/PackageGet.php

@@ -21,7 +21,7 @@ if (!defined('SMF'))
  */
 function PackageGet()
 {
-	global $txt, $scripturl, $context, $boarddir, $sourcedir, $modSettings;
+	global $txt, $scripturl, $context, $boarddir, $sourcedir;
 
 	isAllowedTo('admin_forum');
 	require_once($sourcedir . '/Subs-Package.php');

+ 1 - 1
Sources/Poll.php

@@ -591,7 +591,7 @@ function EditPoll()
 function EditPoll2()
 {
 	global $txt, $topic, $board, $context;
-	global $modSettings, $user_info, $smcFunc, $sourcedir;
+	global $user_info, $smcFunc, $sourcedir;
 
 	// Sneaking off, are we?
 	if (empty($_POST))

+ 9 - 9
Sources/Profile-Modify.php

@@ -792,7 +792,7 @@ function setupProfileContext($fields)
  */
 function saveProfileFields()
 {
-	global $profile_fields, $profile_vars, $context, $old_profile, $post_errors, $sourcedir, $modSettings, $cur_profile, $smcFunc;
+	global $profile_fields, $profile_vars, $context, $old_profile, $post_errors, $sourcedir, $cur_profile, $smcFunc;
 
 	// Load them up.
 	loadProfileFields();
@@ -931,7 +931,7 @@ function saveProfileFields()
  */
 function saveProfileChanges(&$profile_vars, &$post_errors, $memID)
 {
-	global $user_info, $txt, $modSettings, $user_profile;
+	global $user_info, $txt, $user_profile;
 	global $context, $sourcedir;
 	global $smcFunc;
 
@@ -1339,7 +1339,7 @@ function editBuddyIgnoreLists($memID)
  */
 function editBuddies($memID)
 {
-	global $txt, $scripturl, $modSettings;
+	global $txt, $scripturl;
 	global $context, $user_profile, $memberContext, $smcFunc;
 
 	// For making changes!
@@ -1477,7 +1477,7 @@ function editBuddies($memID)
  */
 function editIgnoreList($memID)
 {
-	global $txt, $scripturl, $modSettings;
+	global $txt, $scripturl;
 	global $context, $user_profile, $memberContext, $smcFunc;
 
 	// For making changes!
@@ -1747,7 +1747,7 @@ function getAvatars($directory, $level)
  */
 function theme($memID)
 {
-	global $txt, $context, $user_profile, $modSettings, $user_info, $smcFunc;
+	global $txt, $context, $user_profile, $user_info, $smcFunc;
 
 	loadThemeOptions($memID);
 	if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
@@ -1857,7 +1857,7 @@ function authentication($memID, $saving = false)
  */
 function notification($memID)
 {
-	global $txt, $scripturl, $user_profile, $user_info, $context, $modSettings, $smcFunc, $sourcedir;
+	global $txt, $scripturl, $user_profile, $user_info, $context, $smcFunc, $sourcedir;
 
 	// Going to want this for consistency.
 	loadCSSFile('admin.css', array(), 'admin');
@@ -2222,7 +2222,7 @@ function alert_notifications_topics($memID)
 
 function alert_notifications_boards($memID)
 {
-	global $txt, $scripturl, $user_profile, $user_info, $context, $modSettings, $smcFunc, $sourcedir;
+	global $txt, $scripturl, $user_profile, $user_info, $context, $smcFunc, $sourcedir;
 
 	// Because of the way this stuff works, we want to do this ourselves.
 	if (isset($_POST['edit_notify_boards']))
@@ -2596,7 +2596,7 @@ function ignoreboards($memID)
  */
 function profileLoadLanguages()
 {
-	global $context, $modSettings, $cur_profile, $language, $smcFunc;
+	global $context, $cur_profile, $language, $smcFunc;
 
 	$context['profile_languages'] = array();
 
@@ -3464,7 +3464,7 @@ function profileSendActivation()
  */
 function groupMembership($memID)
 {
-	global $txt, $scripturl, $user_profile, $user_info, $context, $modSettings, $smcFunc;
+	global $txt, $scripturl, $user_profile, $user_info, $context, $smcFunc;
 
 	$curMember = $user_profile[$memID];
 	$context['primary_group'] = $curMember['id_group'];

+ 2 - 3
Sources/Profile-View.php

@@ -1022,7 +1022,7 @@ function showUnwatched($memID)
  */
 function list_getUnwatched($start, $items_per_page, $sort, $memID)
 {
-	global $smcFunc, $board, $modSettings, $context;
+	global $smcFunc;
 
 	// Get the list of topics we can see
 	$request = $smcFunc['db_query']('', '
@@ -2012,8 +2012,7 @@ function TrackIP($memID = 0)
  */
 function TrackLogins($memID = 0)
 {
-	global $user_profile, $scripturl, $txt, $user_info, $modSettings, $sourcedir;
-	global $context, $smcFunc;
+	global $scripturl, $txt, $sourcedir, $context;
 
 	// Gonna want this for the list.
 	require_once($sourcedir . '/Subs-List.php');

+ 1 - 1
Sources/Register.php

@@ -797,7 +797,7 @@ function CoppaForm()
  */
 function VerificationCode()
 {
-	global $sourcedir, $modSettings, $context, $scripturl;
+	global $sourcedir, $context, $scripturl;
 
 	$verification_id = isset($_GET['vid']) ? $_GET['vid'] : '';
 	$code = $verification_id && isset($_SESSION[$verification_id . '_vv']) ? $_SESSION[$verification_id . '_vv']['code'] : (isset($_SESSION['visual_verification_code']) ? $_SESSION['visual_verification_code'] : '');

+ 2 - 2
Sources/Reminder.php

@@ -194,7 +194,7 @@ function setPassword()
 
 function setPassword2()
 {
-	global $context, $txt, $modSettings, $smcFunc, $sourcedir;
+	global $context, $txt, $smcFunc, $sourcedir;
 
 	checkSession();
 	validateToken('remind-sp');
@@ -320,7 +320,7 @@ function SecretAnswerInput()
 
 function SecretAnswer2()
 {
-	global $txt, $context, $modSettings, $smcFunc, $sourcedir;
+	global $txt, $context, $smcFunc, $sourcedir;
 
 	checkSession();
 	validateToken('remind-sai');

+ 1 - 1
Sources/RemoveTopic.php

@@ -154,7 +154,7 @@ function DeleteMessage()
  */
 function RemoveOldTopics2()
 {
-	global $modSettings, $smcFunc;
+	global $smcFunc;
 
 	isAllowedTo('admin_forum');
 	checkSession('post', 'admin');

+ 1 - 1
Sources/Reports.php

@@ -40,7 +40,7 @@ if (!defined('SMF'))
  */
 function ReportsMain()
 {
-	global $txt, $modSettings, $context, $scripturl;
+	global $txt, $context, $scripturl;
 
 	// Only admins, only EVER admins!
 	isAllowedTo('admin_forum');

+ 4 - 4
Sources/ScheduledTasks.php

@@ -21,7 +21,7 @@ if (!defined('SMF'))
  */
 function AutoTask()
 {
-	global $time_start, $modSettings, $smcFunc;
+	global $time_start, $smcFunc;
 
 	// Special case for doing the mail queue.
 	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq')
@@ -144,7 +144,7 @@ function AutoTask()
  */
 function scheduled_approval_notification()
 {
-	global $scripturl, $modSettings, $mbname, $txt, $sourcedir, $smcFunc;
+	global $scripturl, $txt, $sourcedir, $smcFunc;
 
 	// Grab all the items awaiting approval and sort type then board - clear up any things that are no longer relevant.
 	$request = $smcFunc['db_query']('', '
@@ -1315,7 +1315,7 @@ function scheduled_fetchSMfiles()
  */
 function scheduled_birthdayemails()
 {
-	global $modSettings, $sourcedir, $mbname, $txt, $smcFunc, $birthdayEmails;
+	global $modSettings, $sourcedir, $txt, $smcFunc, $txtBirthdayEmails;
 
 	// Need this in order to load the language files.
 	loadEssentialThemeData();
@@ -1586,7 +1586,7 @@ function scheduled_weekly_maintenance()
  */
 function scheduled_paid_subscriptions()
 {
-	global $txt, $sourcedir, $scripturl, $smcFunc, $modSettings, $language;
+	global $sourcedir, $scripturl, $smcFunc, $modSettings, $language;
 
 	// Start off by checking for removed subscriptions.
 	$request = $smcFunc['db_query']('', '

+ 1 - 1
Sources/SearchAPI-Custom.php

@@ -135,7 +135,7 @@ class custom_search
 	 */
 	public function searchSort($a, $b)
 	{
-		global $modSettings, $excludedWords;
+		global $excludedWords;
 
 		$x = strlen($a) - (in_array($a, $excludedWords) ? 1000 : 0);
 		$y = strlen($b) - (in_array($b, $excludedWords) ? 1000 : 0);

+ 1 - 1
Sources/SearchAPI-Fulltext.php

@@ -143,7 +143,7 @@ class fulltext_search
 	 */
 	public function searchSort($a, $b)
 	{
-		global $modSettings, $excludedWords, $smcFunc;
+		global $excludedWords, $smcFunc;
 
 		$x = $smcFunc['strlen']($a) - (in_array($a, $excludedWords) ? 1000 : 0);
 		$y = $smcFunc['strlen']($b) - (in_array($b, $excludedWords) ? 1000 : 0);

+ 4 - 8
Sources/SendTopic.php

@@ -20,7 +20,7 @@ if (!defined('SMF'))
  */
 function EmailUser()
 {
-	global $topic, $txt, $context, $scripturl, $sourcedir, $smcFunc;
+	global $context;
 
 	// Don't index anything here.
 	$context['robot_no_index'] = true;
@@ -150,7 +150,7 @@ function SendTopic()
  */
 function CustomEmail()
 {
-	global $context, $modSettings, $user_info, $smcFunc, $txt, $scripturl, $sourcedir;
+	global $context, $user_info, $smcFunc, $txt, $scripturl, $sourcedir;
 
 	// Can the user even see this information?
 	if ($user_info['is_guest'])
@@ -283,7 +283,7 @@ function CustomEmail()
  */
 function ReportToModerator()
 {
-	global $txt, $topic, $sourcedir, $modSettings, $user_info, $context, $smcFunc;
+	global $txt, $topic, $context, $smcFunc;
 
 	$context['robot_no_index'] = true;
 
@@ -368,7 +368,7 @@ function ReportToModerator()
  */
 function ReportToModerator2()
 {
-	global $txt, $scripturl, $topic, $board, $user_info, $modSettings, $sourcedir, $language, $context, $smcFunc;
+	global $txt, $topic, $user_info, $modSettings, $sourcedir, $context, $smcFunc;
 
 	// Sorry, no guests allowed... Probably just trying to spam us anyway
 	is_not_guest();
@@ -458,10 +458,6 @@ function ReportToModerator2()
 	$reporterName = un_htmlspecialchars($user_info['name']) . ($user_info['name'] != $user_info['username'] && $user_info['username'] != '' ? ' (' . $user_info['username'] . ')' : '');
 	$subject = un_htmlspecialchars($message['subject']);
 
-	// Get a list of members with the moderate_board permission.
-	require_once($sourcedir . '/Subs-Members.php');
-	$moderators = membersAllowedTo('moderate_board', $board);
-
 	$request = $smcFunc['db_query']('', '
 		SELECT id_report, ignore_all
 		FROM {db_prefix}log_reported

+ 1 - 1
Sources/Session.php

@@ -25,7 +25,7 @@ if (!defined('SMF'))
  */
 function loadSession()
 {
-	global $HTTP_SESSION_VARS, $modSettings, $boardurl, $sc;
+	global $modSettings, $boardurl, $sc;
 
 	// Attempt to change a few PHP settings.
 	@ini_set('session.use_cookies', true);

+ 2 - 2
Sources/SplitTopics.php

@@ -130,7 +130,7 @@ function SplitIndex()
  */
 function SplitExecute()
 {
-	global $txt, $board, $topic, $context, $user_info, $smcFunc, $modSettings;
+	global $txt, $board, $topic, $context, $user_info, $smcFunc;
 
 	// Check the session to make sure they meant to do this.
 	checkSession();
@@ -499,7 +499,7 @@ function SplitSelectionExecute()
  */
 function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject)
 {
-	global $user_info, $topic, $board, $modSettings, $smcFunc, $txt, $sourcedir;
+	global $user_info, $topic, $board, $smcFunc, $txt, $sourcedir;
 
 	// Nothing to split?
 	if (empty($splitMessages))

+ 1 - 1
Sources/Subs-Auth.php

@@ -328,7 +328,7 @@ function construct_query_string($get)
  */
 function findMembers($names, $use_wildcards = false, $buddies_only = false, $max = 500)
 {
-	global $scripturl, $user_info, $modSettings, $smcFunc;
+	global $scripturl, $user_info, $smcFunc;
 
 	// If it's not already an array, make it one.
 	if (!is_array($names))

+ 3 - 3
Sources/Subs-Boards.php

@@ -451,7 +451,7 @@ function getMsgMemberID($messageID)
  */
 function modifyBoard($board_id, &$boardOptions)
 {
-	global $sourcedir, $cat_tree, $boards, $boardList, $modSettings, $smcFunc;
+	global $cat_tree, $boards, $smcFunc;
 
 	// Get some basic information about all boards and categories.
 	getBoardTree();
@@ -810,7 +810,7 @@ function modifyBoard($board_id, &$boardOptions)
  */
 function createBoard($boardOptions)
 {
-	global $boards, $modSettings, $smcFunc;
+	global $boards, $smcFunc;
 
 	// Trigger an error if one of the required values is not set.
 	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category']))
@@ -1141,7 +1141,7 @@ function fixChildren($parent, $newLevel, $newParent)
  */
 function getBoardTree()
 {
-	global $cat_tree, $boards, $boardList, $txt, $modSettings, $smcFunc;
+	global $cat_tree, $boards, $boardList, $smcFunc;
 
 	// Getting all the board and category information you'd ever wanted.
 	$request = $smcFunc['db_query']('', '