Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-11-22 01:23:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #723 from annando/fix-pumpio

Browse source 
Pumpio does connect now again.
This commit is contained in:
Hypolite Petovan 2018-08-29 14:29:18 -04:00 committed by GitHub
commit b0fdc767a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ifttt/ifttt.php
View file

@ -180,7 +180,7 @@ function ifttt_message($uid, $item)
//$_REQUEST['date'] = $item['date']; //$_REQUEST['date'] = $item['date'];
//$_REQUEST['uri'] = $item['url']; //$_REQUEST['uri'] = $item['url'];
if (strstr($item['url'], 'facebook.com')) { if (!empty($item['url']) && strstr($item['url'], 'facebook.com')) {
$hash = hash('ripemd128', $item['url']); $hash = hash('ripemd128', $item['url']);
$_REQUEST['extid'] = Protocol::FACEBOOK; $_REQUEST['extid'] = Protocol::FACEBOOK;
$_REQUEST['message_id'] = Item::newURI($uid, Protocol::FACEBOOK . ':' . $hash); $_REQUEST['message_id'] = Item::newURI($uid, Protocol::FACEBOOK . ':' . $hash);

28
pumpio/pumpio.php
View file

@ -138,9 +138,6 @@ function pumpio_registerclient(App $a, $host)
function pumpio_connect(App $a) function pumpio_connect(App $a)
{ {
// Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start();
// Define the needed keys // Define the needed keys
$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key'); $consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret'); $consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
@ -174,7 +171,7 @@ function pumpio_connect(App $a)
// Create a new instance of the oauth_client_class library. For this step, all we need to give the library is our // Create a new instance of the oauth_client_class library. For this step, all we need to give the library is our
// Consumer Key and Consumer Secret // Consumer Key and Consumer Secret
$client = new oauth_client_class; $client = new oauth_client_class;
$client->debug = 1; $client->debug = 0;
$client->server = ''; $client->server = '';
$client->oauth_version = '1.0a'; $client->oauth_version = '1.0a';
$client->request_token_url = 'https://'.$hostname.'/oauth/request_token'; $client->request_token_url = 'https://'.$hostname.'/oauth/request_token';
@ -202,7 +199,7 @@ function pumpio_connect(App $a)
if ($success) { if ($success) {
logger("pumpio_connect: authenticated"); logger("pumpio_connect: authenticated");
$o .= L10n::t("You are now authenticated to pumpio."); $o = L10n::t("You are now authenticated to pumpio.");
$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::t("return to the connector page").'</a>'; $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
} else { } else {
logger("pumpio_connect: could not connect"); logger("pumpio_connect: could not connect");
@ -361,20 +358,17 @@ function pumpio_settings_post(App $a, array &$b)
$host = trim($host); $host = trim($host);
$host = str_replace(["https://", "http://"], ["", ""], $host); $host = str_replace(["https://", "http://"], ["", ""], $host);
if (isset($_POST['pumpio'])) { PConfig::set(local_user(), 'pumpio', 'post' , defaults($_POST, 'pumpio', false));
PConfig::set(local_user(), 'pumpio', 'post' , intval($_POST['pumpio'])); PConfig::set(local_user(), 'pumpio', 'import' , defaults($_POST, 'pumpio_import', false));
PConfig::set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import']); PConfig::set(local_user(), 'pumpio', 'host' , $host);
PConfig::set(local_user(), 'pumpio', 'host' , $host); PConfig::set(local_user(), 'pumpio', 'user' , $user);
PConfig::set(local_user(), 'pumpio', 'user' , $user); PConfig::set(local_user(), 'pumpio', 'public' , defaults($_POST, 'pumpio_public', false));
PConfig::set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public']); PConfig::set(local_user(), 'pumpio', 'mirror' , defaults($_POST, 'pumpio_mirror', false));
PConfig::set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror']); PConfig::set(local_user(), 'pumpio', 'post_by_default', defaults($_POST, 'pumpio_bydefault', false));
PConfig::set(local_user(), 'pumpio', 'post_by_default', intval($_POST['pumpio_bydefault']));
if (!$_POST['pumpio_mirror']) { if (!empty($_POST['pumpio_mirror'])) {
PConfig::delete(local_user(), 'pumpio', 'lastdate'); PConfig::delete(local_user(), 'pumpio', 'lastdate');
}
} }
//header("Location: ".$a->get_baseurl()."/pumpio/connect");
} }
} }
} }

6
xmpp/xmpp.php
View file

@ -34,9 +34,9 @@ function xmpp_addon_settings_post()
return; return;
} }
PConfig::set(local_user(), 'xmpp', 'enabled', intval($_POST['xmpp_enabled'])); PConfig::set(local_user(), 'xmpp', 'enabled', defaults($_POST, 'xmpp_enabled', false));
PConfig::set(local_user(), 'xmpp', 'individual', intval($_POST['xmpp_individual'])); PConfig::set(local_user(), 'xmpp', 'individual', defaults($_POST, 'xmpp_individual', false));
PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy']); PConfig::set(local_user(), 'xmpp', 'bosh_proxy', defaults($_POST, 'xmpp_bosh_proxy', ''));
info(L10n::t('XMPP settings updated.') . EOL); info(L10n::t('XMPP settings updated.') . EOL);
} }