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

PHPBB3-14972
author: rxu <rxu@mail.ru> 2017-06-28 00:58:03 +0700
committer: Marc Alexander <admin@m-a-styles.de> 2018-01-01 13:56:04 +0100
commit: f8fbe3793680af1dae2db2829cfc84068831c52f (patch)
tree: 54c7108b28fb58688a8695a0b592c163314a09f9 /phpBB/includes/ucp
parent: ff18802656e72981f6ecb613d756bc19f2462689 (diff)
download: forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar
forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar.gz
forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar.bz2
forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar.xz
forums-f8fbe3793680af1dae2db2829cfc84068831c52f.zip
13 files changed, 86 insertions, 86 deletions
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 66c3109b3d..c1b623cd71 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -38,7 +38,7 @@ class ucp_attachments
 		$delete		= (isset($_POST['delete'])) ? true : false;
 		$delete_ids	= array_keys($request->variable('attachment', array(0)));
 
-		if ($delete && sizeof($delete_ids))
+		if ($delete && count($delete_ids))
 		{
 			// Validate $delete_ids...
 			$sql = 'SELECT attach_id
@@ -56,7 +56,7 @@ class ucp_attachments
 			$db->sql_freeresult($result);
 		}
 
-		if ($delete && sizeof($delete_ids))
+		if ($delete && count($delete_ids))
 		{
 			$s_hidden_fields = array(
 				'delete'	=> 1
@@ -75,12 +75,12 @@ class ucp_attachments
 				unset($attachment_manager);
 
 				meta_refresh(3, $this->u_action);
-				$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+				$message = ((count($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 				trigger_error($message);
 			}
 			else
 			{
-				confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', build_hidden_fields($s_hidden_fields));
+				confirm_box(false, (count($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', build_hidden_fields($s_hidden_fields));
 			}
 		}
 
diff --git a/phpBB/includes/ucp/ucp_auth_link.php b/phpBB/includes/ucp/ucp_auth_link.php
index 08aacdef3a..e069f15eb2 100644
--- a/phpBB/includes/ucp/ucp_auth_link.php
+++ b/phpBB/includes/ucp/ucp_auth_link.php
@@ -55,14 +55,14 @@ class ucp_auth_link
 		$submit	= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
 
 		// This path is only for primary actions
-		if (!sizeof($error) && $submit)
+		if (!count($error) && $submit)
 		{
 			if (!check_form_key('ucp_auth_link'))
 			{
 				$error[] = 'FORM_INVALID';
 			}
 
-			if (!sizeof($error))
+			if (!count($error))
 			{
 				// Any post data could be necessary for auth (un)linking
 				$link_data = $request->get_super_global(\phpbb\request\request_interface::POST);
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 352b7d1ec3..1fb026167a 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -71,7 +71,7 @@ class ucp_groups
 					}
 					$db->sql_freeresult($result);
 
-					if (!sizeof($group_row))
+					if (!count($group_row))
 					{
 						trigger_error('GROUP_NOT_EXIST');
 					}
@@ -330,7 +330,7 @@ class ucp_groups
 
 				$sql = 'SELECT group_id, group_name, group_colour, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type, group_founder_manage
 					FROM ' . GROUPS_TABLE . '
-					WHERE ' . ((sizeof($group_id_ary)) ? $db->sql_in_set('group_id', $group_id_ary, true) . ' AND ' : '') . "
+					WHERE ' . ((count($group_id_ary)) ? $db->sql_in_set('group_id', $group_id_ary, true) . ' AND ' : '') . "
 						group_type $sql_and
 					ORDER BY group_type DESC, group_name";
 				$result = $db->sql_query($sql);
@@ -562,7 +562,7 @@ class ucp_groups
 								$error = array_merge($error, $colour_error);
 							}
 
-							if (!sizeof($error))
+							if (!count($error))
 							{
 								// Only set the rank, colour, etc. if it's changed or if we're adding a new
 								// group. This prevents existing group members being updated if no changes
@@ -605,7 +605,7 @@ class ucp_groups
 								}
 							}
 
-							if (sizeof($error))
+							if (count($error))
 							{
 								$error = array_map(array(&$user, 'lang'), $error);
 								$group_rank = $submit_ary['rank'];
@@ -703,12 +703,12 @@ class ucp_groups
 							'S_EDIT'			=> true,
 							'S_INCLUDE_SWATCH'	=> true,
 							'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
-							'S_ERROR'			=> (sizeof($error)) ? true : false,
+							'S_ERROR'			=> (count($error)) ? true : false,
 							'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
 							'S_AVATARS_ENABLED'	=> ($config['allow_avatar'] && $avatars_enabled),
 							'S_GROUP_MANAGE'	=> true,
 
-							'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+							'ERROR_MSG'				=> (count($error)) ? implode('<br />', $error) : '',
 							'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
 							'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
 							'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
@@ -911,7 +911,7 @@ class ucp_groups
 
 						if (confirm_box(true))
 						{
-							if (!sizeof($mark_ary))
+							if (!count($mark_ary))
 							{
 								$start = 0;
 
@@ -934,7 +934,7 @@ class ucp_groups
 
 										group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
 
-										$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
+										$start = (count($mark_ary) < 200) ? 0 : $start + 200;
 									}
 									else
 									{
@@ -1073,7 +1073,7 @@ class ucp_groups
 								'action'	=> $action
 							);
 
-							confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', sizeof($name_ary), implode($user->lang['COMMA_SEPARATOR'], $name_ary)), build_hidden_fields($s_hidden_fields));
+							confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', count($name_ary), implode($user->lang['COMMA_SEPARATOR'], $name_ary)), build_hidden_fields($s_hidden_fields));
 						}
 
 						trigger_error($user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 77ac1dfb54..71a615e75c 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -230,10 +230,10 @@ class ucp_main
 						$forums = array_keys($request->variable('f', array(0 => 0)));
 						$topics = array_keys($request->variable('t', array(0 => 0)));
 
-						if (sizeof($forums) || sizeof($topics))
+						if (count($forums) || count($topics))
 						{
 							$l_unwatch = '';
-							if (sizeof($forums))
+							if (count($forums))
 							{
 								$sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . '
 									WHERE ' . $db->sql_in_set('forum_id', $forums) . '
@@ -243,7 +243,7 @@ class ucp_main
 								$l_unwatch .= '_FORUMS';
 							}
 
-							if (sizeof($topics))
+							if (count($topics))
 							{
 								$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . '
 									WHERE ' . $db->sql_in_set('topic_id', $topics) . '
@@ -453,7 +453,7 @@ class ucp_main
 					$topics = (isset($_POST['t'])) ? array_keys($request->variable('t', array(0 => 0))) : array();
 					$url = $this->u_action;
 
-					if (!sizeof($topics))
+					if (!count($topics))
 					{
 						trigger_error('NO_BOOKMARKS_SELECTED');
 					}
@@ -508,7 +508,7 @@ class ucp_main
 					{
 						$drafts = array_keys($request->variable('d', array(0 => 0)));
 
-						if (sizeof($drafts))
+						if (count($drafts))
 						{
 							$sql = 'DELETE FROM ' . DRAFTS_TABLE . '
 								WHERE ' . $db->sql_in_set('draft_id', $drafts) . '
@@ -594,7 +594,7 @@ class ucp_main
 				}
 				$db->sql_freeresult($result);
 
-				if (sizeof($topic_ids))
+				if (count($topic_ids))
 				{
 					$sql = 'SELECT topic_id, forum_id, topic_title
 						FROM ' . TOPICS_TABLE . '
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 029588bb23..a6d925f95e 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -205,7 +205,7 @@ class ucp_notifications
 		}
 
 		$template->assign_vars(array(
-			strtoupper($block) . '_COLS' => sizeof($notification_methods) + 1,
+			strtoupper($block) . '_COLS' => count($notification_methods) + 1,
 		));
 	}
 
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 86cdb090c8..bf18e76568 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -406,7 +406,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 			$quote_username = (isset($post['quote_username'])) ? $post['quote_username'] : '';
 			$icon_id = (isset($post['icon_id'])) ? $post['icon_id'] : 0;
 
-			if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !sizeof($address_list) && !$refresh && !$submit && !$preview)
+			if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !count($address_list) && !$refresh && !$submit && !$preview)
 			{
 				// Add the original author as the recipient if quoting a post or only replying and not having checked "reply to all"
 				if ($action == 'quotepost' || !$reply_to_all)
@@ -428,7 +428,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 					}
 				}
 			}
-			else if ($action == 'edit' && !sizeof($address_list) && !$refresh && !$submit && !$preview)
+			else if ($action == 'edit' && !count($address_list) && !$refresh && !$submit && !$preview)
 			{
 				// Rebuild TO and BCC Header
 				$address_list = rebuild_header(array('to' => $post['to_address'], 'bcc' => $post['bcc_address']));
@@ -561,7 +561,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 			unset($list[$user->data['user_id']]);
 		}
 
-		$max_recipients = ($max_recipients < sizeof($list)) ? sizeof($list) : $max_recipients;
+		$max_recipients = ($max_recipients < count($list)) ? count($list) : $max_recipients;
 
 		unset($list);
 	}
@@ -584,7 +584,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	}
 
 	// Check for too many recipients
-	if (!empty($address_list['u']) && $max_recipients && sizeof($address_list['u']) > $max_recipients)
+	if (!empty($address_list['u']) && $max_recipients && count($address_list['u']) > $max_recipients)
 	{
 		$address_list = get_recipients($address_list, $max_recipients);
 		$error[] = $user->lang('TOO_MANY_RECIPIENTS', $max_recipients);
@@ -788,7 +788,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		// Parse Attachments - before checksum is calculated
 		$message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
 
-		if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
+		if (count($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
 		{
 			$error[] = implode('<br />', $message_parser->warn_msg);
 			$message_parser->warn_msg = array();
@@ -798,7 +798,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		$message_parser->parse($enable_bbcode, ($config['allow_post_links']) ? $enable_urls : false, $enable_smilies, $img_status, $flash_status, true, $config['allow_post_links']);
 
 		// On a refresh we do not care about message parsing errors
-		if (sizeof($message_parser->warn_msg) && !$refresh)
+		if (count($message_parser->warn_msg) && !$refresh)
 		{
 			$error[] = implode('<br />', $message_parser->warn_msg);
 		}
@@ -825,14 +825,14 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 				$error[] = $user->lang['EMPTY_MESSAGE_SUBJECT'];
 			}
 
-			if (!sizeof($address_list))
+			if (!count($address_list))
 			{
 				$error[] = $user->lang['NO_RECIPIENT'];
 			}
 		}
 
 		// Store message, sync counters
-		if (!sizeof($error) && $submit)
+		if (!count($error) && $submit)
 		{
 			$pm_data = array(
 				'msg_id'				=> (int) $msg_id,
@@ -889,7 +889,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	}
 
 	// Preview
-	if (!sizeof($error) && $preview)
+	if (!count($error) && $preview)
 	{
 		$preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
 
@@ -909,7 +909,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		}
 
 		// Attachment Preview
-		if (sizeof($message_parser->attachment_data))
+		if (count($message_parser->attachment_data))
 		{
 			$template->assign_var('S_HAS_ATTACHMENTS', true);
 
@@ -929,7 +929,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 
 		$preview_subject = censor_text($subject);
 
-		if (!sizeof($error))
+		if (!count($error))
 		{
 			$template->assign_vars(array(
 				'PREVIEW_SUBJECT'		=> $preview_subject,
@@ -943,7 +943,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	}
 
 	// Decode text for message display
-	$bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && (!sizeof($error) || (sizeof($error) && !$submit))) ? $bbcode_uid : $message_parser->bbcode_uid;
+	$bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && (!count($error) || (count($error) && !$submit))) ? $bbcode_uid : $message_parser->bbcode_uid;
 
 	$message_parser->decode_message($bbcode_uid);
 
@@ -1035,7 +1035,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 
 	// Build address list for display
 	// array('u' => array($author_id => 'to'));
-	if (sizeof($address_list))
+	if (count($address_list))
 	{
 		// Get Usernames and Group Names
 		$result = array();
@@ -1198,7 +1198,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		'URL_STATUS'			=> ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
 		'MAX_FONT_SIZE'			=> (int) $config['max_post_font_size'],
 		'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['PM']),
-		'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
+		'ERROR'					=> (count($error)) ? implode('<br />', $error) : '',
 		'MAX_RECIPIENTS'		=> ($config['allow_mass_pm'] && ($auth->acl_get('u_masspm') || $auth->acl_get('u_masspm_group'))) ? $max_recipients : 0,
 
 		'S_COMPOSE_PM'			=> true,
@@ -1300,7 +1300,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 	}
 
 	// If add to or add bcc not pressed, users could still have usernames listed they want to add...
-	if (!$add_to && !$add_bcc && (sizeof($group_list) || sizeof($usernames)))
+	if (!$add_to && !$add_bcc && (count($group_list) || count($usernames)))
 	{
 		$add_to = true;
 
@@ -1321,7 +1321,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 	{
 		$type = ($add_to) ? 'to' : 'bcc';
 
-		if (sizeof($group_list))
+		if (count($group_list))
 		{
 			foreach ($group_list as $group_id)
 			{
@@ -1333,13 +1333,13 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 		$user_id_ary = array();
 
 		// Reveal the correct user_ids
-		if (sizeof($usernames))
+		if (count($usernames))
 		{
 			$user_id_ary = array();
 			user_get_id_name($user_id_ary, $usernames, array(USER_NORMAL, USER_FOUNDER, USER_INACTIVE));
 
 			// If there are users not existing, we will at least print a notice...
-			if (!sizeof($user_id_ary))
+			if (!count($user_id_ary))
 			{
 				$error[] = $user->lang['PM_NO_USERS'];
 			}
@@ -1408,7 +1408,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 			$error[] = $user->lang['PM_USERS_REMOVED_NO_PERMISSION'];
 		}
 
-		if (!sizeof(array_keys($address_list['u'])))
+		if (!count(array_keys($address_list['u'])))
 		{
 			return;
 		}
@@ -1466,7 +1466,7 @@ function num_recipients($address_list)
 
 	foreach ($address_list as $field => $adr_ary)
 	{
-		$num_recipients += sizeof($adr_ary);
+		$num_recipients += count($adr_ary);
 	}
 
 	return $num_recipients;
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 2458c4118d..3861962516 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -521,7 +521,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	$action_option	= $request->variable('action_option', '');
 	$back = (isset($_REQUEST['back'])) ? $request->variable('back', array('' => 0)) : array();
 
-	if (sizeof($back))
+	if (count($back))
 	{
 		if ($action_option)
 		{
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index b5bb406d7d..2acc528b9f 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -114,7 +114,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 		);
 
 		// Okay, lets dump out the page ...
-		if (sizeof($folder_info['pm_list']))
+		if (count($folder_info['pm_list']))
 		{
 			$address_list = array();
 
@@ -236,7 +236,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 				$_types = array('u', 'g');
 				foreach ($_types as $ug_type)
 				{
-					if (isset($address_temp[$message_id][$ug_type]) && sizeof($address_temp[$message_id][$ug_type]))
+					if (isset($address_temp[$message_id][$ug_type]) && count($address_temp[$message_id][$ug_type]))
 					{
 						if (!isset($address[$message_id][$ug_type]))
 						{
@@ -269,8 +269,8 @@ function view_folder($id, $mode, $folder_id, $folder)
 
 				// There is the chance that all recipients of the message got deleted. To avoid creating
 				// exports without recipients, we add a bogus "undisclosed recipient".
-				if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) &&
-					!(isset($address[$message_id]['u']) && sizeof($address[$message_id]['u'])))
+				if (!(isset($address[$message_id]['g']) && count($address[$message_id]['g'])) &&
+					!(isset($address[$message_id]['u']) && count($address[$message_id]['u'])))
 				{
 					$address[$message_id]['u'] = array();
 					$address[$message_id]['u']['to'] = array();
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index cf767a7cce..5d7e32c8f3 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -113,7 +113,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 			$db->sql_freeresult($result);
 
 			// No attachments exist, but message table thinks they do so go ahead and reset attach flags
-			if (!sizeof($attachments))
+			if (!count($attachments))
 			{
 				$sql = 'UPDATE ' . PRIVMSGS_TABLE . "
 					SET message_attachment = 0
@@ -134,7 +134,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		parse_attachments(false, $message, $attachments, $update_count);
 
 		// Update the attachment download counts
-		if (sizeof($update_count))
+		if (count($update_count))
 		{
 			$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
 				SET download_count = download_count + 1
@@ -240,7 +240,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 
 		'U_PM_ACTION'		=> $url . '&amp;mode=compose&amp;f=' . $folder_id . '&amp;p=' . $message_row['msg_id'],
 
-		'S_HAS_ATTACHMENTS'	=> (sizeof($attachments)) ? true : false,
+		'S_HAS_ATTACHMENTS'	=> (count($attachments)) ? true : false,
 		'S_DISPLAY_NOTICE'	=> $display_notice && $message_row['message_attachment'],
 		'S_AUTHOR_DELETED'	=> ($author_id == ANONYMOUS) ? true : false,
 		'S_SPECIAL_FOLDER'	=> in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
@@ -360,7 +360,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	}
 
 	// Display not already displayed Attachments for this post, we already parsed them. ;)
-	if (isset($attachments) && sizeof($attachments))
+	if (isset($attachments) && count($attachments))
 	{
 		foreach ($attachments as $attachment)
 		{
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index c2aa910ed0..7785aeb07b 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -96,7 +96,7 @@ class ucp_prefs
 						$error[] = 'FORM_INVALID';
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$sql_ary = array(
 							'user_allow_pm'			=> $data['allowpm'],
@@ -188,7 +188,7 @@ class ucp_prefs
 				$db->sql_freeresult($result);
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 
 					'S_NOTIFY_EMAIL'	=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
 					'S_NOTIFY_IM'		=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
@@ -277,7 +277,7 @@ class ucp_prefs
 						$error[] = 'FORM_INVALID';
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$user->optionset('viewimg', $data['images']);
 						$user->optionset('viewflash', $data['flash']);
@@ -412,7 +412,7 @@ class ucp_prefs
 				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_view_after', compact($vars)));
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 
 					'S_IMAGES'			=> $data['images'],
 					'S_FLASH'			=> $data['flash'],
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index b7f8501fe4..beb440ce76 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -98,7 +98,7 @@ class ucp_profile
 					$passwords_manager = $phpbb_container->get('passwords.manager');
 
 					// Only check the new password against the previous password if there have been no errors
-					if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && $passwords_manager->check($data['new_password'], $user->data['user_password']))
+					if (!count($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && $passwords_manager->check($data['new_password'], $user->data['user_password']))
 					{
 						$error[] = 'SAME_PASSWORD_ERROR';
 					}
@@ -125,7 +125,7 @@ class ucp_profile
 					$vars = array('data', 'submit', 'error');
 					extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_validate', compact($vars)));
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$sql_ary = array(
 							'username'			=> ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? $data['username'] : $user->data['username'],
@@ -220,7 +220,7 @@ class ucp_profile
 						$vars = array('data', 'sql_ary');
 						extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_sql_ary', compact($vars)));
 
-						if (sizeof($sql_ary))
+						if (count($sql_ary))
 						{
 							$sql = 'UPDATE ' . USERS_TABLE . '
 								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
@@ -257,7 +257,7 @@ class ucp_profile
 				}
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 
 					'USERNAME'			=> $data['username'],
 					'EMAIL'				=> $data['email'],
@@ -343,7 +343,7 @@ class ucp_profile
 					// validate custom profile fields
 					$cp->submit_cp_field('profile', $user->get_iso_lang_id(), $cp_data, $cp_error);
 
-					if (sizeof($cp_error))
+					if (count($cp_error))
 					{
 						$error = array_merge($error, $cp_error);
 					}
@@ -365,7 +365,7 @@ class ucp_profile
 					$vars = array('data', 'submit', 'error');
 					extract($phpbb_dispatcher->trigger_event('core.ucp_profile_validate_profile_info', compact($vars)));
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$data['notify'] = $user->data['user_notify_type'];
 
@@ -449,7 +449,7 @@ class ucp_profile
 				}
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 					'S_JABBER_ENABLED'	=> $config['jab_enable'],
 					'JABBER'			=> $data['jabber'],
 				));
@@ -537,7 +537,7 @@ class ucp_profile
 					'sig'
 				);
 
-				if (sizeof($warn_msg))
+				if (count($warn_msg))
 				{
 					$error += $warn_msg;
 				}
@@ -549,7 +549,7 @@ class ucp_profile
 				}
 				else
 				{
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$user->optionset('sig_bbcode', $enable_bbcode);
 						$user->optionset('sig_smilies', $enable_smilies);
@@ -594,7 +594,7 @@ class ucp_profile
 				$controller_helper = $phpbb_container->get('controller.helper');
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 					'SIGNATURE'			=> $decoded_message['text'],
 					'SIGNATURE_PREVIEW'	=> $signature_preview,
 
@@ -753,7 +753,7 @@ class ucp_profile
 				$avatar = phpbb_get_user_avatar($user->data, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
-					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'			=> (count($error)) ? implode('<br />', $error) : '',
 					'AVATAR'		=> $avatar,
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
@@ -778,7 +778,7 @@ class ucp_profile
 						$error[] = 'FORM_INVALID';
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						if (!empty($keys))
 						{
@@ -825,7 +825,7 @@ class ucp_profile
 		}
 
 		$template->assign_vars(array(
-			'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'ERROR'		=> (count($error)) ? implode('<br />', $error) : '',
 
 			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
 
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index a7a93d6115..3c5f4e2826 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -167,7 +167,7 @@ class ucp_register
 				unset($now);
 
 				$template_vars = array(
-					'S_LANG_OPTIONS'	=> (sizeof($lang_row) > 1) ? language_select($user_lang) : '',
+					'S_LANG_OPTIONS'	=> (count($lang_row) > 1) ? language_select($user_lang) : '',
 					'L_COPPA_NO'		=> sprintf($user->lang['UCP_COPPA_BEFORE'], $coppa_birthday),
 					'L_COPPA_YES'		=> sprintf($user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday),
 
@@ -185,7 +185,7 @@ class ucp_register
 			else
 			{
 				$template_vars = array(
-					'S_LANG_OPTIONS'	=> (sizeof($lang_row) > 1) ? language_select($user_lang) : '',
+					'S_LANG_OPTIONS'	=> (count($lang_row) > 1) ? language_select($user_lang) : '',
 					'L_TERMS_OF_USE'	=> sprintf($user->lang['TERMS_OF_USE_CONTENT'], $config['sitename'], generate_board_url()),
 
 					'S_SHOW_COPPA'		=> false,
@@ -319,7 +319,7 @@ class ucp_register
 			// validate custom profile fields
 			$cp->submit_cp_field('register', $user->get_iso_lang_id(), $cp_data, $error);
 
-			if (!sizeof($error))
+			if (!count($error))
 			{
 				if ($data['new_password'] != $data['password_confirm'])
 				{
@@ -340,7 +340,7 @@ class ucp_register
 			$vars = array('submit', 'data', 'cp_data', 'error');
 			extract($phpbb_dispatcher->trigger_event('core.ucp_register_data_after', compact($vars)));
 
-			if (!sizeof($error))
+			if (!count($error))
 			{
 				$server_url = generate_board_url();
 
@@ -596,7 +596,7 @@ class ucp_register
 		extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars)));
 
 		$template_vars = array_merge($template_vars, array(
-			'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 			'S_HIDDEN_FIELDS'	=> build_hidden_fields($s_hidden_fields),
 		));
 
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index fa6a03f87c..b4c561fc76 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -47,7 +47,7 @@ class ucp_zebra
 				$data[$var] = $request->variable($var, $default, true);
 			}
 
-			if (!empty($data['add']) || sizeof($data['usernames']))
+			if (!empty($data['add']) || count($data['usernames']))
 			{
 				if (confirm_box(true))
 				{
@@ -105,35 +105,35 @@ class ucp_zebra
 						$db->sql_freeresult($result);
 
 						// remove friends from the username array
-						$n = sizeof($data['add']);
+						$n = count($data['add']);
 						$data['add'] = array_diff($data['add'], $friends);
 
-						if (sizeof($data['add']) < $n && $mode == 'foes')
+						if (count($data['add']) < $n && $mode == 'foes')
 						{
 							$error[] = $user->lang['NOT_ADDED_FOES_FRIENDS'];
 						}
 
 						// remove foes from the username array
-						$n = sizeof($data['add']);
+						$n = count($data['add']);
 						$data['add'] = array_diff($data['add'], $foes);
 
-						if (sizeof($data['add']) < $n && $mode == 'friends')
+						if (count($data['add']) < $n && $mode == 'friends')
 						{
 							$error[] = $user->lang['NOT_ADDED_FRIENDS_FOES'];
 						}
 
 						// remove the user himself from the username array
-						$n = sizeof($data['add']);
+						$n = count($data['add']);
 						$data['add'] = array_diff($data['add'], array(utf8_clean_string($user->data['username'])));
 
-						if (sizeof($data['add']) < $n)
+						if (count($data['add']) < $n)
 						{
 							$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_SELF'];
 						}
 
 						unset($friends, $foes, $n);
 
-						if (sizeof($data['add']))
+						if (count($data['add']))
 						{
 							$sql = 'SELECT user_id, user_type
 								FROM ' . USERS_TABLE . '
@@ -159,7 +159,7 @@ class ucp_zebra
 							}
 							$db->sql_freeresult($result);
 
-							if (sizeof($user_id_ary))
+							if (count($user_id_ary))
 							{
 								// Remove users from foe list if they are admins or moderators
 								if ($mode == 'foes')
@@ -175,7 +175,7 @@ class ucp_zebra
 
 									$perms = array_unique($perms);
 
-									if (sizeof($perms))
+									if (count($perms))
 									{
 										$error[] = $user->lang['NOT_ADDED_FOES_MOD_ADMIN'];
 									}
@@ -185,7 +185,7 @@ class ucp_zebra
 									unset($perms);
 								}
 
-								if (sizeof($user_id_ary))
+								if (count($user_id_ary))
 								{
 									$sql_mode = ($mode == 'friends') ? 'friend' : 'foe';
 
@@ -218,7 +218,7 @@ class ucp_zebra
 								}
 								unset($user_id_ary);
 							}
-							else if (!sizeof($error))
+							else if (!count($error))
 							{
 								$error[] = $user->lang['USER_NOT_FOUND_OR_INACTIVE'];
 							}
@@ -244,7 +244,7 @@ class ucp_zebra
 					else if ($updated)
 					{
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((count($error)) ? '<br />' : '') . '<br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 					else
author	rxu <rxu@mail.ru>	2017-06-28 00:58:03 +0700
committer	Marc Alexander <admin@m-a-styles.de>	2018-01-01 13:56:04 +0100
commit	f8fbe3793680af1dae2db2829cfc84068831c52f (patch)
tree	54c7108b28fb58688a8695a0b592c163314a09f9 /phpBB/includes/ucp
parent	ff18802656e72981f6ecb613d756bc19f2462689 (diff)
download	forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar.gz forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar.bz2 forums-f8fbe3793680af1dae2db2829cfc84068831c52f.tar.xz forums-f8fbe3793680af1dae2db2829cfc84068831c52f.zip