Always coalesce, if it is not a multi-frame image it won't hurt anyway

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 754350ae56187f9fe0fbd0f7688a4567bed4e6d4..fb4595739b5e1f3047ddf67d1b4bb0b6075e2fb8 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -43,6 +43,26 @@ function contacts_init(&$a) {
        $a->page['aside'] .= findpeople_widget();
 
        $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;
+
+
 }
 
 function contacts_post(&$a) {
@@ -290,27 +310,32 @@ function contacts_content(&$a) {
                                'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
                                'sel'   => '',
+                               'title' => t('Toggle Blocked status'),
                        ),
                        array(
                                'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
                                'sel'   => '',
+                               'title' => t('Toggle Ignored status'),
                        ),
 
                        array(
                                'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
                                'sel'   => '',
+                               'title' => t('Toggle Archive status'),
                        ),
                        array(
                                'label' => t('Repair'),
                                'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
                                'sel'   => '',
+                               'title' => t('Advanced Contact Settings'),
                        )
                );
                $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'),
@@ -321,7 +346,7 @@ function contacts_content(&$a) {
                        '$lbl_info1' => t('Contact Information / Notes'),
                        '$infedit' => t('Edit contact notes'),
                        '$common_text' => $common_text,
-                       '$common_link' => $a->get_baseurl(true) . '/common/' . $contact['id'],
+                       '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
                        '$all_friends' => $all_friends,
                        '$relation_text' => $relation_text,
                        '$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
@@ -335,6 +360,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'),
@@ -403,40 +429,47 @@ function contacts_content(&$a) {
                        'label' => t('Suggestions'),
                        'url'   => $a->get_baseurl(true) . '/suggest', 
                        'sel'   => '',
+                       'title' => t('Suggest potential friends'),
                ),
                array(
                        'label' => t('All Contacts'),
                        'url'   => $a->get_baseurl(true) . '/contacts/all', 
                        'sel'   => ($all) ? 'active' : '',
+                       'title' => t('Show all contacts'),
                ),
                array(
                        'label' => t('Unblocked'),
                        'url'   => $a->get_baseurl(true) . '/contacts',
                        'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
+                       'title' => t('Only show unblocked contacts'),
                ),
 
                array(
                        'label' => t('Blocked'),
                        'url'   => $a->get_baseurl(true) . '/contacts/blocked',
                        'sel'   => ($blocked) ? 'active' : '',
+                       'title' => t('Only show blocked contacts'),
                ),
 
                array(
                        'label' => t('Ignored'),
                        'url'   => $a->get_baseurl(true) . '/contacts/ignored',
                        'sel'   => ($ignored) ? 'active' : '',
+                       'title' => t('Only show ignored contacts'),
                ),
 
                array(
                        'label' => t('Archived'),
                        'url'   => $a->get_baseurl(true) . '/contacts/archived',
                        'sel'   => ($archived) ? 'active' : '',
+                       'title' => t('Only show archived contacts'),
                ),
 
                array(
                        'label' => t('Hidden'),
                        'url'   => $a->get_baseurl(true) . '/contacts/hidden',
                        'sel'   => ($hidden) ? 'active' : '',
+                       'title' => t('Only show hidden contacts'),
                ),
 
        );
@@ -446,12 +479,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));
@@ -468,7 +502,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']),
@@ -535,7 +568,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,