harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more separation of complex code into separate functions

Browse Source
This commit is contained in:
zotlabs 2018-02-01 15:09:51 -08:00
parent feae454481
commit c92bb6176a
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Zotlabs/Module/Connedit.php
View File

@ -826,27 +826,10 @@ class Connedit extends \Zotlabs\Web\Controller {
} }
} }
$locstr = ''; $locstr = locations_by_netid($contact['xchan_hash']);
if(! $locstr)
$locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s'
and hubloc_deleted = 0 and site_dead = 0",
dbesc($contact['xchan_hash'])
);
if($locs) {
foreach($locs as $l) {
if(!($l['location']))
continue;
if(strpos($locstr,$l['location']) !== false)
continue;
if(strlen($locstr))
$locstr .= ', ';
$locstr .= $l['location'];
}
}
else
$locstr = $contact['xchan_url']; $locstr = $contact['xchan_url'];
$clone_warn = ''; $clone_warn = '';
$clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false); $clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
if(! $clonable) { if(! $clonable) {

32
include/hubloc.php
View File

@ -257,6 +257,38 @@ function hubloc_mark_as_down($posturl) {
} }
/**
* @brief return comma separated string of non-dead clone locations (net addresses) for a given netid
*
* @param string $netid network identity (typically xchan_hash or hubloc_hash)
* @return string
*/
function locations_by_netid($netid) {
$strloc = '';
$locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_deleted = 0 and site_dead = 0",
dbesc($netid)
);
if($locs) {
foreach($locs as $l) {
if(!($l['location']))
continue;
if(strpos($strloc,$l['location']) !== false)
continue;
if(strlen($strloc))
$strloc .= ', ';
$strloc .= $l['location'];
}
}
return $strloc;
}
function ping_site($url) { function ping_site($url) {