Merge pull request #1400 from annando/1502-contacts-in-scrape
"contacts" field in scrape/noscrape
This commit is contained in:
commit
7d7096f489
14
boot.php
14
boot.php
|
@ -1678,8 +1678,19 @@ if(! function_exists('profile_sidebar')) {
|
||||||
|
|
||||||
if (!$block){
|
if (!$block){
|
||||||
$contact_block = contact_block();
|
$contact_block = contact_block();
|
||||||
}
|
|
||||||
|
|
||||||
|
if(is_array($a->profile) AND !$a->profile['hide-friends']) {
|
||||||
|
$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
|
||||||
|
AND `network` IN ('%s', '%s', '%s', '')",
|
||||||
|
intval($profile['uid']),
|
||||||
|
dbesc(NETWORK_DFRN),
|
||||||
|
dbesc(NETWORK_DIASPORA),
|
||||||
|
dbesc(NETWORK_OSTATUS)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$contacts = intval($r[0]['total']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$p = array();
|
$p = array();
|
||||||
foreach($profile as $k => $v) {
|
foreach($profile as $k => $v) {
|
||||||
|
@ -1704,6 +1715,7 @@ if(! function_exists('profile_sidebar')) {
|
||||||
'$homepage' => $homepage,
|
'$homepage' => $homepage,
|
||||||
'$about' => $about,
|
'$about' => $about,
|
||||||
'$network' => t('Network:'),
|
'$network' => t('Network:'),
|
||||||
|
'$contacts' => $contacts,
|
||||||
'$diaspora' => $diaspora,
|
'$diaspora' => $diaspora,
|
||||||
'$contact_block' => $contact_block,
|
'$contact_block' => $contact_block,
|
||||||
));
|
));
|
||||||
|
|
|
@ -31,6 +31,18 @@ function noscrape_init(&$a) {
|
||||||
'tags' => $keywords
|
'tags' => $keywords
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if(is_array($a->profile) AND !$a->profile['hide-friends']) {
|
||||||
|
$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
|
||||||
|
AND `network` IN ('%s', '%s', '%s', '')",
|
||||||
|
intval($a->profile['uid']),
|
||||||
|
dbesc(NETWORK_DFRN),
|
||||||
|
dbesc(NETWORK_DIASPORA),
|
||||||
|
dbesc(NETWORK_OSTATUS)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$json_info["contacts"] = intval($r[0]['total']);
|
||||||
|
}
|
||||||
|
|
||||||
//These are optional fields.
|
//These are optional fields.
|
||||||
$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
|
$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
|
||||||
foreach($profile_fields as $field)
|
foreach($profile_fields as $field)
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
|
|
||||||
{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
|
{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
|
||||||
|
|
||||||
|
{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
|
||||||
|
|
||||||
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
|
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
|
||||||
|
|
||||||
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
|
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
|
||||||
|
|
|
@ -40,6 +40,8 @@
|
||||||
|
|
||||||
{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
|
{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
|
||||||
|
|
||||||
|
{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
|
||||||
|
|
||||||
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
|
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
|
||||||
|
|
||||||
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
|
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user