update main frost version

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 423fd40a23b1cd20dde0aa78e628ab8499770a99..bdf49898936658ca6752b92080737f6dd1e103c9 100644 (file)
--- 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');
 
@@ -482,10 +480,10 @@ function contacts_content(&$a) {
        $searching = false;
        if($search) {
                $search_hdr = $search;
-               $search = dbesc(protect_sprintf('%' . $search . '%'));
+               $search_txt = dbesc(protect_sprintf(preg_quote($search)));
                $searching = true;
        }
-       $sql_extra .= (($searching) ? " AND `name` REGEXP '$search' " : "");
+       $sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
 
        if($nets)
                $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
@@ -502,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']),
@@ -569,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,