aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-11 20:53:13 -0700
committerzotlabs <mike@macgirvin.com>2016-10-11 20:53:13 -0700
commitf56b4773cbb84950cd9ff07f920dd738c3ea5dbc (patch)
treed612734da8d63dd452538c0115b7194b695f8208 /Zotlabs/Module
parent1a4a8f1ef7ba12f5b3eea6f6b2d162380a16fe17 (diff)
downloadvolse-hubzilla-f56b4773cbb84950cd9ff07f920dd738c3ea5dbc.tar.gz
volse-hubzilla-f56b4773cbb84950cd9ff07f920dd738c3ea5dbc.tar.bz2
volse-hubzilla-f56b4773cbb84950cd9ff07f920dd738c3ea5dbc.zip
When importing a channel from another server, try to auto-discover the best available api path.
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Import.php24
1 files changed, 14 insertions, 10 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 9574de07c..ccad4eace 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -77,23 +77,27 @@ class Import extends \Zotlabs\Web\Controller {
$channelname = substr($old_address,0,strpos($old_address,'@'));
$servername = substr($old_address,strpos($old_address,'@')+1);
-
- $scheme = 'https://';
- $api_path = '/api/red/channel/export/basic?f=&channel=' . $channelname;
+
+ $api_path = probe_api_path($servername);
+ if(! $api_path) {
+ notice( t('Unable to download data from old server') . EOL);
+ return;
+ }
+
+ $api_path .= 'channel/export/basic?f=&channel=' . $channelname;
if($import_posts)
$api_path .= '&posts=1';
$binary = false;
$redirects = 0;
$opts = array('http_auth' => $email . ':' . $password);
- $url = $scheme . $servername . $api_path;
- $ret = z_fetch_url($url, $binary, $redirects, $opts);
- if(! $ret['success'])
- $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts);
- if($ret['success'])
+ $ret = z_fetch_url($api_path, $binary, $redirects, $opts);
+ if($ret['success']) {
$data = $ret['body'];
- else
+ }
+ else {
notice( t('Unable to download data from old server') . EOL);
-
+ return;
+ }
}
if(! $data) {