friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6186 from MrPetovan/bug/6081-fix-ostatus-subscribe 

Fix OStatus Subscribe fatal error
This commit is contained in:
Michael Vogel 2018-11-23 07:09:00 +01:00 committed by GitHub
parent 2b7f57453b 8d7fb35463
commit a58ee97ba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
mod/ostatus_subscribe.php
View File

@ -2,6 +2,7 @@
/** /**
* @file mod/ostatus_subscribe.php * @file mod/ostatus_subscribe.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
@ -11,15 +12,15 @@ use Friendica\Model\Contact;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Util\Network; use Friendica\Util\Network;
function ostatus_subscribe_content(App $a) { function ostatus_subscribe_content(App $a)
{
if (! local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
$a->internalRedirect('ostatus_subscribe'); $a->internalRedirect('ostatus_subscribe');
// NOTREACHED // NOTREACHED
} }
$o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>"; $o = '<h2>' . L10n::t('Subscribing to OStatus contacts') . '</h2>';
$uid = local_user(); $uid = local_user();
@ -27,42 +28,46 @@ function ostatus_subscribe_content(App $a) {
$counter = intval($_REQUEST['counter']); $counter = intval($_REQUEST['counter']);
if (PConfig::get($uid, "ostatus", "legacy_friends") == "") { if (PConfig::get($uid, 'ostatus', 'legacy_friends') == '') {
if ($_REQUEST["url"] == "") { if ($_REQUEST['url'] == '') {
PConfig::delete($uid, "ostatus", "legacy_contact"); PConfig::delete($uid, 'ostatus', 'legacy_contact');
return $o.L10n::t("No contact provided."); return $o . L10n::t('No contact provided.');
} }
$contact = Probe::uri($_REQUEST["url"]); $contact = Probe::uri($_REQUEST['url']);
if (!$contact) { if (!$contact) {
PConfig::delete($uid, "ostatus", "legacy_contact"); PConfig::delete($uid, 'ostatus', 'legacy_contact');
return $o.L10n::t("Couldn't fetch information for contact."); return $o . L10n::t('Couldn\'t fetch information for contact.');
} }
$api = $contact["baseurl"]."/api/"; $api = $contact['baseurl'] . '/api/';
// Fetching friends // Fetching friends
$curlResult = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]); $curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
if (!$curlResult->isSuccess()) { if (!$curlResult->isSuccess()) {
PConfig::delete($uid, "ostatus", "legacy_contact"); PConfig::delete($uid, 'ostatus', 'legacy_contact');
return $o.L10n::t("Couldn't fetch friends for contact."); return $o . L10n::t('Couldn\'t fetch friends for contact.');
} }
PConfig::set($uid, "ostatus", "legacy_friends", $curlResult->getBody()); PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
} }
$friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends")); $friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
if (empty($friends)) {
$friends = [];
}
$total = sizeof($friends); $total = sizeof($friends);
if ($counter >= $total) { if ($counter >= $total) {
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">'; $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/settings/connectors">';
PConfig::delete($uid, "ostatus", "legacy_friends"); PConfig::delete($uid, 'ostatus', 'legacy_friends');
PConfig::delete($uid, "ostatus", "legacy_contact"); PConfig::delete($uid, 'ostatus', 'legacy_contact');
$o .= L10n::t("Done"); $o .= L10n::t('Done');
return $o; return $o;
} }
@ -70,25 +75,25 @@ function ostatus_subscribe_content(App $a) {
$url = $friend->statusnet_profile_url; $url = $friend->statusnet_profile_url;
$o .= "<p>".$counter."/".$total.": ".$url; $o .= '<p>' . $counter . '/' . $total . ': ' . $url;
$curlResult = Probe::uri($url); $curlResult = Probe::uri($url);
if ($curlResult["network"] == Protocol::OSTATUS) { if ($curlResult['network'] == Protocol::OSTATUS) {
$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS); $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
if ($result["success"]) { if ($result['success']) {
$o .= " - ".L10n::t("success"); $o .= ' - ' . L10n::t('success');
} else { } else {
$o .= " - ".L10n::t("failed"); $o .= ' - ' . L10n::t('failed');
} }
} else { } else {
$o .= " - ".L10n::t("ignored"); $o .= ' - ' . L10n::t('ignored');
} }
$o .= "</p>"; $o .= '</p>';
$o .= "<p>".L10n::t("Keep this window open until done.")."</p>"; $o .= '<p>' . L10n::t('Keep this window open until done.') . '</p>';
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">'; $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/ostatus_subscribe?counter=' . $counter . '">';
return $o; return $o;
} }