]> git.mxchange.org Git - friendica.git/blobdiff - mod/contacts.php
Merge pull request #2110 from annando/1511-subscribe-feed
[friendica.git] / mod / contacts.php
index 8a36fa4cb6ced11b63946b00bd81a4f5e0193eaf..1dc886363ae1ddf699f4aa41a19a6a4d6c799e9f 100644 (file)
@@ -2,6 +2,10 @@
 
 require_once('include/Contact.php');
 require_once('include/socgraph.php');
+require_once('include/contact_selectors.php');
+require_once('include/Scrape.php');
+require_once('mod/proxy.php');
+require_once('include/Photo.php');
 
 function contacts_init(&$a) {
        if(! local_user())
@@ -23,30 +27,41 @@ function contacts_init(&$a) {
        require_once('include/group.php');
        require_once('include/contact_widgets.php');
 
+       if ($_GET['nets'] == "all")
+       $_GET['nets'] = "";
+
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
 
        if($contact_id) {
                        $a->data['contact'] = $r[0];
                        $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
-                               '$name' => $a->data['contact']['name'],
-                               '$photo' => $a->data['contact']['photo']
+                               '$name' => htmlentities($a->data['contact']['name']),
+                               '$photo' => $a->data['contact']['photo'],
+                               '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
                        ));
+                       $finpeople_widget = '';
                        $follow_widget = '';
-       }       
+                       $networks_widget = '';
+       }
        else {
                $vcard_widget = '';
-               $follow_widget = follow_widget();
+               $networks_widget .= networks_widget('contacts',$_GET['nets']);
+               if (isset($_GET['add']))
+                       $follow_widget = follow_widget($_GET['add']);
+               else
+                       $follow_widget = follow_widget();
+
+               $findpeople_widget .= findpeople_widget();
        }
 
-       $groups_widget .= group_side('contacts','group',false,0,$contact_id);
-       $findpeople_widget .= findpeople_widget();
-       $networks_widget .= networks_widget('contacts',$_GET['nets']);
+       $groups_widget .= group_side('contacts','group','full',0,$contact_id);
+       
        $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
                '$vcard_widget' => $vcard_widget,
+               '$findpeople_widget' => $findpeople_widget,
                '$follow_widget' => $follow_widget,
                '$groups_widget' => $groups_widget,
-               '$findpeople_widget' => $findpeople_widget,
                '$networks_widget' => $networks_widget
        ));
 
@@ -66,11 +81,61 @@ function contacts_init(&$a) {
 
 }
 
+function contacts_batch_actions(&$a){
+       $contacts_id = $_POST['contact_batch'];
+       if (!is_array($contacts_id)) return;
+
+       $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
+               implode(",", $contacts_id),
+               intval(local_user())
+       );
+
+       $count_actions=0;
+       foreach($orig_records as $orig_record) {
+               $contact_id = $orig_record['id'];
+               if (x($_POST, 'contacts_batch_update')) {
+                       _contact_update($contact_id);
+                       $count_actions++;
+               }
+               if (x($_POST, 'contacts_batch_block')) {
+                       $r  = _contact_block($contact_id, $orig_record);
+                       if ($r) $count_actions++;
+               }
+               if (x($_POST, 'contacts_batch_ignore')) {
+                       $r = _contact_ignore($contact_id, $orig_record);
+                       if ($r) $count_actions++;
+               }
+               if (x($_POST, 'contacts_batch_archive')) {
+                       $r = _contact_archive($contact_id, $orig_record);
+                       if ($r) $count_actions++;
+               }
+               if (x($_POST, 'contacts_batch_drop')) {
+                       _contact_drop($contact_id, $orig_record);
+                       $count_actions++;
+               }
+       }
+       if ($count_actions>0) {
+               info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
+       }
+
+       if(x($_SESSION,'return_url'))
+               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+       else
+               goaway($a->get_baseurl(true) . '/contacts');
+
+}
+
+
 function contacts_post(&$a) {
-       
+
        if(! local_user())
                return;
 
+       if ($a->argv[1]==="batch") {
+               contacts_batch_actions($a);
+               return;
+       }
+
        $contact_id = intval($a->argv[1]);
        if(! $contact_id)
                return;
@@ -102,6 +167,12 @@ function contacts_post(&$a) {
 
        $hidden = intval($_POST['hidden']);
 
+       $notify = intval($_POST['notify']);
+
+       $fetch_further_information = intval($_POST['fetch_further_information']);
+
+       $ffi_keyword_blacklist = fix_mce_lf(escape_tags(trim($_POST['ffi_keyword_blacklist'])));
+
        $priority = intval($_POST['poll']);
        if($priority > 5 || $priority < 0)
                $priority = 0;
@@ -109,11 +180,15 @@ function contacts_post(&$a) {
        $info = fix_mce_lf(escape_tags(trim($_POST['info'])));
 
        $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
-               `hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+               `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d,
+               `ffi_keyword_blacklist` = '%s' WHERE `id` = %d AND `uid` = %d",
                intval($profile_id),
                intval($priority),
                dbesc($info),
                intval($hidden),
+               intval($notify),
+               intval($fetch_further_information),
+               dbesc($ffi_keyword_blacklist),
                intval($contact_id),
                intval(local_user())
        );
@@ -133,6 +208,139 @@ function contacts_post(&$a) {
 
 }
 
+/*contact actions*/
+function _contact_update($contact_id) {
+       $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
+       if (!$r)
+               return;
+
+       $uid = $r[0]["uid"];
+
+       if ($uid != local_user())
+               return;
+
+       if ($r[0]["network"] == NETWORK_OSTATUS) {
+               $result = new_contact($uid, $r[0]["url"], false);
+
+               if ($result['success'])
+                       $r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d",
+                               intval($contact_id));
+       } else
+               // pull feed and consume it, which should subscribe to the hub.
+               proc_run('php',"include/onepoll.php","$contact_id", "force");
+}
+
+function _contact_update_profile($contact_id) {
+       $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
+       if (!$r)
+               return;
+
+       $uid = $r[0]["uid"];
+
+       if ($uid != local_user())
+               return;
+
+       $data = probe_url($r[0]["url"]);
+
+       // "Feed" or "Unknown" is mostly a sign of communication problems
+       if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
+               return;
+
+       $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
+                               "poco", "network", "alias");
+       $update = array();
+
+       if ($data["network"] == NETWORK_OSTATUS) {
+               $result = new_contact($uid, $data["url"], false);
+
+               if ($result['success'])
+                       $update["subhub"] = true;
+       }
+
+       foreach($updatefields AS $field)
+               if (isset($data[$field]) AND ($data[$field] != ""))
+                       $update[$field] = $data[$field];
+
+       $update["nurl"] = normalise_link($data["url"]);
+
+       $query = "";
+
+       if (isset($data["priority"]) AND ($data["priority"] != 0))
+               $query = "`priority` = ".intval($data["priority"]);
+
+       foreach($update AS $key => $value) {
+               if ($query != "")
+                       $query .= ", ";
+
+               $query .= "`".$key."` = '".dbesc($value)."'";
+       }
+
+       if ($query == "")
+               return;
+
+       $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
+               intval($contact_id),
+               intval(local_user())
+       );
+
+       $photos = import_profile_photo($data['photo'], local_user(), $contact_id);
+
+       $r = q("UPDATE `contact` SET `photo` = '%s',
+                       `thumb` = '%s',
+                       `micro` = '%s',
+                       `name-date` = '%s',
+                       `uri-date` = '%s',
+                       `avatar-date` = '%s'
+                       WHERE `id` = %d",
+                       dbesc($photos[0]),
+                       dbesc($photos[1]),
+                       dbesc($photos[2]),
+                       dbesc(datetime_convert()),
+                       dbesc(datetime_convert()),
+                       dbesc(datetime_convert()),
+                       intval($contact_id)
+               );
+
+}
+
+function _contact_block($contact_id, $orig_record) {
+       $blocked = (($orig_record['blocked']) ? 0 : 1);
+       $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d",
+               intval($blocked),
+               intval($contact_id),
+               intval(local_user())
+       );
+       return $r;
+
+}
+function _contact_ignore($contact_id, $orig_record) {
+       $readonly = (($orig_record['readonly']) ? 0 : 1);
+       $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d",
+               intval($readonly),
+               intval($contact_id),
+               intval(local_user())
+       );
+       return $r;
+}
+function _contact_archive($contact_id, $orig_record) {
+       $archived = (($orig_record['archive']) ? 0 : 1);
+       $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d",
+               intval($archived),
+               intval($contact_id),
+               intval(local_user())
+       );
+       if ($archived) {
+               q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user()));
+       }
+       return $r;
+}
+function _contact_drop($contact_id, $orig_record) {
+       require_once('include/Contact.php');
+       $a = get_app();
+
+       terminate_friendship($a->user,$a->contact,$orig_record);
+       contact_remove($orig_record['id']);
+}
 
 
 function contacts_content(&$a) {
@@ -165,67 +373,90 @@ function contacts_content(&$a) {
                        goaway($a->get_baseurl(true) . '/contacts');
                        return; // NOTREACHED
                }
-               
-               if($cmd === 'update') {
 
-                       // pull feed and consume it, which should subscribe to the hub.
-                       proc_run('php',"include/poller.php","$contact_id");
+               if($cmd === 'update') {
+                       _contact_update($contact_id);
                        goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
                        // NOTREACHED
                }
 
+               if($cmd === 'updateprofile') {
+                       _contact_update_profile($contact_id);
+                       goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+                       // NOTREACHED
+               }
+
                if($cmd === 'block') {
-                       $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
-                       $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                               intval($blocked),
-                               intval($contact_id),
-                               intval(local_user())
-                       );
+                       $r = _contact_block($contact_id, $orig_record[0]);
                        if($r) {
-                               //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
-                               info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
+                               $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
+                               info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
                        }
+
                        goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
                if($cmd === 'ignore') {
-                       $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
-                       $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                               intval($readonly),
-                               intval($contact_id),
-                               intval(local_user())
-                       );
+                       $r = _contact_ignore($contact_id, $orig_record[0]);
                        if($r) {
-                               info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
+                               $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
+                               info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
                        }
+
                        goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
 
                if($cmd === 'archive') {
-                       $archived = (($orig_record[0]['archive']) ? 0 : 1);
-                       $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                               intval($archived),
-                               intval($contact_id),
-                               intval(local_user())
-                       );
+                       $r = _contact_archive($contact_id, $orig_record[0]);
                        if($r) {
-                               //notice( t('Contact has been ') . (($archived) ? t('archived') : t('unarchived')) . EOL );
-                               info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL );
+                               $archived = (($orig_record[0]['archive']) ? 0 : 1);
+                               info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
                        }
+
                        goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
                if($cmd === 'drop') {
 
-                       require_once('include/Contact.php');
-
-                       terminate_friendship($a->user,$a->contact,$orig_record[0]);
+                       // Check if we should do HTML-based delete confirmation
+                       if($_REQUEST['confirm']) {
+                               // <form> can't take arguments in its "action" parameter
+                               // so add any arguments as hidden inputs
+                               $query = explode_querystring($a->query_string);
+                               $inputs = array();
+                               foreach($query['args'] as $arg) {
+                                       if(strpos($arg, 'confirm=') === false) {
+                                               $arg_parts = explode('=', $arg);
+                                               $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+                                       }
+                               }
+
+                               $a->page['aside'] = '';
+
+                               return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
+                                       '$contact' =>  _contact_detail_for_template($orig_record[0]),
+                                       '$method' => 'get',
+                                       '$message' => t('Do you really want to delete this contact?'),
+                                       '$extra_inputs' => $inputs,
+                                       '$confirm' => t('Yes'),
+                                       '$confirm_url' => $query['base'],
+                                       '$confirm_name' => 'confirmed',
+                                       '$cancel' => t('Cancel'),
+                               ));
+                       }
+                       // Now check how the user responded to the confirmation query
+                       if($_REQUEST['canceled']) {
+                               if(x($_SESSION,'return_url'))
+                                       goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                               else
+                                       goaway($a->get_baseurl(true) . '/contacts');
+                       }
 
-                       contact_remove($orig_record[0]['id']);
+                       _contact_drop($contact_id, $orig_record[0]);
                        info( t('Contact has been removed.') . EOL );
                        if(x($_SESSION,'return_url'))
                                goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
@@ -235,14 +466,18 @@ function contacts_content(&$a) {
                }
        }
 
+
+
+       $_SESSION['return_url'] = $a->query_string;
+
        if((x($a->data,'contact')) && (is_array($a->data['contact']))) {
 
                $contact_id = $a->data['contact']['id'];
                $contact = $a->data['contact'];
 
-               $editselect = 'exact';
-               if(intval(get_pconfig(local_user(),'system','plaintext')))
-                       $editselect = 'none';
+               $editselect = 'none';
+               if( feature_enabled(local_user(),'richtext') )
+                       $editselect = 'exact';
 
                $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
                        '$baseurl' => $a->get_baseurl(true),
@@ -266,7 +501,7 @@ function contacts_content(&$a) {
                                $dir_icon = 'images/larrow.gif';
                                $relation_text = t('You are sharing with %s');
                                break;
-       
+
                        case CONTACT_IS_SHARING;
                                $dir_icon = 'images/rarrow.gif';
                                $relation_text = t('%s is sharing with you');
@@ -275,36 +510,39 @@ function contacts_content(&$a) {
                                break;
                }
 
-               $relation_text = sprintf($relation_text,$contact['name']);
+               if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
+                               $relation_text = "";
+
+               $relation_text = sprintf($relation_text,htmlentities($contact['name']));
 
                if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
                        $url = "redir/{$contact['id']}";
                        $sparkle = ' class="sparkle" ';
                }
-               else { 
+               else {
                        $url = $contact['url'];
                        $sparkle = '';
                }
 
                $insecure = t('Private communications are not available for this contact.');
 
-               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00') 
-                               ? t('Never') 
+               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
+                               ? t('Never')
                                : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
 
                if($contact['last-update'] !== '0000-00-00 00:00:00')
-                       $last_update .= ' ' . (($contact['last-update'] == $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
+                       $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
 
                $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
 
-               $poll_enabled = (($contact['network'] !== NETWORK_DIASPORA) ? true : false);
+               $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
 
-               $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network']));
+               $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'], $contact["url"]));
 
                $common = count_common_friends(local_user(),$contact['id']);
                $common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
 
-               $polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : ''); 
+               $polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : '');
 
                $x = count_all_friends(local_user(), $contact['id']);
                $all_friends = (($x) ? t('View all contacts') : '');
@@ -316,12 +554,16 @@ function contacts_content(&$a) {
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
                                'sel'   => '',
                                'title' => t('Toggle Blocked status'),
+                               'id'    => 'toggle-block-tab',
+                               'accesskey' => 'b',
                        ),
                        array(
                                'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
                                'sel'   => '',
                                'title' => t('Toggle Ignored status'),
+                               'id'    => 'toggle-ignore-tab',
+                               'accesskey' => 'i',
                        ),
 
                        array(
@@ -329,12 +571,16 @@ function contacts_content(&$a) {
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
                                'sel'   => '',
                                'title' => t('Toggle Archive status'),
+                               'id'    => 'toggle-archive-tab',
+                               'accesskey' => 'v',
                        ),
                        array(
                                'label' => t('Repair'),
                                'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
                                'sel'   => '',
                                'title' => t('Advanced Contact Settings'),
+                               'id'    => 'repair-tab',
+                               'accesskey' => 'r',
                        )
                );
                $tab_tpl = get_markup_template('common_tabs.tpl');
@@ -342,7 +588,21 @@ function contacts_content(&$a) {
 
                $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(
+               if ($contact['network'] == NETWORK_FEED)
+                       $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
+                                                                       array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords')));
+
+               if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
+                       $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
+
+               if ($contact['network'] == NETWORK_DFRN)
+                       $profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
+
+               if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
+                       ($contact['rel'] == CONTACT_IS_FOLLOWER))
+                       $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+
+               $o .= replace_macros($tpl, array(
                        '$header' => t('Contact Editor'),
                        '$tab_str' => $tab_str,
                        '$submit' => t('Submit'),
@@ -362,14 +622,16 @@ function contacts_content(&$a) {
                        '$lblsuggest' => $lblsuggest,
                        '$delete' => t('Delete contact'),
                        '$nettype' => $nettype,
-                       '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
+                       '$poll_interval' => $poll_interval,
                        '$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'),
-                       '$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)),
+                       '$follow' => $follow,
+                       '$follow_text' => t("Connect/Follow"),
+                       '$profile_select' => $profile_select,
                        '$contact_id' => $contact['id'],
                        '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
                        '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
@@ -379,12 +641,18 @@ function contacts_content(&$a) {
                        '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
                        '$archived' => (($contact['archive']) ? t('Currently archived') : ''),
                        '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts <strong>may</strong> still be visible')),
+                       '$notify' => array('notify', t('Notification for new posts'), ($contact['notify_new_posts'] == 1), t('Send a notification of every new post of this contact')),
+                       '$fetch_further_information' => $fetch_further_information,
+                       '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
+                       '$ffi_keyword_blacklist' => array('ffi_keyword_blacklist', t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')),
                        '$photo' => $contact['photo'],
-                       '$name' => $contact['name'],
+                       '$name' => htmlentities($contact['name']),
                        '$dir_icon' => $dir_icon,
                        '$alt_text' => $alt_text,
                        '$sparkle' => $sparkle,
-                       '$url' => $url
+                       '$url' => $url,
+                       '$profileurllabel' => t('Profile URL'),
+                       '$profileurl' => $contact['url'],
 
                ));
 
@@ -401,8 +669,6 @@ function contacts_content(&$a) {
        $ignored = false;
        $all = false;
 
-       $_SESSION['return_url'] = $a->query_string;
-
        if(($a->argc == 2) && ($a->argv[1] === 'all')) {
                $sql_extra = '';
                $all = true;
@@ -432,21 +698,27 @@ function contacts_content(&$a) {
        $tabs = array(
                array(
                        'label' => t('Suggestions'),
-                       'url'   => $a->get_baseurl(true) . '/suggest', 
+                       'url'   => $a->get_baseurl(true) . '/suggest',
                        'sel'   => '',
                        'title' => t('Suggest potential friends'),
+                       'id'    => 'suggestions-tab',
+                       'accesskey' => 'g',
                ),
                array(
                        'label' => t('All Contacts'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/all', 
+                       'url'   => $a->get_baseurl(true) . '/contacts/all',
                        'sel'   => ($all) ? 'active' : '',
                        'title' => t('Show all contacts'),
+                       'id'    => 'showall-tab',
+                       'accesskey' => 'l',
                ),
                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'),
+                       'id'    => 'showunblocked-tab',
+                       'accesskey' => 'o',
                ),
 
                array(
@@ -454,6 +726,8 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/blocked',
                        'sel'   => ($blocked) ? 'active' : '',
                        'title' => t('Only show blocked contacts'),
+                       'id'    => 'showblocked-tab',
+                       'accesskey' => 'b',
                ),
 
                array(
@@ -461,6 +735,8 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/ignored',
                        'sel'   => ($ignored) ? 'active' : '',
                        'title' => t('Only show ignored contacts'),
+                       'id'    => 'showignored-tab',
+                       'accesskey' => 'i',
                ),
 
                array(
@@ -468,6 +744,8 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/archived',
                        'sel'   => ($archived) ? 'active' : '',
                        'title' => t('Only show archived contacts'),
+                       'id'    => 'showarchived-tab',
+                       'accesskey' => 'y',
                ),
 
                array(
@@ -475,6 +753,8 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/hidden',
                        'sel'   => ($hidden) ? 'active' : '',
                        'title' => t('Only show hidden contacts'),
+                       'id'    => 'showhidden-tab',
+                       'accesskey' => 'h',
                ),
 
        );
@@ -490,15 +770,15 @@ function contacts_content(&$a) {
                $search_txt = dbesc(protect_sprintf(preg_quote($search)));
                $searching = true;
        }
-       $sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
+       $sql_extra .= (($searching) ? " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt'  OR nick REGEXP '$search_txt') " : "");
 
        if($nets)
                $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
-       $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
 
-       
-       $r = q("SELECT COUNT(*) AS `total` FROM `contact` 
+       $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
+
+
+       $r = q("SELECT COUNT(*) AS `total` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
        if(count($r)) {
@@ -516,58 +796,14 @@ function contacts_content(&$a) {
        $contacts = array();
 
        if(count($r)) {
-
                foreach($r as $rr) {
-
-                       switch($rr['rel']) {
-                               case CONTACT_IS_FRIEND:
-                                       $dir_icon = 'images/lrarrow.gif';
-                                       $alt_text = t('Mutual Friendship');
-                                       break;
-                               case  CONTACT_IS_FOLLOWER;
-                                       $dir_icon = 'images/larrow.gif';
-                                       $alt_text = t('is a fan of yours');
-                                       break;
-                               case CONTACT_IS_SHARING;
-                                       $dir_icon = 'images/rarrow.gif';
-                                       $alt_text = t('you are a fan of');
-                                       break;
-                               default:
-                                       break;
-                       }
-                       if(($rr['network'] === 'dfrn') && ($rr['rel'])) {
-                               $url = "redir/{$rr['id']}";
-                               $sparkle = ' class="sparkle" ';
-                       }
-                       else { 
-                               $url = $rr['url'];
-                               $sparkle = '';
-                       }
-
-
-                       $contacts[] = array(
-                               'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
-                               'edit_hover' => t('Edit contact'),
-                               'photo_menu' => contact_photo_menu($rr),
-                               'id' => $rr['id'],
-                               'alt_text' => $alt_text,
-                               'dir_icon' => $dir_icon,
-                               'thumb' => $rr['thumb'], 
-                               'name' => $rr['name'],
-                               'username' => $rr['name'],
-                               'sparkle' => $sparkle,
-                               'itemurl' => $rr['url'],
-                               'url' => $url,
-                               'network' => network_to_name($rr['network']),
-                       );
+                       $contacts[] = _contact_detail_for_template($rr);
                }
-
-               
-
        }
-       
+
        $tpl = get_markup_template("contacts-template.tpl");
-       $o .= replace_macros($tpl,array(
+       $o .= replace_macros($tpl, array(
+               '$baseurl' => $a->get_baseurl(),
                '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
                '$tabs' => $t,
                '$total' => $total,
@@ -577,9 +813,63 @@ function contacts_content(&$a) {
                '$submit' => t('Find'),
                '$cmd' => $a->cmd,
                '$contacts' => $contacts,
+               '$contact_drop_confirm' => t('Do you really want to delete this contact?'),
+               'multiselect' => 1,
+               '$batch_actions' => array(
+                       'contacts_batch_update' => t('Update'),
+                       'contacts_batch_block' => t('Block')."/".t("Unblock"),
+                       "contacts_batch_ignore" => t('Ignore')."/".t("Unignore"),
+                       "contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
+                       "contacts_batch_drop" => t('Delete'),
+               ),
                '$paginate' => paginate($a),
 
-       )); 
-       
+       ));
+
        return $o;
 }
+
+function _contact_detail_for_template($rr){
+       switch($rr['rel']) {
+               case CONTACT_IS_FRIEND:
+                       $dir_icon = 'images/lrarrow.gif';
+                       $alt_text = t('Mutual Friendship');
+                       break;
+               case  CONTACT_IS_FOLLOWER;
+                       $dir_icon = 'images/larrow.gif';
+                       $alt_text = t('is a fan of yours');
+                       break;
+               case CONTACT_IS_SHARING;
+                       $dir_icon = 'images/rarrow.gif';
+                       $alt_text = t('you are a fan of');
+                       break;
+               default:
+                       break;
+       }
+       if(($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
+               $url = "redir/{$rr['id']}";
+               $sparkle = ' class="sparkle" ';
+       }
+       else {
+               $url = $rr['url'];
+               $sparkle = '';
+       }
+
+
+       return array(
+               'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
+               'edit_hover' => t('Edit contact'),
+               'photo_menu' => contact_photo_menu($rr),
+               'id' => $rr['id'],
+               'alt_text' => $alt_text,
+               'dir_icon' => $dir_icon,
+               'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+               'name' => htmlentities($rr['name']),
+               'username' => htmlentities($rr['name']),
+               'sparkle' => $sparkle,
+               'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
+               'url' => $url,
+               'network' => network_to_name($rr['network'], $rr['url']),
+       );
+
+}