[ticket/14972] replace all occurrences of sizeof() with the count()

PHPBB3-14972

phpBB/phpbb/search/base.php

@@ -133,7 +133,7 @@ class base
 	{
 		global $cache, $config, $db, $user;
 
-		$length = min(sizeof($id_ary), $config['search_block_size']);
+		$length = min(count($id_ary), $config['search_block_size']);
 
 		// nothing to cache so exit
 		if (!$length)
@@ -148,7 +148,7 @@ class base
 		if (!($store = $cache->get('_search_results_' . $search_key)))
 		{
 			// add the current keywords to the recent searches in the cache which are listed on the search page
-			if (!empty($keywords) || sizeof($author_ary))
+			if (!empty($keywords) || count($author_ary))
 			{
 				$sql = 'SELECT search_time
 					FROM ' . SEARCH_RESULTS_TABLE . '
@@ -201,7 +201,7 @@ class base
 			$store += $store_ids;
 
 			// if the cache is too big
-			if (sizeof($store) - 2 > 20 * $config['search_block_size'])
+			if (count($store) - 2 > 20 * $config['search_block_size'])
 			{
 				// remove everything in front of two blocks in front of the current start index
 				for ($i = 0, $n = $id_range[0] - 2 * $config['search_block_size']; $i < $n; $i++)
@@ -243,7 +243,7 @@ class base
 		global $db, $cache, $config;
 
 		// clear all searches that searched for the specified words
-		if (sizeof($words))
+		if (count($words))
 		{
 			$sql_where = '';
 			foreach ($words as $word)
@@ -264,7 +264,7 @@ class base
 		}
 
 		// clear all searches that searched for the specified authors
-		if (is_array($authors) && sizeof($authors))
+		if (is_array($authors) && count($authors))
 		{
 			$sql_where = '';
 			foreach ($authors as $author)

phpBB/phpbb/search/fulltext_mysql.php

@@ -232,9 +232,9 @@ class fulltext_mysql extends \phpbb\search\base
 		$this->split_words = $matches[1];
 
 		// We limit the number of allowed keywords to minimize load on the database
-		if ($this->config['max_num_search_keywords'] && sizeof($this->split_words) > $this->config['max_num_search_keywords'])
+		if ($this->config['max_num_search_keywords'] && count($this->split_words) > $this->config['max_num_search_keywords'])
 		{
-			trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', (int) $this->config['max_num_search_keywords'], sizeof($this->split_words)));
+			trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', (int) $this->config['max_num_search_keywords'], count($this->split_words)));
 		}
 
 		// to allow phrase search, we need to concatenate quoted words
@@ -361,7 +361,7 @@ class fulltext_mysql extends \phpbb\search\base
 
 		// remove too short or too long words
 		$text = array_values($text);
-		for ($i = 0, $n = sizeof($text); $i < $n; $i++)
+		for ($i = 0, $n = count($text); $i < $n; $i++)
 		{
 			$text[$i] = trim($text[$i]);
 			if (utf8_strlen($text[$i]) < $this->config['fulltext_mysql_min_word_len'] || utf8_strlen($text[$i]) > $this->config['fulltext_mysql_max_word_len'])
@@ -563,12 +563,12 @@ class fulltext_mysql extends \phpbb\search\base
 		$sql_select			= ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
 		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
 		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
-		if (sizeof($author_ary) && $author_name)
+		if (count($author_ary) && $author_name)
 		{
 			// first one matches post of registered users, second one guests and deleted users
 			$sql_author = ' AND (' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
 		}
-		else if (sizeof($author_ary))
+		else if (count($author_ary))
 		{
 			$sql_author = ' AND ' . $this->db->sql_in_set('p.poster_id', $author_ary);
 		}
@@ -580,7 +580,7 @@ class fulltext_mysql extends \phpbb\search\base
 		$sql_where_options = $sql_sort_join;
 		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
 		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
-		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
+		$sql_where_options .= (count($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
 		$sql_where_options .= ' AND ' . $post_visibility;
 		$sql_where_options .= $sql_author;
 		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
@@ -660,7 +660,7 @@ class fulltext_mysql extends \phpbb\search\base
 	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
-		if (!sizeof($author_ary))
+		if (!count($author_ary))
 		{
 			return 0;
 		}
@@ -737,7 +737,7 @@ class fulltext_mysql extends \phpbb\search\base
 		{
 			$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
 		}
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
+		$sql_fora		= (count($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
 		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
 		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
 		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
@@ -890,7 +890,7 @@ class fulltext_mysql extends \phpbb\search\base
 			$id_ary = array_unique($id_ary);
 		}
 
-		if (sizeof($id_ary))
+		if (count($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
 			$id_ary = array_slice($id_ary, 0, $per_page);
@@ -997,7 +997,7 @@ class fulltext_mysql extends \phpbb\search\base
 			$alter_list[] = $alter_entry;
 		}
 
-		if (sizeof($alter_list))
+		if (count($alter_list))
 		{
 			foreach ($alter_list as $alter)
 			{
@@ -1050,7 +1050,7 @@ class fulltext_mysql extends \phpbb\search\base
 			$alter[] = 'DROP INDEX post_text';
 		}
 
-		if (sizeof($alter))
+		if (count($alter))
 		{
 			$this->db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
 		}

phpBB/phpbb/search/fulltext_native.php

@@ -285,7 +285,7 @@ class fulltext_native extends \phpbb\search\base
 		);
 
 		$keywords = preg_replace($match, $replace, $keywords);
-		$num_keywords = sizeof(explode(' ', $keywords));
+		$num_keywords = count(explode(' ', $keywords));
 
 		// We limit the number of allowed keywords to minimize load on the database
 		if ($this->config['max_num_search_keywords'] && $num_keywords > $this->config['max_num_search_keywords'])
@@ -301,7 +301,7 @@ class fulltext_native extends \phpbb\search\base
 			$words = array();
 
 			preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $words);
-			if (sizeof($words[1]))
+			if (count($words[1]))
 			{
 				$keywords = '(' . implode('|', $words[1]) . ')';
 			}
@@ -316,7 +316,7 @@ class fulltext_native extends \phpbb\search\base
 
 		$common_ids = $words = array();
 
-		if (sizeof($exact_words))
+		if (count($exact_words))
 		{
 			$sql = 'SELECT word_id, word_text, word_common
 				FROM ' . SEARCH_WORDLIST_TABLE . '
@@ -426,10 +426,10 @@ class fulltext_native extends \phpbb\search\base
 						}
 					}
 				}
-				if (sizeof($id_words))
+				if (count($id_words))
 				{
 					sort($id_words);
-					if (sizeof($id_words) > 1)
+					if (count($id_words) > 1)
 					{
 						$this->{$mode . '_ids'}[] = $id_words;
 					}
@@ -440,7 +440,7 @@ class fulltext_native extends \phpbb\search\base
 					}
 				}
 				// throw an error if we shall not ignore unexistant words
-				else if (!$ignore_no_id && sizeof($non_common_words))
+				else if (!$ignore_no_id && count($non_common_words))
 				{
 					trigger_error(sprintf($this->user->lang['WORDS_IN_NO_POST'], implode($this->user->lang['COMMA_SEPARATOR'], $non_common_words)));
 				}
@@ -480,7 +480,7 @@ class fulltext_native extends \phpbb\search\base
 		}
 
 		// Return true if all words are not common words
-		if (sizeof($exact_words) - sizeof($this->common_words) > 0)
+		if (count($exact_words) - count($this->common_words) > 0)
 		{
 			return true;
 		}
@@ -716,7 +716,7 @@ class fulltext_native extends \phpbb\search\base
 			}
 		}
 
-		if (sizeof($this->must_not_contain_ids))
+		if (count($this->must_not_contain_ids))
 		{
 			$sql_array['LEFT_JOIN'][] = array(
 				'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
@@ -826,7 +826,7 @@ class fulltext_native extends \phpbb\search\base
 			$sql_where[] = 'p.topic_id = ' . $topic_id;
 		}
 
-		if (sizeof($author_ary))
+		if (count($author_ary))
 		{
 			if ($author_name)
 			{
@@ -840,7 +840,7 @@ class fulltext_native extends \phpbb\search\base
 			$sql_where[] = $sql_author;
 		}
 
-		if (sizeof($ex_fid_ary))
+		if (count($ex_fid_ary))
 		{
 			$sql_where[] = $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true);
 		}
@@ -1010,7 +1010,7 @@ class fulltext_native extends \phpbb\search\base
 	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
-		if (!sizeof($author_ary))
+		if (!count($author_ary))
 		{
 			return 0;
 		}
@@ -1082,7 +1082,7 @@ class fulltext_native extends \phpbb\search\base
 		{
 			$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
 		}
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
+		$sql_fora		= (count($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
 		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
 		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
 		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
@@ -1289,7 +1289,7 @@ class fulltext_native extends \phpbb\search\base
 			$this->db->sql_freeresult($result);
 		}
 
-		if (sizeof($id_ary))
+		if (count($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
 			$id_ary = array_slice($id_ary, 0, $per_page);
@@ -1443,7 +1443,7 @@ class fulltext_native extends \phpbb\search\base
 		// individual arrays of added and removed words for text and title. What
 		// we need to do now is add the new words (if they don't already exist)
 		// and then add (or remove) matches between the words and this post
-		if (sizeof($unique_add_words))
+		if (count($unique_add_words))
 		{
 			$sql = 'SELECT word_id, word_text
 				FROM ' . SEARCH_WORDLIST_TABLE . '
@@ -1459,7 +1459,7 @@ class fulltext_native extends \phpbb\search\base
 			$new_words = array_diff($unique_add_words, array_keys($word_ids));
 
 			$this->db->sql_transaction('begin');
-			if (sizeof($new_words))
+			if (count($new_words))
 			{
 				$sql_ary = array();
 
@@ -1483,7 +1483,7 @@ class fulltext_native extends \phpbb\search\base
 		{
 			$title_match = ($word_in == 'title') ? 1 : 0;
 
-			if (sizeof($word_ary))
+			if (count($word_ary))
 			{
 				$sql_in = array();
 				foreach ($word_ary as $word)
@@ -1512,7 +1512,7 @@ class fulltext_native extends \phpbb\search\base
 		{
 			$title_match = ($word_in == 'title') ? 1 : 0;
 
-			if (sizeof($word_ary))
+			if (count($word_ary))
 			{
 				$sql = 'INSERT INTO ' . SEARCH_WORDMATCH_TABLE . ' (post_id, word_id, title_match)
 					SELECT ' . (int) $post_id . ', word_id, ' . (int) $title_match . '
@@ -1543,7 +1543,7 @@ class fulltext_native extends \phpbb\search\base
 	*/
 	public function index_remove($post_ids, $author_ids, $forum_ids)
 	{
-		if (sizeof($post_ids))
+		if (count($post_ids))
 		{
 			$sql = 'SELECT w.word_id, w.word_text, m.title_match
 				FROM ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . ' w
@@ -1566,7 +1566,7 @@ class fulltext_native extends \phpbb\search\base
 			}
 			$this->db->sql_freeresult($result);
 
-			if (sizeof($title_word_ids))
+			if (count($title_word_ids))
 			{
 				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
 					SET word_count = word_count - 1
@@ -1575,7 +1575,7 @@ class fulltext_native extends \phpbb\search\base
 				$this->db->sql_query($sql);
 			}
 
-			if (sizeof($message_word_ids))
+			if (count($message_word_ids))
 			{
 				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
 					SET word_count = word_count - 1
@@ -1630,7 +1630,7 @@ class fulltext_native extends \phpbb\search\base
 			}
 			$this->db->sql_freeresult($result);
 
-			if (sizeof($sql_in))
+			if (count($sql_in))
 			{
 				// Flag the words
 				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
@@ -1650,7 +1650,7 @@ class fulltext_native extends \phpbb\search\base
 			unset($sql_in);
 		}
 
-		if (sizeof($destroy_cache_words))
+		if (count($destroy_cache_words))
 		{
 			// destroy cached search results containing any of the words that are now common or were removed
 			$this->destroy_cache(array_unique($destroy_cache_words));
@@ -1685,7 +1685,7 @@ class fulltext_native extends \phpbb\search\base
 	*/
 	public function index_created()
 	{
-		if (!sizeof($this->stats))
+		if (!count($this->stats))
 		{
 			$this->get_stats();
 		}
@@ -1698,7 +1698,7 @@ class fulltext_native extends \phpbb\search\base
 	*/
 	public function index_stats()
 	{
-		if (!sizeof($this->stats))
+		if (!count($this->stats))
 		{
 			$this->get_stats();
 		}

phpBB/phpbb/search/fulltext_postgres.php

@@ -294,7 +294,7 @@ class fulltext_postgres extends \phpbb\search\base
 
 		// remove too short or too long words
 		$text = array_values($text);
-		for ($i = 0, $n = sizeof($text); $i < $n; $i++)
+		for ($i = 0, $n = count($text); $i < $n; $i++)
 		{
 			$text[$i] = trim($text[$i]);
 			if (utf8_strlen($text[$i]) < $this->config['fulltext_postgres_min_word_len'] || utf8_strlen($text[$i]) > $this->config['fulltext_postgres_max_word_len'])
@@ -502,12 +502,12 @@ class fulltext_postgres extends \phpbb\search\base
 		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
 		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
 
-		if (sizeof($author_ary) && $author_name)
+		if (count($author_ary) && $author_name)
 		{
 			// first one matches post of registered users, second one guests and deleted users
 			$sql_author = '(' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
 		}
-		else if (sizeof($author_ary))
+		else if (count($author_ary))
 		{
 			$sql_author = ' AND ' . $this->db->sql_in_set('p.poster_id', $author_ary);
 		}
@@ -519,7 +519,7 @@ class fulltext_postgres extends \phpbb\search\base
 		$sql_where_options = $sql_sort_join;
 		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
 		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
-		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
+		$sql_where_options .= (count($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
 		$sql_where_options .= ' AND ' . $post_visibility;
 		$sql_where_options .= $sql_author;
 		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
@@ -609,7 +609,7 @@ class fulltext_postgres extends \phpbb\search\base
 	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
-		if (!sizeof($author_ary))
+		if (!count($author_ary))
 		{
 			return 0;
 		}
@@ -686,7 +686,7 @@ class fulltext_postgres extends \phpbb\search\base
 		{
 			$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
 		}
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
+		$sql_fora		= (count($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
 		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
 		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
 		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
@@ -861,7 +861,7 @@ class fulltext_postgres extends \phpbb\search\base
 			$id_ary = array_unique($id_ary);
 		}
 
-		if (sizeof($id_ary))
+		if (count($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
 			$id_ary = array_slice($id_ary, 0, $per_page);

phpBB/phpbb/search/fulltext_sphinx.php

@@ -483,7 +483,7 @@ class fulltext_sphinx
 		global $user, $phpbb_log;
 
 		// No keywords? No posts.
-		if (!strlen($this->search_query) && !sizeof($author_ary))
+		if (!strlen($this->search_query) && !count($author_ary))
 		{
 			return false;
 		}
@@ -623,7 +623,7 @@ class fulltext_sphinx
 			break;
 		}
 
-		if (sizeof($author_ary))
+		if (count($author_ary))
 		{
 			$this->sphinx->SetFilter('poster_id', $author_ary);
 		}
@@ -633,14 +633,14 @@ class fulltext_sphinx
 		// but at least it will also cause the same for normal users.
 		$this->sphinx->SetFilter('post_visibility', array(ITEM_APPROVED));
 
-		if (sizeof($ex_fid_ary))
+		if (count($ex_fid_ary))
 		{
 			// All forums that a user is allowed to access
 			$fid_ary = array_unique(array_intersect(array_keys($this->auth->acl_getf('f_read', true)), array_keys($this->auth->acl_getf('f_search', true))));
 			// All forums that the user wants to and can search in
 			$search_forums = array_diff($fid_ary, $ex_fid_ary);
 
-			if (sizeof($search_forums))
+			if (count($search_forums))
 			{
 				$this->sphinx->SetFilter('forum_id', $search_forums);
 			}
@@ -790,7 +790,7 @@ class fulltext_sphinx
 			}
 			$this->db->sql_freeresult($result);
 
-			if (sizeof($post_updates))
+			if (count($post_updates))
 			{
 				$this->sphinx->UpdateAttributes($this->indexes, array('topic_last_post_time'), $post_updates);
 			}

phpBB/phpbb/search/sphinx/config.php

@@ -46,7 +46,7 @@ class config
 	*/
 	function get_section_by_name($name)
 	{
-		for ($i = 0, $size = sizeof($this->sections); $i < $size; $i++)
+		for ($i = 0, $size = count($this->sections); $i < $size; $i++)
 		{
 			// Make sure this is really a section object and not a comment
 			if (($this->sections[$i] instanceof \phpbb\search\sphinx\config_section) && $this->sections[$i]->get_name() == $name)
@@ -67,7 +67,7 @@ class config
 	function add_section($name)
 	{
 		$this->sections[] = new \phpbb\search\sphinx\config_section($name, '');
-		return $this->sections[sizeof($this->sections) - 1];
+		return $this->sections[count($this->sections) - 1];
 	}
 
 	/**

phpBB/phpbb/search/sphinx/config_section.php

@@ -87,7 +87,7 @@ class config_section
 	*/
 	function get_variable_by_name($name)
 	{
-		for ($i = 0, $size = sizeof($this->variables); $i < $size; $i++)
+		for ($i = 0, $size = count($this->variables); $i < $size; $i++)
 		{
 			// Make sure this is a variable object and not a comment
 			if (($this->variables[$i] instanceof \phpbb\search\sphinx\config_variable) && $this->variables[$i]->get_name() == $name)
@@ -106,7 +106,7 @@ class config_section
 	*/
 	function delete_variables_by_name($name)
 	{
-		for ($i = 0, $size = sizeof($this->variables); $i < $size; $i++)
+		for ($i = 0, $size = count($this->variables); $i < $size; $i++)
 		{
 			// Make sure this is a variable object and not a comment
 			if (($this->variables[$i] instanceof \phpbb\search\sphinx\config_variable) && $this->variables[$i]->get_name() == $name)
@@ -129,7 +129,7 @@ class config_section
 	function create_variable($name, $value)
 	{
 		$this->variables[] = new \phpbb\search\sphinx\config_variable($name, $value, '');
-		return $this->variables[sizeof($this->variables) - 1];
+		return $this->variables[count($this->variables) - 1];
 	}
 
 	/**