Coding convention continued:
- added curly braces - added spaces between if/foreach and brace - made code block look nicer (spaces added, tabs replaced by space) - added TODO Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
b33a28c082
commit
7c8e834546
1 changed files with 39 additions and 32 deletions
|
@ -19,23 +19,27 @@ function common_content(App &$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($cmd !== 'loc' && $cmd != 'rem')
|
if ($cmd !== 'loc' && $cmd != 'rem') {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(! $uid)
|
if (! $uid) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if($cmd === 'loc' && $cid) {
|
if ($cmd === 'loc' && $cid) {
|
||||||
$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
intval($cid),
|
intval($cid),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
/// @TODO Handle $c with dbm::is_result()
|
||||||
$a->page['aside'] = "";
|
$a->page['aside'] = "";
|
||||||
profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
|
profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
|
||||||
} else {
|
} else {
|
||||||
$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
/// @TODO Handle $c with dbm::is_result()
|
||||||
|
|
||||||
$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
|
$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
|
||||||
'$name' => htmlentities($c[0]['name']),
|
'$name' => htmlentities($c[0]['name']),
|
||||||
|
@ -43,8 +47,9 @@ function common_content(App &$a) {
|
||||||
'url' => 'contacts/' . $cid
|
'url' => 'contacts/' . $cid
|
||||||
));
|
));
|
||||||
|
|
||||||
if(! x($a->page,'aside'))
|
if (! x($a->page,'aside')) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
|
}
|
||||||
$a->page['aside'] .= $vcard_widget;
|
$a->page['aside'] .= $vcard_widget;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,29 +75,29 @@ function common_content(App &$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($cid == 0 && $zcid == 0) {
|
||||||
|
|
||||||
if($cid == 0 && $zcid == 0)
|
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($cid) {
|
||||||
if($cid)
|
|
||||||
$t = count_common_friends($uid, $cid);
|
$t = count_common_friends($uid, $cid);
|
||||||
else
|
} else {
|
||||||
$t = count_common_friends_zcid($uid, $zcid);
|
$t = count_common_friends_zcid($uid, $zcid);
|
||||||
|
}
|
||||||
|
|
||||||
if(count($t))
|
if (count($t)) {
|
||||||
$a->set_pager_total($t);
|
$a->set_pager_total($t);
|
||||||
else {
|
} else {
|
||||||
notice( t('No contacts in common.') . EOL);
|
notice( t('No contacts in common.') . EOL);
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if($cid)
|
if ($cid) {
|
||||||
$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
|
$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||||
else
|
} else {
|
||||||
$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
|
$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (! dbm::is_result($r)) {
|
if (! dbm::is_result($r)) {
|
||||||
|
@ -106,39 +111,41 @@ function common_content(App &$a) {
|
||||||
//get further details of the contact
|
//get further details of the contact
|
||||||
$contact_details = get_contact_details_by_url($rr['url'], $uid);
|
$contact_details = get_contact_details_by_url($rr['url'], $uid);
|
||||||
|
|
||||||
// $rr[id] is needed to use contact_photo_menu()
|
// $rr['id'] is needed to use contact_photo_menu()
|
||||||
$rr[id] = $rr[cid];
|
/// @TODO Adding '/" here avoids E_NOTICE on missing constants
|
||||||
|
$rr['id'] = $rr['cid'];
|
||||||
|
|
||||||
$photo_menu = '';
|
$photo_menu = '';
|
||||||
$photo_menu = contact_photo_menu($rr);
|
$photo_menu = contact_photo_menu($rr);
|
||||||
|
|
||||||
$entry = array(
|
$entry = array(
|
||||||
'url' => $rr['url'],
|
'url' => $rr['url'],
|
||||||
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
|
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
|
||||||
'name' => $contact_details['name'],
|
'name' => $contact_details['name'],
|
||||||
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
|
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
|
||||||
'img_hover' => htmlentities($contact_details['name']),
|
'img_hover' => htmlentities($contact_details['name']),
|
||||||
'details' => $contact_details['location'],
|
'details' => $contact_details['location'],
|
||||||
'tags' => $contact_details['keywords'],
|
'tags' => $contact_details['keywords'],
|
||||||
'about' => $contact_details['about'],
|
'about' => $contact_details['about'],
|
||||||
'account_type' => account_type($contact_details),
|
'account_type' => account_type($contact_details),
|
||||||
'network' => network_to_name($contact_details['network'], $contact_details['url']),
|
'network' => network_to_name($contact_details['network'], $contact_details['url']),
|
||||||
'photo_menu' => $photo_menu,
|
'photo_menu' => $photo_menu,
|
||||||
'id' => ++$id,
|
'id' => ++$id,
|
||||||
);
|
);
|
||||||
$entries[] = $entry;
|
$entries[] = $entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($cmd === 'loc' && $cid && $uid == local_user()) {
|
if ($cmd === 'loc' && $cid && $uid == local_user()) {
|
||||||
$tab_str = contacts_tab($a, $cid, 4);
|
$tab_str = contacts_tab($a, $cid, 4);
|
||||||
} else
|
} else {
|
||||||
$title = t('Common Friends');
|
$title = t('Common Friends');
|
||||||
|
}
|
||||||
|
|
||||||
$tpl = get_markup_template('viewcontact_template.tpl');
|
$tpl = get_markup_template('viewcontact_template.tpl');
|
||||||
|
|
||||||
$o .= replace_macros($tpl,array(
|
$o .= replace_macros($tpl,array(
|
||||||
'$title' => $title,
|
'$title' => $title,
|
||||||
'$tab_str' => $tab_str,
|
'$tab_str' => $tab_str,
|
||||||
'$contacts' => $entries,
|
'$contacts' => $entries,
|
||||||
'$paginate' => paginate($a),
|
'$paginate' => paginate($a),
|
||||||
));
|
));
|
||||||
|
|
Loading…
Reference in a new issue