X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=4897663a051d92b2c3e208507de588ced76adfdd;hb=06998f13b61fcd50588f425703793bacc2e55cab;hp=c3720d2176540daaeb1fe0b14af8992b2018e722;hpb=42d903dd6845c4895656e9c5aac7f78f810222a5;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index c3720d2176..4897663a05 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -35,10 +35,20 @@ function contacts_init(&$a) { if($contact_id) { $a->data['contact'] = $r[0]; + + if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { + $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); + } else + $networkname = ''; + $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( '$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'] + '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'], + '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), + '$network_name' => $networkname, + '$network' => t('Network:'), + 'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '') )); $finpeople_widget = ''; $follow_widget = ''; @@ -55,8 +65,7 @@ function contacts_init(&$a) { $findpeople_widget .= findpeople_widget(); } - if ($a->argv[2] != "posts") - $groups_widget .= group_side('contacts','group','full',0,$contact_id); + $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, @@ -66,7 +75,7 @@ function contacts_init(&$a) { '$networks_widget' => $networks_widget )); - $base = $a->get_baseurl(); + $base = z_root(); $tpl = get_markup_template("contacts-head.tpl"); $a->page['htmlhead'] .= replace_macros($tpl,array( '$baseurl' => $a->get_baseurl(true), @@ -116,13 +125,13 @@ function contacts_batch_actions(&$a){ } } if ($count_actions>0) { - info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) ); + 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']); + goaway('' . $_SESSION['return_url']); else - goaway($a->get_baseurl(true) . '/contacts'); + goaway('contacts'); } @@ -148,7 +157,7 @@ function contacts_post(&$a) { if(! count($orig_record)) { notice( t('Could not access contact record.') . EOL); - goaway($a->get_baseurl(true) . '/contacts'); + goaway('contacts'); return; // NOTREACHED } @@ -284,24 +293,11 @@ function _contact_update_profile($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) - ); + // Update the entry in the contact table + update_contact_avatar($data['photo'], local_user(), $contact_id); + // Update the entry in the gcontact table + update_gcontact_from_probe($data["url"]); } function _contact_block($contact_id, $orig_record) { @@ -336,7 +332,6 @@ function _contact_archive($contact_id, $orig_record) { 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); @@ -371,19 +366,19 @@ function contacts_content(&$a) { if(! count($orig_record)) { notice( t('Could not access contact record.') . EOL); - goaway($a->get_baseurl(true) . '/contacts'); + goaway('contacts'); return; // NOTREACHED } if($cmd === 'update') { _contact_update($contact_id); - goaway($a->get_baseurl(true) . '/contacts/' . $contact_id); + goaway('contacts/' . $contact_id); // NOTREACHED } if($cmd === 'updateprofile') { _contact_update_profile($contact_id); - goaway($a->get_baseurl(true) . '/crepair/' . $contact_id); + goaway('crepair/' . $contact_id); // NOTREACHED } @@ -394,7 +389,7 @@ function contacts_content(&$a) { info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL); } - goaway($a->get_baseurl(true) . '/contacts/' . $contact_id); + goaway('contacts/' . $contact_id); return; // NOTREACHED } @@ -405,7 +400,7 @@ function contacts_content(&$a) { info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL); } - goaway($a->get_baseurl(true) . '/contacts/' . $contact_id); + goaway('contacts/' . $contact_id); return; // NOTREACHED } @@ -417,7 +412,7 @@ function contacts_content(&$a) { info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL); } - goaway($a->get_baseurl(true) . '/contacts/' . $contact_id); + goaway('contacts/' . $contact_id); return; // NOTREACHED } @@ -452,17 +447,17 @@ function contacts_content(&$a) { // 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']); + goaway('' . $_SESSION['return_url']); else - goaway($a->get_baseurl(true) . '/contacts'); + goaway('contacts'); } _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']); + goaway('' . $_SESSION['return_url']); else - goaway($a->get_baseurl(true) . '/contacts'); + goaway('contacts'); return; // NOTREACHED } if($cmd === 'posts') { @@ -543,16 +538,16 @@ function contacts_content(&$a) { $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) : ''); + //$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' : ''); - $x = count_all_friends(local_user(), $contact['id']); - $all_friends = (($x) ? t('View all contacts') : ''); + //$x = count_all_friends(local_user(), $contact['id']); + //$all_friends = (($x) ? t('View all contacts') : ''); // tabs - $tab_str = contact_tabs($a, $contact_id, 2); + $tab_str = contacts_tab($a, $contact_id, 2); $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!') : ''); @@ -570,17 +565,12 @@ function contacts_content(&$a) { ($contact['rel'] == CONTACT_IS_FOLLOWER)) $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]); + // Load contactact related actions like hide, suggest, delete and others + $contact_actions = contact_actions($contact); - $header = $contact["name"]; - - if ($contact["addr"] != "") - $header .= " <".$contact["addr"].">"; - - $header .= " (".network_to_name($contact['network'], $contact['url']).")"; $o .= replace_macros($tpl, array( //'$header' => t('Contact Editor'), - '$header' => htmlentities($header), '$tab_str' => $tab_str, '$submit' => t('Submit'), '$lbl_vis1' => t('Profile Visibility'), @@ -588,7 +578,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/loc/' . local_user() . '/' . $contact['id'], + '$common_link' => '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']), @@ -597,7 +587,7 @@ function contacts_content(&$a) { '$lblcrepair' => t("Repair URL settings"), '$lblrecent' => t('View conversations'), '$lblsuggest' => $lblsuggest, - '$delete' => t('Delete contact'), + //'$delete' => t('Delete contact'), '$nettype' => $nettype, '$poll_interval' => $poll_interval, '$poll_enabled' => $poll_enabled, @@ -635,7 +625,11 @@ function contacts_content(&$a) { '$about' => bbcode($contact["about"], false, false), '$about_label' => t("About:"), '$keywords' => $contact["keywords"], - '$keywords_label' => t("Tags:") + '$keywords_label' => t("Tags:"), + '$contact_action_button' => t("Actions"), + '$contact_actions' => $contact_actions, + '$contact_status' => t("Status"), + '$contact_settings_label' => t('Contact Settings'), )); @@ -681,7 +675,7 @@ function contacts_content(&$a) { $tabs = array( array( 'label' => t('Suggestions'), - 'url' => $a->get_baseurl(true) . '/suggest', + 'url' => 'suggest', 'sel' => '', 'title' => t('Suggest potential friends'), 'id' => 'suggestions-tab', @@ -689,7 +683,7 @@ function contacts_content(&$a) { ), array( 'label' => t('All Contacts'), - 'url' => $a->get_baseurl(true) . '/contacts/all', + 'url' => 'contacts/all', 'sel' => ($all) ? 'active' : '', 'title' => t('Show all contacts'), 'id' => 'showall-tab', @@ -697,7 +691,7 @@ function contacts_content(&$a) { ), array( 'label' => t('Unblocked'), - 'url' => $a->get_baseurl(true) . '/contacts', + 'url' => 'contacts', 'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '', 'title' => t('Only show unblocked contacts'), 'id' => 'showunblocked-tab', @@ -706,7 +700,7 @@ function contacts_content(&$a) { array( 'label' => t('Blocked'), - 'url' => $a->get_baseurl(true) . '/contacts/blocked', + 'url' => 'contacts/blocked', 'sel' => ($blocked) ? 'active' : '', 'title' => t('Only show blocked contacts'), 'id' => 'showblocked-tab', @@ -715,7 +709,7 @@ function contacts_content(&$a) { array( 'label' => t('Ignored'), - 'url' => $a->get_baseurl(true) . '/contacts/ignored', + 'url' => 'contacts/ignored', 'sel' => ($ignored) ? 'active' : '', 'title' => t('Only show ignored contacts'), 'id' => 'showignored-tab', @@ -724,7 +718,7 @@ function contacts_content(&$a) { array( 'label' => t('Archived'), - 'url' => $a->get_baseurl(true) . '/contacts/archived', + 'url' => 'contacts/archived', 'sel' => ($archived) ? 'active' : '', 'title' => t('Only show archived contacts'), 'id' => 'showarchived-tab', @@ -733,7 +727,7 @@ function contacts_content(&$a) { array( 'label' => t('Hidden'), - 'url' => $a->get_baseurl(true) . '/contacts/hidden', + 'url' => 'contacts/hidden', 'sel' => ($hidden) ? 'active' : '', 'title' => t('Only show hidden contacts'), 'id' => 'showhidden-tab', @@ -787,7 +781,7 @@ function contacts_content(&$a) { $tpl = get_markup_template("contacts-template.tpl"); $o .= replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$tabs' => $t, '$total' => $total, @@ -813,7 +807,18 @@ function contacts_content(&$a) { return $o; } -function contact_tabs($a, $contact_id, $active_tab) { +/** + * @brief List of pages for the Contact TabBar + * + * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends' + * + * @param app $a + * @param int $contact_id The ID of the contact + * @param int $active_tab 1 if tab should be marked as active + * + * @return array with with contact TabBar data + */ +function contacts_tab($a, $contact_id, $active_tab) { // tabs $tabs = array( array( @@ -830,41 +835,37 @@ function contact_tabs($a, $contact_id, $active_tab) { 'sel' => (($active_tab == 2)?'active':''), 'title' => t('Profile Details'), 'id' => 'status-tab', - 'accesskey' => 'r', - ), - array( - 'label' => t('Repair'), - 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id, - 'sel' => (($active_tab == 3)?'active':''), - 'title' => t('Advanced Contact Settings'), - 'id' => 'repair-tab', - 'accesskey' => 'r', - ), - array( - 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), - '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( - 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ), - 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive', - 'sel' => '', - 'title' => t('Toggle Archive status'), - 'id' => 'toggle-archive-tab', - 'accesskey' => 'v', + 'accesskey' => 'o', ) ); + + // Show this tab only if there is visible friend list + $x = count_all_friends(local_user(), $contact_id); + if ($x) + $tabs[] = array('label'=>t('Contacts'), + 'url' => "allfriends/".$contact_id, + 'sel' => (($active_tab == 3)?'active':''), + 'title' => t('View all contacts'), + 'id' => 'allfriends-tab', + 'accesskey' => 't'); + + // Show this tab only if there is visible common friend list + $common = count_common_friends(local_user(),$contact_id); + if ($common) + $tabs[] = array('label'=>t('Common Friends'), + 'url' => "common/loc/".local_user()."/".$contact_id, + 'sel' => (($active_tab == 4)?'active':''), + 'title' => t('View all common friends'), + 'id' => 'common-loc-tab', + 'accesskey' => 'd'); + + $tabs[] = array('label' => t('Advanced'), + 'url' => 'crepair/' . $contact_id, + 'sel' => (($active_tab == 5)?'active':''), + 'title' => t('Advanced Contact Settings'), + 'id' => 'advanced-tab', + 'accesskey' => 'r'); + $tab_tpl = get_markup_template('common_tabs.tpl'); $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs)); @@ -873,57 +874,36 @@ function contact_tabs($a, $contact_id, $active_tab) { function contact_posts($a, $contact_id) { - require_once('include/conversation.php'); - - $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($contact_id)); + $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id)); if ($r) { $contact = $r[0]; $a->page['aside'] = ""; profile_load($a, "", 0, get_contact_details_by_url($contact["url"])); - } - - $r = q("SELECT COUNT(*) AS `total` FROM `item` - WHERE `item`.`uid` = %d AND `contact-id` = %d AND `item`.`id` = `item`.`parent`", - intval(local_user()), intval($contact_id)); - - $a->set_pager_total($r[0]['total']); - - $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, - `author-name` AS `name`, `owner-avatar` AS `photo`, - `owner-link` AS `url`, `owner-avatar` AS `thumb` - FROM `item` WHERE `item`.`uid` = %d AND `contact-id` = %d AND `item`.`id` = `item`.`parent` - ORDER BY `item`.`created` DESC LIMIT %d, %d", - intval(local_user()), - intval($contact_id), - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); - - $tab_str = contact_tabs($a, $contact_id, 1); - - $header = $contact["name"]; - - if ($contact["addr"] != "") - $header .= " <".$contact["addr"].">"; - - $header .= " (".network_to_name($contact['network'], $contact['url']).")"; + } else + $profile = ""; -//{{include file="section_title.tpl"}} + $tab_str = contacts_tab($a, $contact_id, 1); - $o = "

".htmlentities($header)."

".$tab_str; + $o .= $tab_str; - $o .= conversation($a,$r,'community',false); + $r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id)); + if ($r) + $o .= posts_from_contact($a, $contact_id); + elseif ($contact["url"]) { + $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", + dbesc(normalise_link($contact["url"]))); - if(!get_config('system', 'old_pager')) { - $o .= alt_pager($a,count($r)); - } else { - $o .= paginate($a); + if ($r[0]["id"] <> 0) + $o .= posts_from_gcontact($a, $r[0]["id"]); } return $o; } function _contact_detail_for_template($rr){ + + $community = ''; + switch($rr['rel']) { case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; @@ -949,6 +929,10 @@ function _contact_detail_for_template($rr){ $sparkle = ''; } + //test if contact is a forum page + if (isset($rr['forum']) OR isset($rr['prv'])) + $community = ($rr['forum'] OR $rr['prv']); + return array( 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), @@ -960,6 +944,7 @@ function _contact_detail_for_template($rr){ 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB), 'name' => htmlentities($rr['name']), 'username' => htmlentities($rr['name']), + 'account_type' => ($community ? t('Forum') : ''), 'sparkle' => $sparkle, 'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']), 'url' => $url, @@ -967,3 +952,72 @@ function _contact_detail_for_template($rr){ ); } + +/** + * @brief Gives a array with actions which can performed to a given contact + * + * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others + * + * @param array $contact Data about the Contact + * @return array with contact related actions + */ +function contact_actions($contact) { + + $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)); + $contact_action = array(); + + // Provide friend suggestion only for Friendica contacts + if($contact['network'] === NETWORK_DFRN) { + $contact_actions['suggest'] = array( + 'label' => t('Suggest friends'), + 'url' => 'fsuggest/' . $contact['id'], + 'title' => '', + 'sel' => '', + 'id' => 'suggest', + ); + } + + if($poll_enabled) { + $contact_actions['update'] = array( + 'label' => t('Update now'), + 'url' => 'contacts/' . $contact['id'] . '/update', + 'title' => '', + 'sel' => '', + 'id' => 'update', + ); + } + + $contact_actions['block'] = array( + 'label' => (intval($contact['blocked']) ? t('Unblock') : t('Block') ), + 'url' => 'contacts/' . $contact['id'] . '/block', + 'title' => t('Toggle Blocked status'), + 'sel' => (intval($contact['blocked']) ? 'active' : ''), + 'id' => 'toggle-block', + ); + + $contact_actions['ignore'] = array( + 'label' => (intval($contact['readonly']) ? t('Unignore') : t('Ignore') ), + 'url' => 'contacts/' . $contact['id'] . '/ignore', + 'title' => t('Toggle Ignored status'), + 'sel' => (intval($contact['readonly']) ? 'active' : ''), + 'id' => 'toggle-ignore', + ); + + $contact_actions['archive'] = array( + 'label' => (intval($contact['archive']) ? t('Unarchive') : t('Archive') ), + 'url' => 'contacts/' . $contact['id'] . '/archive', + 'title' => t('Toggle Archive status'), + 'sel' => (intval($contact['archive']) ? 'active' : ''), + 'id' => 'toggle-archive', + ); + + $contact_actions['delete'] = array( + 'label' => t('Delete'), + 'url' => 'contacts/' . $contact['id'] . '/drop', + 'title' => t('Delete contact'), + 'sel' => '', + 'id' => 'delete', + ); + + return $contact_actions; +}