return '';
}
+ if (function_exists("apc_delete")) {
+ $toDelete = new APCIterator('user', APC_ITER_VALUE);
+ apc_delete($toDelete);
+ }
+
if (isset($a->argv[1]))
switch ($a->argv[1]) {
case "connect":
return $o;
}
-function pumpio_registerclient($a, $host) {
+function pumpio_registerclient(&$a, $host) {
$url = "https://".$host."/api/client/register";
$params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png";
$params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect";
+ logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
+
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
if ($curl_info["http_code"] == "200") {
$values = json_decode($s);
+ logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
return($values);
}
+ logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
return(false);
+
}
-function pumpio_connect($a) {
+function pumpio_connect(&$a) {
// Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start();
$hostname = get_pconfig(local_user(), 'pumpio','host');
if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) {
+ logger("pumpio_connect: register client");
$clientdata = pumpio_registerclient($a, $hostname);
set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id);
set_pconfig(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret);
$consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key');
$consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret');
+
+ logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
}
- if (($consumer_key == "") OR ($consumer_secret == ""))
- return;
+ if (($consumer_key == "") OR ($consumer_secret == "")) {
+ logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
+
+ $o .= sprintf(t("Unable to register the client at the pump.io server '%s'."), $hostname);
+ return($o);
+ }
// The callback URL is the script that gets called after the user authenticates with pumpio
$callback_url = $a->get_baseurl()."/pumpio/connect";
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);
set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token);
set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
}
$o = 'Could not connect to pumpio. Refresh the page or try again later.';
if($success) {
+ logger("pumpio_connect: authenticated");
$o .= t("You are now authenticated to pumpio.");
$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
+ } else {
+ logger("pumpio_connect: could not connect");
+ $o = 'Could not connect to pumpio. Refresh the page or try again later.';
}
return($o);
$enabled = get_pconfig(local_user(),'pumpio','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
$def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the existing form */
- $s .= '<div class="settings-block">';
- $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+ $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+ $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+ $s .= '</span>';
+ $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
+ $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+ $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+ $s .= '</span>';
$s .= '<div id="pumpio-username-wrapper">';
$s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
/* provide a submit button */
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
}
set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
+
+ header("Location: ".$a->get_baseurl()."/pumpio/connect");
}
}
}
return;
}
- logger("pumpio_send: parameter ".print_r($b, true));
+ logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
if($b['parent'] != $b['id']) {
// Looking if its a reply to a pumpio post
if ($title != '')
$title = "<h4>".$title."</h4>";
- $content = bbcode($b['body'], false, false);
+ $content = bbcode($b['body'], false, false, 4);
// Enhance the way, videos are displayed
- $content = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
- $content = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
- $content = preg_replace('/<a.*?href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
- $content = preg_replace('/<a.*?href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+ $content = preg_replace('/<a href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
$URLSearchString = "^\[\]";
$content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content);
logger('pumpio_send '.$username.': success '.$post_id);
if($post_id AND $iscomment) {
logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
- q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+ q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
dbesc($post_id),
intval($b['id'])
);
}
}
-function pumpio_action($a, $uid, $uri, $action, $content) {
+function pumpio_action(&$a, $uid, $uri, $action, $content) {
// Don't do likes and other stuff if you don't import the timeline
if (!get_pconfig($uid,'pumpio','import'))
}
-function pumpio_cron($a,$b) {
+function pumpio_cron(&$a,$b) {
$last = get_config('pumpio','last_poll');
$poll_interval = intval(get_config('pumpio','poll_interval'));
set_config('pumpio','last_poll', time());
}
-function pumpio_fetchtimeline($a, $uid) {
+function pumpio_fetchtimeline(&$a, $uid) {
$ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
$otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
$_REQUEST["body"] = html2bbcode($post->object->content);
- if ($post->object->fullImage->url != "")
- $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+ // To-Do: Picture has to be cached and stored locally
+ if ($post->object->fullImage->url != "") {
+ if ($post->object->fullImage->pump_io->proxyURL != "")
+ $_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"];
+ else
+ $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+ }
logger('pumpio: posting for user '.$uid);
function pumpio_get_contact($uid, $contact) {
+ $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+ dbesc(normalise_link($contact->url)));
+
+ if (count($r) == 0)
+ q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
+ dbesc(normalise_link($contact->url)),
+ dbesc($contact->displayName),
+ dbesc($contact->preferredUsername),
+ dbesc($contact->image->url));
+ else
+ q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
+ dbesc($contact->displayName),
+ dbesc($contact->preferredUsername),
+ dbesc($contact->image->url),
+ dbesc(normalise_link($contact->url)));
+
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($uid), dbesc($contact->url));
`name-date` = '%s',
`uri-date` = '%s',
`avatar-date` = '%s'
- WHERE `id` = %d LIMIT 1
+ WHERE `id` = %d
",
dbesc($photos[0]),
dbesc($photos[1]),
`micro` = '%s',
`name-date` = '%s',
`uri-date` = '%s',
- `avatar-date` = '%s'
- WHERE `id` = %d LIMIT 1
+ `avatar-date` = '%s',
+ `name` = '%s',
+ `nick` = '%s'
+ WHERE `id` = %d
",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
+ dbesc($contact->displayName),
+ dbesc($contact->preferredUsername),
intval($r[0]['id'])
);
}
return drop_item($r[0]["id"], $false);
}
-function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) {
+function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) {
require_once('include/items.php');
+ require_once('include/html2bbcode.php');
if (($post->verb == "like") OR ($post->verb == "favorite"))
- return pumpio_dolike(&$a, $uid, $self, $post, $own_id);
+ return pumpio_dolike($a, $uid, $self, $post, $own_id);
if (($post->verb == "unlike") OR ($post->verb == "unfavorite"))
- return pumpio_dounlike(&$a, $uid, $self, $post, $own_id);
+ return pumpio_dounlike($a, $uid, $self, $post, $own_id);
if ($post->verb == "delete")
- return pumpio_dodelete(&$a, $uid, $self, $post, $own_id);
+ return pumpio_dodelete($a, $uid, $self, $post, $own_id);
if ($post->verb != "update") {
// Two queries for speed issues
}
}
+ $reply = new stdClass;
$reply->verb = "note";
$reply->cc = $post->cc;
$reply->to = $post->to;
+ $reply->object = new stdClass;
$reply->object->objectType = $post->object->inReplyTo->objectType;
$reply->object->content = $post->object->inReplyTo->content;
$reply->object->id = $post->object->inReplyTo->id;
$reply->actor = $post->object->inReplyTo->author;
$reply->url = $post->object->inReplyTo->url;
+ $reply->generator = new stdClass;
$reply->generator->displayName = "pumpio";
$reply->published = $post->object->inReplyTo->published;
$reply->received = $post->object->inReplyTo->updated;
$reply->url = $post->object->inReplyTo->url;
- pumpio_dopost(&$a, $client, $uid, $self, $reply, $own_id);
+ pumpio_dopost($a, $client, $uid, $self, $reply, $own_id);
$postarray['parent-uri'] = $post->object->inReplyTo->id;
}
}
if ($post->verb == "share") {
- $postarray['body'] = "[share author='".$post->object->author->displayName.
- "' profile='".$post->object->author->url.
- "' avatar='".$post->object->author->image->url.
- "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+ if (!intval(get_config('system','wall-to-wall_share'))) {
+ $postarray['body'] = "[share author='".$post->object->author->displayName.
+ "' profile='".$post->object->author->url.
+ "' avatar='".$post->object->author->image->url.
+ "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+ } else {
+ // Let shares look like wall-to-wall posts
+ $postarray['author-name'] = $post->object->author->displayName;
+ $postarray['author-link'] = $post->object->author->url;
+ $postarray['author-avatar'] = $post->object->author->image->url;
+ }
}
if (trim($postarray['body']) == "")
if ($post->object->objectType == "comment") {
- pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
+ if ($threadcompletion)
+ pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
$user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
intval($uid)
return $top_item;
}
-function pumpio_fetchinbox($a, $uid) {
+function pumpio_fetchinbox(&$a, $uid) {
$ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
$url .= '?since='.urlencode($last_id);
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
- $posts = array_reverse($user->items);
- if (count($posts))
- foreach ($posts as $post) {
- $last_id = $post->id;
- pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id);
- }
+ if ($user->items) {
+ $posts = array_reverse($user->items);
+
+ if (count($posts))
+ foreach ($posts as $post) {
+ $last_id = $post->id;
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
+ }
+ }
set_pconfig($uid,'pumpio','last_id', $last_id);
}
-function pumpio_getallusers($a, $uid) {
+function pumpio_getallusers(&$a, $uid) {
$ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
$otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
if(! count($r))
continue;
- $user = $r[0];
+ $userdata = $r[0];
+
+ //logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
- $oauth_token = get_pconfig($user['uid'], "pumpio", "oauth_token");
- $oauth_token_secret = get_pconfig($user['uid'], "pumpio", "oauth_token_secret");
- $consumer_key = get_pconfig($user['uid'], "pumpio","consumer_key");
- $consumer_secret = get_pconfig($user['uid'], "pumpio","consumer_secret");
+ $oauth_token = get_pconfig($userdata['uid'], "pumpio", "oauth_token");
+ $oauth_token_secret = get_pconfig($userdata['uid'], "pumpio", "oauth_token_secret");
+ $consumer_key = get_pconfig($userdata['uid'], "pumpio","consumer_key");
+ $consumer_secret = get_pconfig($userdata['uid'], "pumpio","consumer_secret");
- $host = get_pconfig($user['uid'], "pumpio", "host");
- $user = get_pconfig($user['uid'], "pumpio", "user");
+ $host = get_pconfig($userdata['uid'], "pumpio", "host");
+ $user = get_pconfig($userdata['uid'], "pumpio", "user");
$success = false;
logger('pumpio_queue: send '.$username.': success '.$post_id);
if($post_id AND $iscomment) {
logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
- q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+ q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
dbesc($post_id),
intval($z['item'])
);
} else
logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true));
} else
- logger("pumpio_queue: Error getting tokens for user ".$user['uid']);
+ logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']);
if (!$success) {
logger('pumpio_queue: delayed');
}
}
-function pumpio_getreceiver($a, $b) {
+function pumpio_getreceiver(&$a, $b) {
$receiver = array();
return $receiver;
}
-function pumpio_fetchallcomments($a, $uid, $id) {
+function pumpio_fetchallcomments(&$a, $uid, $id) {
$ckey = get_pconfig($uid, 'pumpio', 'consumer_key');
$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
$otoken = get_pconfig($uid, 'pumpio', 'oauth_token');
$post->object = $item;
logger("pumpio_fetchallcomments: posting comment ".$post->object->id);
- pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id);
+ pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false);
}
}
projects / friendica-addons.git / blobdiff