aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-01 15:09:51 -0800
committerzotlabs <mike@macgirvin.com>2018-02-01 15:09:51 -0800
commitc92bb6176a79ef575c9a9b5dec8fde7034c6421c (patch)
treee5d7ab89470466279dd41b1ae4d3a58d85396cb3 /Zotlabs/Module
parentfeae454481457497cbe5cfffe0c83c297170172f (diff)
downloadvolse-hubzilla-c92bb6176a79ef575c9a9b5dec8fde7034c6421c.tar.gz
volse-hubzilla-c92bb6176a79ef575c9a9b5dec8fde7034c6421c.tar.bz2
volse-hubzilla-c92bb6176a79ef575c9a9b5dec8fde7034c6421c.zip
more separation of complex code into separate functions
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Connedit.php23
1 files changed, 3 insertions, 20 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 8288886cd..e23a751d9 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -826,27 +826,10 @@ class Connedit extends \Zotlabs\Web\Controller {
}
}
- $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 = locations_by_netid($contact['xchan_hash']);
+ if(! $locstr)
$locstr = $contact['xchan_url'];
-
+
$clone_warn = '';
$clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
if(! $clonable) {