intval(local_user()),
intval($contact_id)
);
- if(! count($r)) {
+ if(! dbm::is_result($r)) {
$contact_id = 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
+ } 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) ? z_root()."/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') : '')
+ '$account_type' => account_type($a->data['contact'])
));
$finpeople_widget = '';
$follow_widget = '';
}
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');
}
if(! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
intval($profile_id),
intval(local_user())
);
- if(! count($r)) {
+ if(! dbm::is_result($r)) {
notice( t('Could not locate selected profile.') . EOL);
return;
}
intval($contact_id),
intval(local_user())
);
- if($r && count($r))
+ if($r && dbm::is_result($r))
$a->data['contact'] = $r[0];
return;
intval($contact_id));
} else
// pull feed and consume it, which should subscribe to the hub.
- proc_run('php',"include/onepoll.php","$contact_id", "force");
+ proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
}
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($data["photo"]),
- 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"]);
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
}
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
}
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
}
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
}
$a->page['aside'] = '';
return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
- '$contact' => _contact_detail_for_template($orig_record[0]),
+ '$header' => t('Drop contact'),
+ '$contact' => _contact_detail_for_template($orig_record[0]),
'$method' => 'get',
'$message' => t('Do you really want to delete this contact?'),
'$extra_inputs' => $inputs,
// 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') {
($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);
+
$o .= replace_macros($tpl, array(
//'$header' => t('Contact Editor'),
+ '$header' => t("Contact"),
'$tab_str' => $tab_str,
'$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'),
'$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']),
'$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,
'$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
'$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
'$info' => $contact['info'],
+ '$cinfo' => array('info', '', $contact['info'], ''),
'$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
'$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
'$archived' => (($contact['archive']) ? t('Currently archived') : ''),
'$url' => $url,
'$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'],
+ '$account_type' => account_type($contact),
'$location' => bbcode($contact["location"]),
'$location_label' => t("Location:"),
+ '$xmpp' => bbcode($contact["xmpp"]),
+ '$xmpp_label' => t("XMPP:"),
'$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'),
+ '$contact_profile_label' => t("Profile"),
));
$tabs = array(
array(
'label' => t('Suggestions'),
- 'url' => $a->get_baseurl(true) . '/suggest',
+ 'url' => 'suggest',
'sel' => '',
'title' => t('Suggest potential friends'),
'id' => 'suggestions-tab',
),
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',
),
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',
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',
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',
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',
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',
$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)) {
+ if (dbm::is_result($r)) {
$a->set_pager_total($r[0]['total']);
$total = $r[0]['total'];
}
$contacts = array();
- if(count($r)) {
- foreach($r as $rr) {
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr);
}
}
'$total' => $total,
'$search' => $search_hdr,
'$desc' => t('Search your contacts'),
- '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
+ '$finding' => (($searching) ? sprintf(t('Results for: %s'),$search) : ""),
'$submit' => t('Find'),
'$cmd' => $a->cmd,
'$contacts' => $contacts,
"contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
"contacts_batch_drop" => t('Delete'),
),
+ '$h_batch_actions' => t('Batch Actions'),
'$paginate' => paginate($a),
));
return $o;
}
+/**
+ * @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(
)
);
+ // 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'),
'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'),
'id' => 'common-loc-tab',
'accesskey' => 'd');
- $tabs[] = array('label' => t('Repair'),
- 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
+ $tabs[] = array('label' => t('Advanced'),
+ 'url' => 'crepair/' . $contact_id,
'sel' => (($active_tab == 5)?'active':''),
'title' => t('Advanced Contact Settings'),
- 'id' => 'repair-tab',
+ 'id' => 'advanced-tab',
'accesskey' => 'r');
-
- $tabs[] = 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');
-
- $tabs[] = 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');
-
- $tabs[] = 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');
-
$tab_tpl = get_markup_template('common_tabs.tpl');
$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
$o .= $tab_str;
- if ($contact["url"]) {
- $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- dbesc(normalise_link($contact["url"])));
-
- if ($r[0]["id"] <> 0)
- $o .= posts_from_gcontact($a, $r[0]["id"]);
- }
+ $o .= posts_from_contact_url($a, $contact["url"]);
return $o;
}
function _contact_detail_for_template($rr){
- $community = '';
-
switch($rr['rel']) {
case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif';
$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']),
'edit_hover' => t('Edit contact'),
'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
'name' => htmlentities($rr['name']),
'username' => htmlentities($rr['name']),
- 'account_type' => ($community ? t('Forum') : ''),
+ 'account_type' => account_type($rr),
'sparkle' => $sparkle,
'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
'url' => $url,
);
}
+
+/**
+ * @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;
+}
projects / friendica.git / blobdiff