require_once('mod/proxy.php');
require_once('include/Photo.php');
-function contacts_init(&$a) {
- if(! local_user())
+function contacts_init(App $a) {
+ if (! local_user()) {
return;
+ }
$contact_id = 0;
intval(local_user()),
intval($contact_id)
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
$contact_id = 0;
}
}
require_once('include/group.php');
require_once('include/contact_widgets.php');
- if ($_GET['nets'] == "all")
- $_GET['nets'] = "";
+ if ($_GET['nets'] == "all") {
+ $_GET['nets'] = "";
+ }
- if(! x($a->page,'aside'))
+ if (! x($a->page,'aside')) {
$a->page['aside'] = '';
-
- 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) ? "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 = '';
- $networks_widget = '';
}
- else {
+
+ 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 = '';
+ }
+
+ /// @TODO Add nice spaces
+ $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) ? "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' => account_type($a->data['contact'])
+ ));
+
+ $finpeople_widget = '';
+ $follow_widget = '';
+ $networks_widget = '';
+ } else {
$vcard_widget = '';
$networks_widget .= networks_widget('contacts',$_GET['nets']);
- if (isset($_GET['add']))
+ if (isset($_GET['add'])) {
$follow_widget = follow_widget($_GET['add']);
- else
+ } else {
$follow_widget = follow_widget();
+ }
$findpeople_widget .= findpeople_widget();
}
$base = z_root();
$tpl = get_markup_template("contacts-head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,array(
- '$baseurl' => $a->get_baseurl(true),
+ '$baseurl' => App::get_baseurl(true),
'$base' => $base
));
$tpl = get_markup_template("contacts-end.tpl");
$a->page['end'] .= replace_macros($tpl,array(
- '$baseurl' => $a->get_baseurl(true),
+ '$baseurl' => App::get_baseurl(true),
'$base' => $base
));
}
-function contacts_batch_actions(&$a){
+function contacts_batch_actions(App $a) {
$contacts_id = $_POST['contact_batch'];
if (!is_array($contacts_id)) return;
info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
}
- if(x($_SESSION,'return_url'))
+ if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']);
- else
+ }
+ else {
goaway('contacts');
+ }
}
-function contacts_post(&$a) {
+function contacts_post(App $a) {
- if(! local_user())
+ if (! local_user()) {
return;
+ }
if ($a->argv[1]==="batch") {
contacts_batch_actions($a);
}
$contact_id = intval($a->argv[1]);
- if(! $contact_id)
+ if (! $contact_id) {
return;
+ }
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval(local_user())
);
- if(! count($orig_record)) {
+ if (! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
goaway('contacts');
return; // NOTREACHED
call_hooks('contact_edit_post', $_POST);
$profile_id = intval($_POST['profile-assign']);
- if($profile_id) {
+ if ($profile_id) {
$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($profile_id),
intval(local_user())
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
notice( t('Could not locate selected profile.') . EOL);
return;
}
$fetch_further_information = intval($_POST['fetch_further_information']);
- $ffi_keyword_blacklist = fix_mce_lf(escape_tags(trim($_POST['ffi_keyword_blacklist'])));
+ $ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist']));
$priority = intval($_POST['poll']);
if($priority > 5 || $priority < 0)
$priority = 0;
- $info = fix_mce_lf(escape_tags(trim($_POST['info'])));
+ $info = escape_tags(trim($_POST['info']));
$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
`hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d,
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(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force");
+ proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
}
function _contact_update_profile($contact_id) {
}
-function contacts_content(&$a) {
+function contacts_content(App $a) {
$sort_type = 0;
$o = '';
nav_set_selected('contacts');
- if(! local_user()) {
+ if (! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
if($cmd === 'block') {
$r = _contact_block($contact_id, $orig_record[0]);
- if($r) {
+ if ($r) {
$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
}
if($cmd === 'ignore') {
$r = _contact_ignore($contact_id, $orig_record[0]);
- if($r) {
+ if ($r) {
$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
}
if($cmd === 'archive') {
$r = _contact_archive($contact_id, $orig_record[0]);
- if($r) {
+ if ($r) {
$archived = (($orig_record[0]['archive']) ? 0 : 1);
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
}
));
}
// Now check how the user responded to the confirmation query
- if($_REQUEST['canceled']) {
- if(x($_SESSION,'return_url'))
+ if ($_REQUEST['canceled']) {
+ if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']);
- else
+ }
+ else {
goaway('contacts');
+ }
}
_contact_drop($contact_id, $orig_record[0]);
info( t('Contact has been removed.') . EOL );
- if(x($_SESSION,'return_url'))
+ if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']);
- else
+ }
+ else {
goaway('contacts');
+ }
return; // NOTREACHED
}
- if($cmd === 'posts') {
+ if ($cmd === 'posts') {
return contact_posts($a, $contact_id);
}
}
$contact_id = $a->data['contact']['id'];
$contact = $a->data['contact'];
- $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),
- '$editselect' => $editselect,
+ '$baseurl' => App::get_baseurl(true),
));
$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
- '$baseurl' => $a->get_baseurl(true),
- '$editselect' => $editselect,
+ '$baseurl' => App::get_baseurl(true),
));
require_once('include/contact_selectors.php');
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"]);
+ $follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
// Load contactact related actions like hide, suggest, delete and others
$contact_actions = contact_actions($contact);
'$url' => $url,
'$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'],
- 'account_type' => (($contact['forum'] || $contact['prv']) ? t('Forum') : ''),
+ '$account_type' => account_type($contact),
'$location' => bbcode($contact["location"]),
'$location_label' => t("Location:"),
'$xmpp' => bbcode($contact["xmpp"]),
$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);
}
}
/**
* @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) {
$o .= $tab_str;
- $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 ($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
*/
$contact_actions['delete'] = array(
'label' => t('Delete'),
- 'url' => 'contacts/' . $contact['id'] . '/drop',
+ 'url' => 'contacts/' . $contact['id'] . '/drop',
'title' => t('Delete contact'),
'sel' => '',
'id' => 'delete',
projects / friendica.git / blobdiff