[ticket/13454] Remove more unused variables

marc1706 · marc1706 · commit 73900d1857a9 · 2016-01-06T13:52:11.000+01:00
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
@@ -1381,7 +1381,7 @@ function move_forum($from_id, $to_id)
 	{
 		global $db, $user, $phpbb_dispatcher;
 
-		$to_data = $moved_ids = $errors = array();
+		$errors = array();
 
 		// Check if we want to move to a parent with link type
 		if ($to_id > 0)
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
@@ -1536,7 +1536,6 @@ function main($id, $mode)
 					$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
 					$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
 				}
-				$s_birthday_year_options = '';
 
 				$now = getdate();
 				$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
@@ -1318,8 +1318,6 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 	else if ($config['load_anon_lastread'] || $user->data['is_registered'])
 	{
 		// Get information from cookie
-		$row = false;
-
 		if (!isset($tracking_topics['tf'][$forum_id]))
 		{
 			// We do not need to mark read, this happened before. Therefore setting this to true
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
@@ -1312,8 +1312,6 @@ function extension_allowed($forum_id, $extension, &$extensions)
 */
 function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
 {
-	$chars = array();
-
 	$strip_reply = false;
 	$stripped = false;
 	if ($allow_reply && strpos($string, 'Re: ') === 0)
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
@@ -1320,7 +1320,7 @@ function restore_config($schema)
 */
 function update_folder_pm_count()
 {
-	global $db, $convert, $user;
+	global $db;
 
 	$sql = 'SELECT user_id, folder_id, COUNT(msg_id) as num_messages
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1379,7 +1379,7 @@ function extract_variables_from_file($_filename)
 
 function get_path($src_path, $src_url, $test_file)
 {
-	global $config, $phpbb_root_path, $phpEx;
+	global $phpbb_root_path, $phpEx;
 
 	$board_config = get_config();
 
@@ -1490,7 +1490,7 @@ function compare_table($tables, $tablename, &$prefixes)
 */
 function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO)
 {
-	global $db, $convert, $user, $config;
+	global $db;
 	static $acl_option_ids, $group_ids;
 
 	if (($ug_type == 'group' || $ug_type == 'group_role') && is_string($ug_id))
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
@@ -1292,7 +1292,7 @@ function display_user_activity(&$userdata_ary)
 */
 function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0, $item_title = '')
 {
-	global $template, $db, $user, $phpEx, $start, $phpbb_root_path;
+	global $db, $user, $phpEx, $start, $phpbb_root_path;
 	global $request;
 
 	$table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
@@ -1291,7 +1291,7 @@ function log_into_server($hostname, $username, $password, $default_auth_method)
 			$this->server_send("QUIT");
 			fclose($this->socket);
 
-			$result = $this->pop_before_smtp($hostname, $username, $password);
+			$this->pop_before_smtp($hostname, $username, $password);
 			$username = $password = $default_auth_method = '';
 
 			// We need to close the previous session, else the server is not
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
@@ -886,7 +886,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0, $pm_action = '', $ms
 */
 function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
 {
-	global $user, $auth, $db, $template, $cache;
+	global $user, $auth, $db, $template;
 	global $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
 
 	/* @var $phpbb_content_visibility \phpbb\content_visibility */
@@ -1359,7 +1359,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 */
 function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data_ary, $update_message = true, $update_search_index = true)
 {
-	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $phpbb_log, $request;
+	global $db, $auth, $user, $config, $phpEx, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $phpbb_log, $request;
 
 	$poll = $poll_ary;
 	$data = $data_ary;
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
@@ -1391,8 +1391,6 @@ function phpbb_delete_users_pms($user_ids)
 */
 function rebuild_header($check_ary)
 {
-	global $db;
-
 	$address = array();
 
 	foreach ($check_ary as $check_type => $address_field)
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
@@ -1289,7 +1289,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 */
 function user_unban($mode, $ban)
 {
-	global $db, $user, $auth, $cache, $phpbb_log;
+	global $db, $user, $cache, $phpbb_log;
 
 	// Delete stale bans
 	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
@@ -1344,8 +1344,6 @@ function mcp_fork_topic($topic_ids)
 
 			if ($topic_row['poll_start'])
 			{
-				$poll_rows = array();
-
 				$sql = 'SELECT *
 					FROM ' . POLL_OPTIONS_TABLE . "
 					WHERE topic_id = $topic_id";
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
@@ -1299,7 +1299,7 @@ function get_bbcode_bitfield()
 */
 function phpbb_post_edit_user()
 {
-	global $convert_row, $config;
+	global $convert_row;
 
 	if (isset($convert_row['post_edit_count']))
 	{
@@ -1320,7 +1320,7 @@ function phpbb_get_files_dir()
 		return;
 	}
 
-	global $src_db, $same_db, $convert, $user, $config, $cache;
+	global $src_db, $same_db, $convert, $user;
 
 	if ($convert->mysql_convert && $same_db)
 	{
@@ -1359,7 +1359,7 @@ function phpbb_get_files_dir()
 */
 function phpbb_copy_thumbnails()
 {
-	global $db, $convert, $user, $config, $cache, $phpbb_root_path;
+	global $convert, $config, $phpbb_root_path;
 
 	$src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/';
 
diff --git a/phpBB/phpbb/db/tools/tools.php b/phpBB/phpbb/db/tools/tools.php
@@ -1116,7 +1116,7 @@ function sql_prepare_column_data($table_name, $column_name, $column_data)
 		}
 
 		// Get type
-		list($column_type, $orig_column_type) = $this->get_column_type($column_data[0]);
+		list($column_type) = $this->get_column_type($column_data[0]);
 
 		// Adjust default value if db-dependent specified
 		if (is_array($column_data[1]))
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
@@ -1324,7 +1324,6 @@ public function split_message($text)
 		$match[] = '#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?[0-9a-z]{5,})\]#';
 
 		$min = $this->word_length['min'];
-		$max = $this->word_length['max'];
 
 		$isset_min = $min - 1;
 
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
@@ -1403,7 +1403,7 @@ function check_uribl($uri)
 	*/
 	function set_login_key($user_id = false, $key = false, $user_ip = false)
 	{
-		global $config, $db;
+		global $db;
 
 		$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
 		$user_ip = ($user_ip === false) ? $this->ip : $user_ip;
@@ -1413,7 +1413,7 @@ function set_login_key($user_id = false, $key = false, $user_ip = false)
 
 		$sql_ary = array(
 			'key_id'		=> (string) md5($key_id),
-			'last_ip'		=> (string) $this->ip,
+			'last_ip'		=> (string) $user_id,
 			'last_login'	=> (int) time()
 		);
 
@@ -1450,7 +1450,7 @@ function set_login_key($user_id = false, $key = false, $user_ip = false)
 	*/
 	function reset_login_keys($user_id = false)
 	{
-		global $config, $db;
+		global $db;
 
 		$user_id = ($user_id === false) ? (int) $this->data['user_id'] : (int) $user_id;
 
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -196,7 +196,7 @@ public function get_errors()
 		$errors = array();
 		foreach ($this->parser->getLogger()->get() as $entry)
 		{
-			list($type, $msg, $context) = $entry;
+			list(, $msg, $context) = $entry;
 
 			if ($msg === 'Tag limit exceeded')
 			{

Original file line number	Diff line number	Diff line change
`@@ -1381,7 +1381,7 @@ function move_forum($from_id, $to_id)`
`1381`	`1381`	`{`
`1382`	`1382`	`global $db, $user, $phpbb_dispatcher;`
`1383`	`1383`
`1384`		`- $to_data = $moved_ids = $errors = array();`
	`1384`	`+ $errors = array();`
`1385`	`1385`
`1386`	`1386`	`// Check if we want to move to a parent with link type`
`1387`	`1387`	`if ($to_id > 0)`
Original file line number	Diff line number	Diff line change
`@@ -1536,7 +1536,6 @@ function main($id, $mode)`
`1536`	`1536`	`$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';`
`1537`	`1537`	`$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";`
`1538`	`1538`	`}`
`1539`		`- $s_birthday_year_options = '';`
`1540`	`1539`
`1541`	`1540`	`$now = getdate();`
`1542`	`1541`	`$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';`
Original file line number	Diff line number	Diff line change
`@@ -1318,8 +1318,6 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti`
`1318`	`1318`	`else if ($config['load_anon_lastread'] \|\| $user->data['is_registered'])`
`1319`	`1319`	`{`
`1320`	`1320`	`// Get information from cookie`
`1321`		`- $row = false;`
`1322`		`-`
`1323`	`1321`	`if (!isset($tracking_topics['tf'][$forum_id]))`
`1324`	`1322`	`{`
`1325`	`1323`	`// We do not need to mark read, this happened before. Therefore setting this to true`
Original file line number	Diff line number	Diff line change
`@@ -1312,8 +1312,6 @@ function extension_allowed($forum_id, $extension, &$extensions)`
`1312`	`1312`	`*/`
`1313`	`1313`	`function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')`
`1314`	`1314`	`{`
`1315`		`- $chars = array();`
`1316`		`-`
`1317`	`1315`	`$strip_reply = false;`
`1318`	`1316`	`$stripped = false;`
`1319`	`1317`	`if ($allow_reply && strpos($string, 'Re: ') === 0)`
Original file line number	Diff line number	Diff line change
`@@ -1292,7 +1292,7 @@ function display_user_activity(&$userdata_ary)`
`1292`	`1292`	`*/`
`1293`	`1293`	`function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0, $item_title = '')`
`1294`	`1294`	`{`
`1295`		`- global $template, $db, $user, $phpEx, $start, $phpbb_root_path;`
	`1295`	`+ global $db, $user, $phpEx, $start, $phpbb_root_path;`
`1296`	`1296`	`global $request;`
`1297`	`1297`
`1298`	`1298`	`$table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;`
Original file line number	Diff line number	Diff line change
`@@ -1391,8 +1391,6 @@ function phpbb_delete_users_pms($user_ids)`
`1391`	`1391`	`*/`
`1392`	`1392`	`function rebuild_header($check_ary)`
`1393`	`1393`	`{`
`1394`		`- global $db;`
`1395`		`-`
`1396`	`1394`	`$address = array();`
`1397`	`1395`
`1398`	`1396`	`foreach ($check_ary as $check_type => $address_field)`
Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas`
`1289`	`1289`	`*/`
`1290`	`1290`	`function user_unban($mode, $ban)`
`1291`	`1291`	`{`
`1292`		`- global $db, $user, $auth, $cache, $phpbb_log;`
	`1292`	`+ global $db, $user, $cache, $phpbb_log;`
`1293`	`1293`
`1294`	`1294`	`// Delete stale bans`
`1295`	`1295`	`$sql = 'DELETE FROM ' . BANLIST_TABLE . '`