Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #709 from Arantor/release-2.1

! As per #708 this should fix some of the cases where queries were being...
Arantor 11 years ago
parent
72bb77451f 193c166199
commit
516935a40a
4 changed files with 20 additions and 10 deletions
Split View Show Diff Stats
  1. 9 5
      Sources/PersonalMessage.php
  2. 2 1
      Sources/Subs-Auth.php
  3. 4 2
      Sources/Subs-Editor.php
  4. 5 2
      Sources/Subs-Members.php

+ 9 - 5
Sources/PersonalMessage.php
View File 

@@ -1172,7 +1172,9 @@ function MessageSearch2()
 
 			foreach ($possible_users as $k => $v)
 
 			{
 
 				$where_params['name_' . $k] = $v;
 
-				$where_clause[] = 'real_name LIKE {string:name_' . $k . '}';
 
+				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
 
+				if (!isset($where_params['real_name']))
 
+					$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
 
 			}
 
 
 			// Who matches those criteria?
 
@@ -1189,17 +1191,19 @@ function MessageSearch2()
 
 				$userQuery = '';
 
 			elseif ($smcFunc['db_num_rows']($request) == 0)
 
 			{
 
-				$userQuery = 'AND pm.id_member_from = 0 AND (pm.from_name LIKE {raw:guest_user_name_implode})';
 
-				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR pm.from_name LIKE \'', $possible_users) . '\'';
 
+				$userQuery = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
 
+				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 
+				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
 
 			}
 
 			else
 
 			{
 
 				$memberlist = array();
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 
 					$memberlist[] = $row['id_member'];
 
-				$userQuery = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND (pm.from_name LIKE {raw:guest_user_name_implode})))';
 
-				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR pm.from_name LIKE \'', $possible_users) . '\'';
 
+				$userQuery = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))';
 
+				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 
 				$searchq_parameters['member_list'] = $memberlist;
 
+				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
 
 			}
 
 			$smcFunc['db_free_result']($request);
 
 		}

+ 2 - 1
Sources/Subs-Auth.php
View File 

@@ -492,11 +492,12 @@ function RequestMembers()
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT real_name
 
 		FROM {db_prefix}members
 
-		WHERE real_name LIKE {string:search}' . (isset($_REQUEST['buddies']) ? '
 
+		WHERE {raw:real_name} LIKE {string:search}' . (isset($_REQUEST['buddies']) ? '
 
 			AND id_member IN ({array_int:buddy_list})' : '') . '
 
 			AND is_activated IN (1, 11)
 
 		LIMIT ' . ($smcFunc['strlen']($_REQUEST['search']) <= 2 ? '100' : '800'),
 
 		array(
 
+			'real_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name',
 
 			'buddy_list' => $user_info['buddies'],
 
 			'search' => $_REQUEST['search'],
 
 		)

+ 4 - 2
Sources/Subs-Editor.php
View File 

@@ -2248,11 +2248,12 @@ function AutoSuggest_Search_Member()
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT id_member, real_name
 
 		FROM {db_prefix}members
 
-		WHERE real_name LIKE {string:search}' . (!empty($context['search_param']['buddies']) ? '
 
+		WHERE {raw:real_name} LIKE {string:search}' . (!empty($context['search_param']['buddies']) ? '
 
 			AND id_member IN ({array_int:buddy_list})' : '') . '
 
 			AND is_activated IN (1, 11)
 
 		LIMIT ' . ($smcFunc['strlen']($_REQUEST['search']) <= 2 ? '100' : '800'),
 
 		array(
 
+			'real_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name',
 
 			'buddy_list' => $user_info['buddies'],
 
 			'search' => $_REQUEST['search'],
 
 		)
 
@@ -2296,12 +2297,13 @@ function AutoSuggest_Search_MemberGroups()
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT id_group, group_name
 
 		FROM {db_prefix}membergroups
 
-		WHERE group_name LIKE {string:search}
 
+		WHERE {raw:group_name} LIKE {string:search}
 
 			AND min_posts = {int:min_posts}
 
 			AND id_group NOT IN ({array_int:invalid_groups})
 
 			AND hidden != {int:hidden}
 
 		',
 
 		array(
 
+			'group_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(group_name}' : 'group_name',
 
 			'min_posts' => -1,
 
 			'invalid_groups' => array(1,3),
 
 			'hidden' => 2,

+ 5 - 2
Sources/Subs-Members.php
View File 

@@ -930,9 +930,11 @@ function isReservedName($name, $current_ID_MEMBER = 0, $is_name = true, $fatal =
 
 		SELECT id_member
 
 		FROM {db_prefix}members
 
 		WHERE ' . (empty($current_ID_MEMBER) ? '' : 'id_member != {int:current_member}
 
-			AND ') . '(real_name LIKE {string:check_name} OR member_name LIKE {string:check_name})
 
+			AND ') . '({raw:real_name} LIKE {string:check_name} OR {raw:member_name} LIKE {string:check_name})
 
 		LIMIT 1',
 
 		array(
 
+			'real_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name',
 
+			'member_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(member_name)' : 'member_name',
 
 			'current_member' => $current_ID_MEMBER,
 
 			'check_name' => $checkName,
 
 		)
 
@@ -947,9 +949,10 @@ function isReservedName($name, $current_ID_MEMBER = 0, $is_name = true, $fatal =
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT id_group
 
 		FROM {db_prefix}membergroups
 
-		WHERE group_name LIKE {string:check_name}
 
+		WHERE {raw:group_name} LIKE {string:check_name}
 
 		LIMIT 1',
 
 		array(
 
+			'group_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(group_name)' : 'group_name',
 
 			'check_name' => $checkName,
 
 		)
 
 	);