friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Pumpio does connect now again.

pull/723/head
Michael 2018-08-29 17:09:19 +00:00
parent 6237bb78c8
commit 5e86fb1b9e
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pumpio/pumpio.php
View File

@ -139,7 +139,8 @@ 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 // Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start(); // Currently disabled, since a session is already running
//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');
@ -174,7 +175,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 +203,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,21 +362,18 @@ 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' , $_POST['pumpio_public']); PConfig::set(local_user(), 'pumpio', 'public' , defaults($_POST, 'pumpio_public', false));
PConfig::set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror']); PConfig::set(local_user(), 'pumpio', 'mirror' , defaults($_POST, 'pumpio_mirror', false));
PConfig::set(local_user(), 'pumpio', 'post_by_default', intval($_POST['pumpio_bydefault'])); PConfig::set(local_user(), 'pumpio', 'post_by_default', defaults($_POST, 'pumpio_bydefault', false));
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");
}
} }
} }