@ -12,6 +12,7 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
@ -114,7 +115,7 @@ function pumpio_registerclient(App $a, $host)
$params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png";
$params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect";
logger ("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
Logger::log ("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_HEADER, false);
@ -128,10 +129,10 @@ function pumpio_registerclient(App $a, $host)
if ($curl_info["http_code"] == "200") {
$values = json_decode($s);
logger ("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
Logger::log ("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
return $values;
}
logger ("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
Logger::log ("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
return false;
}
@ -144,7 +145,7 @@ function pumpio_connect(App $a)
$hostname = PConfig::get(local_user(), 'pumpio', 'host');
if ((($consumer_key == "") || ($consumer_secret == "")) & & ($hostname != "")) {
logger ("pumpio_connect: register client");
Logger::log ("pumpio_connect: register client");
$clientdata = pumpio_registerclient($a, $hostname);
PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
PConfig::set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
@ -152,11 +153,11 @@ function pumpio_connect(App $a)
$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
logger ("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
Logger::log ("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
}
if (($consumer_key == "") || ($consumer_secret == "")) {
logger ("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
Logger::log ("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
$o .= L10n::t("Unable to register the client at the pump.io server '%s'.", $hostname);
return $o;
@ -186,7 +187,7 @@ function pumpio_connect(App $a)
if (($success = $client->Initialize())) {
if (($success = $client->Process())) {
if (strlen($client->access_token)) {
logger ("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
Logger::log ("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token);
PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
}
@ -198,11 +199,11 @@ function pumpio_connect(App $a)
}
if ($success) {
logger ("pumpio_connect: authenticated");
Logger::log ("pumpio_connect: authenticated");
$o = L10n::t("You are now authenticated to pumpio.");
$o .= '< br / > < a href = "'.$a->getBaseURL().'/settings/connectors" > '.L10n::t("return to the connector page").'< / a > ';
} else {
logger ("pumpio_connect: could not connect");
Logger::log ("pumpio_connect: could not connect");
$o = 'Could not connect to pumpio. Refresh the page or try again later.';
}
@ -409,7 +410,7 @@ function pumpio_send(App $a, array &$b)
return;
}
logger ("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
Logger::log ("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
if ($b['parent'] != $b['id']) {
// Looking if its a reply to a pumpio post
@ -417,7 +418,7 @@ function pumpio_send(App $a, array &$b)
$orig_post = Item::selectFirst([], $condition);
if (!DBA::isResult($orig_post)) {
logger ("pumpio_send: no pumpio post ".$b["parent"]);
Logger::log ("pumpio_send: no pumpio post ".$b["parent"]);
return;
} else {
$iscomment = true;
@ -427,7 +428,7 @@ function pumpio_send(App $a, array &$b)
$receiver = pumpio_getreceiver($a, $b);
logger ("pumpio_send: receiver ".print_r($receiver, true));
Logger::log ("pumpio_send: receiver ".print_r($receiver, true));
if (!count($receiver) & & ($b['private'] || !strstr($b['postopts'], 'pumpio'))) {
return;
@ -559,13 +560,13 @@ function pumpio_send(App $a, array &$b)
}
$post_id = $user->object->id;
logger ('pumpio_send '.$username.': success '.$post_id);
Logger::log ('pumpio_send '.$username.': success '.$post_id);
if ($post_id & & $iscomment) {
logger ('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
Logger::log ('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);