X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FDirSearch.php;h=596860823652bd09af7b18ad648b9e69582473b1;hb=d82ed5d1b4a3af4d0a4782b809837e3b22d1211d;hp=8682cb18ef3680cefd3a683b3eae54068c26f3d4;hpb=bbd5878734e658cbc514cacc20e231e843015d04;p=friendica.git

diff --git a/include/DirSearch.php b/include/DirSearch.php
index 8682cb18ef..5968608236 100644
--- a/include/DirSearch.php
+++ b/include/DirSearch.php
@@ -13,9 +13,9 @@ class DirSearch {
 
 	/**
 	 * @brief Search global contact table by nick or name
-	 *  * 
+	 *
 	 * @param string $search Name or nick
-	 * @param string $mode Search mode 
+	 * @param string $mode Search mode (e.g. "community")
 	 * @return array with search results
 	 */
 	public static function global_search_by_name($search, $mode = '') {
@@ -32,12 +32,14 @@ class DirSearch {
 			else
 				$ostatus = NETWORK_DFRN;
 
-			// check if fo
+			// check if we search only communities or every contact
 			if($mode === "community")
 				$extra_sql = " AND `community`";
 			else
 				$extra_sql = "";
 
+			$search .= "%";
+
 			$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
 							`gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`, `gcontact`.`community`
 						FROM `gcontact`
@@ -46,12 +48,13 @@ class DirSearch {
 							AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
 						WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
 						((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-						(`gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql
+						(`gcontact`.`addr` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`nick` LIKE '%s') $extra_sql
 							GROUP BY `gcontact`.`nurl`
-							ORDER BY `gcontact`.`updated` DESC ",
+							ORDER BY `gcontact`.`nurl` DESC
+							LIMIT 1000",
 						intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
 						dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-						dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+						dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)));
 
 			return $results;
 		}