X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=bdf49898936658ca6752b92080737f6dd1e103c9;hb=1f8182a4533c097cfc06f877f3392be2e41d82b4;hp=f84a988c8df8524952b0cfb0f933bfbb06612bc5;hpb=be090cc8513504edcfaf368915e45308711f7e7c;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index f84a988c8d..bdf4989893 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -45,22 +45,16 @@ function contacts_init(&$a) {
 	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
-	$a->page['htmlhead'] .= <<< EOT
-
-<script>$(document).ready(function() { 
-	var a; 
-	a = $("#contacts-search").autocomplete({ 
-		serviceUrl: '$base/acl',
-		minChars: 2,
-		width: 350,
-	});
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-EOT;
+	$tpl = get_markup_template("contacts-head.tpl");
+	$a->page['htmlhead'] .= replace_macros($tpl,array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$base' => $base
+	));
+	$tpl = get_markup_template("contacts-end.tpl");
+	$a->page['end'] .= replace_macros($tpl,array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$base' => $base
+	));
 
 
 }
@@ -247,6 +241,10 @@ function contacts_content(&$a) {
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => $editselect,
 		));
+		$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
 
 		require_once('include/contact_selectors.php');
 
@@ -479,12 +477,13 @@ function contacts_content(&$a) {
 
 
 
-
+	$searching = false;
 	if($search) {
 		$search_hdr = $search;
-		$search = dbesc($search.'*');
+		$search_txt = dbesc(protect_sprintf(preg_quote($search)));
+		$searching = true;
 	}
-	$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
+	$sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
 
 	if($nets)
 		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
@@ -501,7 +500,6 @@ function contacts_content(&$a) {
 	}
 
 
-
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
@@ -568,7 +566,7 @@ function contacts_content(&$a) {
 		'$total' => $total,
 		'$search' => $search_hdr,
 		'$desc' => t('Search your contacts'),
-		'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
+		'$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
 		'$submit' => t('Find'),
 		'$cmd' => $a->cmd,
 		'$contacts' => $contacts,