Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 09:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/friendica/red

Browse source
This commit is contained in:
Olivier Migeot 2013-11-27 14:03:55 +01:00
commit c3c2ff6cdb
2 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
include/zot.php
View file

@ -18,33 +18,20 @@ function zot_new_uid($channel_nick) {
/**
*
* Given an array of zot hashes, return all distinct hubs
* If primary is true, return only primary hubs
* Result is ordered by url to assist in batching.
* Return only the first primary hub as there should only be one.
* @function zot_get_hublocs($hash)
* Given a zot hash, return all distinct hubs
* @param string $hash - xchan_hash
* @retuns array
*
*/
function zot_get_hubloc($arr,$primary = false) {
function zot_get_hublocs($hash) {
$tmp = '';
if(is_array($arr)) {
foreach($arr as $e) {
if(strlen($tmp))
$tmp .= ',';
$tmp .= "'" . dbesc($e) . "'" ;
}
}
if(! strlen($tmp))
return array();
$sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" );
$limit = (($primary) ? " limit 1 " : "");
return q("select * from hubloc where hubloc_hash in ( $tmp ) $sql_extra order by hubloc_url $limit");
$ret = q("select * from hubloc where hubloc_hash = '%s' group by hubloc_url ",
dbesc($hash)
);
return $ret;
}
/*

2
mod/zfinger.php
View file

@ -164,7 +164,7 @@ function zfinger_init(&$a) {
$ret['locations'] = array();
$x = zot_get_hubloc(array($e['channel_hash']));
$x = zot_get_hublocs($e['channel_hash']);
if($x && count($x)) {
foreach($x as $hub) {
if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) {