X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=6ee9a4a92b23165e2df3a49cfb4583482d14e338;hb=bffe35ab711d986bc8d2c95e91f83700a9a2e9a3;hp=d19c75ab9694dffe99ccdde4143c3399bf1d1f15;hpb=9febcedf936d1d806ae70eaceb3feb3349c08a26;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index d19c75ab96..6ee9a4a92b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -3,6 +3,9 @@ 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()) @@ -31,15 +34,22 @@ function contacts_init(&$a) { $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'] + '$photo' => $a->data['contact']['photo'], + '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] )); $follow_widget = ''; } else { $vcard_widget = ''; - $follow_widget = follow_widget(); + if (isset($_GET['add'])) + $follow_widget = follow_widget($_GET['add']); + else + $follow_widget = follow_widget(); } + if ($_GET['nets'] == "all") + $_GET['nets'] = ""; + $groups_widget .= group_side('contacts','group',false,0,$contact_id); $findpeople_widget .= findpeople_widget(); $networks_widget .= networks_widget('contacts',$_GET['nets']); @@ -70,12 +80,12 @@ 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']; @@ -103,7 +113,7 @@ function contacts_batch_actions(&$a){ 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 @@ -113,7 +123,7 @@ function contacts_batch_actions(&$a){ function contacts_post(&$a) { - + if(! local_user()) return; @@ -153,6 +163,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; @@ -160,11 +176,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()) ); @@ -187,11 +207,73 @@ function contacts_post(&$a) { /*contact actions*/ function _contact_update($contact_id) { // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/poller.php","$contact_id"); + proc_run('php',"include/poller.php","$contact_id"); } + +function _contact_update_profile($contact_id) { + $r = q("SELECT `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); + if (!$r) + return; + + $data = probe_url($r[0]["url"]); + + // "Feed" is mostly a sign of communication problems + if (($data["network"] == NETWORK_FEED) AND ($data["network"] != $r[0]["network"])) + return; + + $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", + "poco", "network", "alias", "pubkey"); + $update = array(); + + 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 LIMIT 1", + $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d", intval($blocked), intval($contact_id), intval(local_user()) @@ -201,7 +283,7 @@ function _contact_block($contact_id, $orig_record) { } 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 LIMIT 1", + $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d", intval($readonly), intval($contact_id), intval(local_user()) @@ -210,7 +292,7 @@ function _contact_ignore($contact_id, $orig_record) { } 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 LIMIT 1", + $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d", intval($archived), intval($contact_id), intval(local_user()) @@ -259,19 +341,26 @@ function contacts_content(&$a) { goaway($a->get_baseurl(true) . '/contacts'); return; // NOTREACHED } - + 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') { $r = _contact_block($contact_id, $orig_record[0]); if($r) { - 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 } @@ -279,9 +368,10 @@ function contacts_content(&$a) { if($cmd === 'ignore') { $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 } @@ -290,9 +380,10 @@ function contacts_content(&$a) { if($cmd === 'archive') { $r = _contact_archive($contact_id, $orig_record[0]); if($r) { - 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 } @@ -313,7 +404,9 @@ function contacts_content(&$a) { } $a->page['aside'] = ''; - return replace_macros(get_markup_template('confirm.tpl'), array( + + 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, @@ -376,7 +469,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'); @@ -385,36 +478,39 @@ function contacts_content(&$a) { break; } + if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) + $relation_text = ""; + $relation_text = sprintf($relation_text,$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'])); $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') : ''); @@ -452,6 +548,16 @@ 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!') : ''); + 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)); + $o .= replace_macros($tpl, array( '$header' => t('Contact Editor'), '$tab_str' => $tab_str, @@ -472,14 +578,14 @@ 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)), + '$profile_select' => $profile_select, '$contact_id' => $contact['id'], '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), @@ -489,6 +595,10 @@ 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 may 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'], '$dir_icon' => $dir_icon, @@ -602,11 +712,11 @@ function contacts_content(&$a) { 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)) { @@ -624,56 +734,11 @@ 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( '$baseurl' => $a->get_baseurl(), @@ -696,7 +761,52 @@ function contacts_content(&$a) { ), '$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']), + 'name' => $rr['name'], + 'username' => $rr['name'], + 'sparkle' => $sparkle, + 'itemurl' => $rr['url'], + 'url' => $url, + 'network' => network_to_name($rr['network']), + ); + +} \ No newline at end of file