Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 769239fe0cd81c62c5fd41cb1841978044fa1fbe..bdf49898936658ca6752b92080737f6dd1e103c9 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -43,6 +43,20 @@ function contacts_init(&$a) {
        $a->page['aside'] .= findpeople_widget();
 
        $a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
+       $base = $a->get_baseurl();
+
+       $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
+       ));
+
+
 }
 
 function contacts_post(&$a) {
@@ -227,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');
 
@@ -315,6 +333,7 @@ function contacts_content(&$a) {
                $tab_tpl = get_markup_template('common_tabs.tpl');
                $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
 
+               $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Contact Editor'),
@@ -339,6 +358,7 @@ function contacts_content(&$a) {
                        '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
                        '$poll_enabled' => $poll_enabled,
                        '$lastupdtext' => t('Last update:'),
+                       '$lost_contact' => $lost_contact,
                        '$updpub' => t('Update public posts'),
                        '$last_update' => $last_update,
                        '$udnow' => t('Update now'),
@@ -457,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));
@@ -479,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']),
@@ -546,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,