X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=8e194f85a0406ec61931a2e2fa1f22b542bbbe54;hp=cfa60e0eaed695e131e6285af26aabc1f57af8ab;hb=29cf1539a7c614d9b39e2f9a99cce64a2992d984;hpb=edbf31826293174ff4f20a8597dd49bbc06ddd4a diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index cfa60e0e..8e194f85 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -5,35 +5,48 @@ * Version: 0.2 * Author: Michael Vogel */ -require('addon/pumpio/oauth/http.php'); -require('addon/pumpio/oauth/oauth_client.php'); -require_once('include/enotify.php'); -require_once('include/socgraph.php'); -require_once("include/Photo.php"); -require_once("mod/share.php"); + +use Friendica\Core\Addon; +use Friendica\Core\Config; +use Friendica\Core\L10n; +use Friendica\Core\PConfig; +use Friendica\Core\Worker; +use Friendica\Model\Contact; +use Friendica\Model\GContact; +use Friendica\Model\Group; +use Friendica\Model\Item; +use Friendica\Model\Queue; +use Friendica\Util\Network; +use Friendica\Model\User; +use Friendica\Util\DateTimeFormat; + +require 'addon/pumpio/oauth/http.php'; +require 'addon/pumpio/oauth/oauth_client.php'; +require_once 'include/enotify.php'; +require_once "mod/share.php"; define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes function pumpio_install() { - register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - register_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + Addon::registerHook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + Addon::registerHook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + Addon::registerHook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + Addon::registerHook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + Addon::registerHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + Addon::registerHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + Addon::registerHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + Addon::registerHook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_uninstall() { - unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - unregister_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + Addon::unregisterHook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + Addon::unregisterHook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + Addon::unregisterHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + Addon::unregisterHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + Addon::unregisterHook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_module() {} @@ -41,7 +54,7 @@ function pumpio_module() {} function pumpio_content(&$a) { if(! local_user()) { - notice( t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return ''; } @@ -64,8 +77,8 @@ function pumpio_content(&$a) { } function pumpio_check_item_notification($a, &$notification_data) { - $hostname = get_pconfig($notification_data["uid"], 'pumpio','host'); - $username = get_pconfig($notification_data["uid"], "pumpio", "user"); + $hostname = PConfig::get($notification_data["uid"], 'pumpio','host'); + $username = PConfig::get($notification_data["uid"], "pumpio", "user"); $notification_data["profiles"][] = "https://".$hostname."/".$username; } @@ -75,9 +88,9 @@ function pumpio_registerclient(&$a, $host) { $url = "https://".$host."/api/client/register"; - $params = array(); + $params = []; - $application_name = get_config('pumpio', 'application_name'); + $application_name = Config::get('pumpio', 'application_name'); if ($application_name == "") $application_name = $a->get_hostname(); @@ -118,26 +131,26 @@ function pumpio_connect(&$a) { session_start(); // Define the needed keys - $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key'); - $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret'); - $hostname = get_pconfig(local_user(), 'pumpio','host'); + $consumer_key = PConfig::get(local_user(), 'pumpio','consumer_key'); + $consumer_secret = PConfig::get(local_user(), 'pumpio','consumer_secret'); + $hostname = PConfig::get(local_user(), 'pumpio','host'); - if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) { + if ((($consumer_key == "") || ($consumer_secret == "")) && ($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); + PConfig::set(local_user(), 'pumpio','consumer_key', $clientdata->client_id); + PConfig::set(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'); + $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); } - if (($consumer_key == "") OR ($consumer_secret == "")) { + if (($consumer_key == "") || ($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); + $o .= L10n::t("Unable to register the client at the pump.io server '%s'.", $hostname); return($o); } @@ -147,7 +160,7 @@ function pumpio_connect(&$a) { // Let's begin. First we need a Request Token. The request token is required to send the user // to pumpio's login page. - // Create a new instance of the TumblrOAuth 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 $client = new oauth_client_class; $client->debug = 1; @@ -166,8 +179,8 @@ function pumpio_connect(&$a) { 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); + PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token); + PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret); } } $success = $client->Finalize($success); @@ -177,8 +190,8 @@ function pumpio_connect(&$a) { if($success) { logger("pumpio_connect: authenticated"); - $o .= t("You are now authenticated to pumpio."); - $o .= '
'.t("return to the connector page").''; + $o .= L10n::t("You are now authenticated to pumpio."); + $o .= '
'.L10n::t("return to the connector page").''; } else { logger("pumpio_connect: could not connect"); $o = 'Could not connect to pumpio. Refresh the page or try again later.'; @@ -191,12 +204,12 @@ function pumpio_jot_nets(&$a,&$b) { if(! local_user()) return; - $pumpio_post = get_pconfig(local_user(),'pumpio','post'); + $pumpio_post = PConfig::get(local_user(),'pumpio','post'); if(intval($pumpio_post) == 1) { - $pumpio_defpost = get_pconfig(local_user(),'pumpio','post_by_default'); + $pumpio_defpost = PConfig::get(local_user(),'pumpio','post_by_default'); $selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' - . t('Post to pumpio') . '
'; + . L10n::t('Post to pumpio') . ''; } } @@ -212,83 +225,83 @@ function pumpio_settings(&$a,&$s) { /* Get the current state of our config variables */ - $import_enabled = get_pconfig(local_user(),'pumpio','import'); + $import_enabled = PConfig::get(local_user(),'pumpio','import'); $import_checked = (($import_enabled) ? ' checked="checked" ' : ''); - $enabled = get_pconfig(local_user(),'pumpio','post'); + $enabled = PConfig::get(local_user(),'pumpio','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default'); + $def_enabled = PConfig::get(local_user(),'pumpio','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $public_enabled = get_pconfig(local_user(),'pumpio','public'); + $public_enabled = PConfig::get(local_user(),'pumpio','public'); $public_checked = (($public_enabled) ? ' checked="checked" ' : ''); - $mirror_enabled = get_pconfig(local_user(),'pumpio','mirror'); + $mirror_enabled = PConfig::get(local_user(),'pumpio','mirror'); $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : ''); - $servername = get_pconfig(local_user(), "pumpio", "host"); - $username = get_pconfig(local_user(), "pumpio", "user"); + $servername = PConfig::get(local_user(), "pumpio", "host"); + $username = PConfig::get(local_user(), "pumpio", "user"); /* Add some HTML to the existing form */ $s .= ''; - $s .= '

'. t('Pump.io Import/Export/Mirror').'

'; + $s .= '

'. L10n::t('Pump.io Import/Export/Mirror').'

'; $s .= ''; $s .= ''; } @@ -306,19 +319,19 @@ function pumpio_settings_post(&$a,&$b) { if(x($_POST,'pumpio-submit')) { if(x($_POST,'pumpio_delete')) { - set_pconfig(local_user(),'pumpio','consumer_key',''); - set_pconfig(local_user(),'pumpio','consumer_secret',''); - set_pconfig(local_user(),'pumpio','oauth_token',''); - set_pconfig(local_user(),'pumpio','oauth_token_secret',''); - set_pconfig(local_user(),'pumpio','post',false); - set_pconfig(local_user(),'pumpio','import',false); - set_pconfig(local_user(),'pumpio','host',''); - set_pconfig(local_user(),'pumpio','user',''); - set_pconfig(local_user(),'pumpio','public',false); - set_pconfig(local_user(),'pumpio','mirror',false); - set_pconfig(local_user(),'pumpio','post_by_default',false); - set_pconfig(local_user(),'pumpio','lastdate', 0); - set_pconfig(local_user(),'pumpio','last_id', ''); + PConfig::set(local_user(),'pumpio','consumer_key',''); + PConfig::set(local_user(),'pumpio','consumer_secret',''); + PConfig::set(local_user(),'pumpio','oauth_token',''); + PConfig::set(local_user(),'pumpio','oauth_token_secret',''); + PConfig::set(local_user(),'pumpio','post',false); + PConfig::set(local_user(),'pumpio','import',false); + PConfig::set(local_user(),'pumpio','host',''); + PConfig::set(local_user(),'pumpio','user',''); + PConfig::set(local_user(),'pumpio','public',false); + PConfig::set(local_user(),'pumpio','mirror',false); + PConfig::set(local_user(),'pumpio','post_by_default',false); + PConfig::set(local_user(),'pumpio','lastdate', 0); + PConfig::set(local_user(),'pumpio','last_id', ''); } else { // filtering the username if it is filled wrong $user = $_POST['pumpio_user']; @@ -331,41 +344,45 @@ function pumpio_settings_post(&$a,&$b) { // Filtering the hostname if someone is entering it with "http" $host = $_POST['pumpio_host']; $host = trim($host); - $host = str_replace(array("https://", "http://"), array("", ""), $host); + $host = str_replace(["https://", "http://"], ["", ""], $host); - set_pconfig(local_user(),'pumpio','post',intval($_POST['pumpio'])); - set_pconfig(local_user(),'pumpio','import',$_POST['pumpio_import']); - set_pconfig(local_user(),'pumpio','host',$host); - set_pconfig(local_user(),'pumpio','user',$user); - 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'])); + PConfig::set(local_user(),'pumpio','post',intval($_POST['pumpio'])); + PConfig::set(local_user(),'pumpio','import',$_POST['pumpio_import']); + PConfig::set(local_user(),'pumpio','host',$host); + PConfig::set(local_user(),'pumpio','user',$user); + PConfig::set(local_user(),'pumpio','public',$_POST['pumpio_public']); + PConfig::set(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']); + PConfig::set(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault'])); if (!$_POST['pumpio_mirror']) - del_pconfig(local_user(),'pumpio','lastdate'); + PConfig::delete(local_user(),'pumpio','lastdate'); //header("Location: ".$a->get_baseurl()."/pumpio/connect"); } } } -function pumpio_post_local(&$a,&$b) { +function pumpio_post_local(&$a, &$b) { - if((! local_user()) || (local_user() != $b['uid'])) + if (!local_user() || (local_user() != $b['uid'])) { return; + } - $pumpio_post = intval(get_pconfig(local_user(),'pumpio','post')); + $pumpio_post = intval(PConfig::get(local_user(), 'pumpio', 'post')); $pumpio_enable = (($pumpio_post && x($_REQUEST,'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0); - if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'pumpio','post_by_default'))) + if ($b['api_source'] && intval(PConfig::get(local_user(), 'pumpio', 'post_by_default'))) { $pumpio_enable = 1; + } - if(! $pumpio_enable) + if (!$pumpio_enable) { return; + } - if(strlen($b['postopts'])) + if (strlen($b['postopts'])) { $b['postopts'] .= ','; + } $b['postopts'] .= 'pumpio'; } @@ -375,7 +392,7 @@ function pumpio_post_local(&$a,&$b) { function pumpio_send(&$a,&$b) { - if (!get_pconfig($b["uid"],'pumpio','import')) { + if (!PConfig::get($b["uid"],'pumpio','import')) { if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) return; } @@ -403,8 +420,16 @@ function pumpio_send(&$a,&$b) { logger("pumpio_send: receiver ".print_r($receiver, true)); - if (!count($receiver) AND ($b['private'] OR !strstr($b['postopts'],'pumpio'))) + if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) { return; + } + + // Dont't post if the post doesn't belong to us. + // This is a check for forum postings + $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); + if ($b['contact-id'] != $self['id']) { + return; + } } if($b['verb'] == ACTIVITY_LIKE) { @@ -418,10 +443,10 @@ function pumpio_send(&$a,&$b) { if($b['verb'] == ACTIVITY_DISLIKE) return; - if (($b['verb'] == ACTIVITY_POST) AND ($b['created'] !== $b['edited']) AND !$b['deleted']) + if (($b['verb'] == ACTIVITY_POST) && ($b['created'] !== $b['edited']) && !$b['deleted']) pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]); - if (($b['verb'] == ACTIVITY_POST) AND $b['deleted']) + if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) pumpio_action($a, $b["uid"], $b["uri"], "delete"); if($b['deleted'] || ($b['created'] !== $b['edited'])) @@ -435,14 +460,14 @@ function pumpio_send(&$a,&$b) { // Support for native shares // http:///api//shares?id= - $oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token"); - $oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret"); - $consumer_key = get_pconfig($b['uid'], "pumpio","consumer_key"); - $consumer_secret = get_pconfig($b['uid'], "pumpio","consumer_secret"); + $oauth_token = PConfig::get($b['uid'], "pumpio", "oauth_token"); + $oauth_token_secret = PConfig::get($b['uid'], "pumpio", "oauth_token_secret"); + $consumer_key = PConfig::get($b['uid'], "pumpio","consumer_key"); + $consumer_secret = PConfig::get($b['uid'], "pumpio","consumer_secret"); - $host = get_pconfig($b['uid'], "pumpio", "host"); - $user = get_pconfig($b['uid'], "pumpio", "user"); - $public = get_pconfig($b['uid'], "pumpio", "public"); + $host = PConfig::get($b['uid'], "pumpio", "host"); + $user = PConfig::get($b['uid'], "pumpio", "user"); + $public = PConfig::get($b['uid'], "pumpio", "public"); if($oauth_token && $oauth_token_secret) { @@ -452,14 +477,14 @@ function pumpio_send(&$a,&$b) { $content = bbcode($b['body'], false, false, 4); - $params = array(); + $params = []; $params["verb"] = "post"; if (!$iscomment) { - $params["object"] = array( + $params["object"] = [ 'objectType' => "note", - 'content' => $content); + 'content' => $content]; if ($title != "") $params["object"]["displayName"] = $title; @@ -477,16 +502,16 @@ function pumpio_send(&$a,&$b) { $params["bcc"] = $receiver["bcc"]; } else { - $inReplyTo = array("id" => $orig_post["uri"], - "objectType" => "note"); + $inReplyTo = ["id" => $orig_post["uri"], + "objectType" => "note"]; - if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) + if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) $inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); - $params["object"] = array( + $params["object"] = [ 'objectType' => "comment", 'content' => $content, - 'inReplyTo' => $inReplyTo); + 'inReplyTo' => $inReplyTo]; if ($title != "") $params["object"]["displayName"] = $title; @@ -505,23 +530,20 @@ function pumpio_send(&$a,&$b) { $url = 'https://'.$host.'/api/user/'.$user.'/feed'; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + $success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); else $success = false; if($success) { if ($user->generator->displayName) - set_pconfig($b["uid"], "pumpio", "application_name", $user->generator->displayName); + PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName); $post_id = $user->object->id; logger('pumpio_send '.$username.': success '.$post_id); - if($post_id AND $iscomment) { + if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", - dbesc($post_id), - intval($b['id']) - ); + Item::update(['extid' => $post_id], ['id' => $b['id']]); } } else { logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user,true)); @@ -530,27 +552,26 @@ function pumpio_send(&$a,&$b) { if (count($r)) $a->contact = $r[0]["id"]; - $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $params)); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_PUMPIO,$s); - notice(t('Pump.io post failed. Queued for retry.').EOL); - } + $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]); + Queue::add($a->contact, NETWORK_PUMPIO, $s); + notice(L10n::t('Pump.io post failed. Queued for retry.').EOL); + } } } 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')) + if (!PConfig::get($uid,'pumpio','import')) return; - $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); - $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); - $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); + $ckey = PConfig::get($uid, 'pumpio', 'consumer_key'); + $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret'); + $otoken = PConfig::get($uid, 'pumpio', 'oauth_token'); + $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret'); + $hostname = PConfig::get($uid, 'pumpio','host'); + $username = PConfig::get($uid, "pumpio", "user"); $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), @@ -562,12 +583,12 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $orig_post = $r[0]; - if ($orig_post["extid"] AND !strstr($orig_post["extid"], "/proxy/")) + if ($orig_post["extid"] && !strstr($orig_post["extid"], "/proxy/")) $uri = $orig_post["extid"]; else $uri = $orig_post["uri"]; - if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) + if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) $objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); elseif (strstr($uri, "/api/comment/")) $objectType = "comment"; @@ -577,9 +598,9 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $objectType = "image"; $params["verb"] = $action; - $params["object"] = array('id' => $uri, + $params["object"] = ['id' => $uri, "objectType" => $objectType, - "content" => $content); + "content" => $content]; $client = new oauth_client_class; $client->oauth_version = '1.0a'; @@ -594,7 +615,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $url = 'https://'.$hostname.'/api/user/'.$username.'/feed'; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + $success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); else $success = false; @@ -607,10 +628,10 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { if (count($r)) $a->contact = $r[0]["id"]; - $s = serialize(array('url' => $url, 'item' => $orig_post["id"], 'post' => $params)); - require_once('include/queue_fn.php'); - add_to_queue($a->contact,NETWORK_PUMPIO,$s); - notice(t('Pump.io like failed. Queued for retry.').EOL); + $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]); + + Queue::add($a->contact, NETWORK_PUMPIO, $s); + notice(L10n::t('Pump.io like failed. Queued for retry.').EOL); } } @@ -621,9 +642,9 @@ function pumpio_sync(&$a) { if (!count($r)) return; - $last = get_config('pumpio','last_poll'); + $last = Config::get('pumpio','last_poll'); - $poll_interval = intval(get_config('pumpio','poll_interval')); + $poll_interval = intval(Config::get('pumpio','poll_interval')); if(! $poll_interval) $poll_interval = PUMPIO_DEFAULT_POLL_INTERVAL; @@ -644,11 +665,11 @@ function pumpio_sync(&$a) { } } - $abandon_days = intval(get_config('system','account_abandon_days')); + $abandon_days = intval(Config::get('system','account_abandon_days')); if ($abandon_days < 1) $abandon_days = 0; - $abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400); + $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() "); if(count($r)) { @@ -665,7 +686,7 @@ function pumpio_sync(&$a) { pumpio_fetchinbox($a, $rr['uid']); // check for new contacts once a day - $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check'); + $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check'); if($last_contact_check) $next_contact_check = $last_contact_check + 86400; else @@ -673,36 +694,35 @@ function pumpio_sync(&$a) { if($next_contact_check <= time()) { pumpio_getallusers($a, $rr["uid"]); - set_pconfig($rr['uid'],'pumpio','contact_check',time()); + PConfig::set($rr['uid'],'pumpio','contact_check',time()); } } } logger('pumpio: cron_end'); - set_config('pumpio','last_poll', time()); + Config::set('pumpio','last_poll', time()); } function pumpio_cron(&$a,$b) { - //pumpio_sync($a); - proc_run("php","addon/pumpio/pumpio_sync.php"); + Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php"); } 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'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $lastdate = get_pconfig($uid, 'pumpio', 'lastdate'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); + $ckey = PConfig::get($uid, 'pumpio', 'consumer_key'); + $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret'); + $otoken = PConfig::get($uid, 'pumpio', 'oauth_token'); + $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret'); + $lastdate = PConfig::get($uid, 'pumpio', 'lastdate'); + $hostname = PConfig::get($uid, 'pumpio','host'); + $username = PConfig::get($uid, "pumpio", "user"); // get the application name for the pump.io app // 1st try personal config, then system config and fallback to the // hostname of the node if neither one is set. - $application_name = get_pconfig( $uid, 'pumpio', 'application_name'); + $application_name = PConfig::get($uid, 'pumpio', 'application_name'); if ($application_name == "") - $application_name = get_config('pumpio', 'application_name'); + $application_name = Config::get('pumpio', 'application_name'); if ($application_name == "") $application_name = $a->get_hostname(); @@ -725,7 +745,7 @@ function pumpio_fetchtimeline(&$a, $uid) { $username = $user.'@'.$host; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user); else $success = false; @@ -750,7 +770,7 @@ function pumpio_fetchtimeline(&$a, $uid) { if ($first_time) continue; - $receiptians = array(); + $receiptians = []; if (@is_array($post->cc)) $receiptians = array_merge($receiptians, $post->cc); @@ -763,7 +783,7 @@ function pumpio_fetchtimeline(&$a, $uid) { if ($receiver->id == "http://activityschema.org/collection/public") $public = true; - if ($public AND !stristr($post->generator->displayName, $application_name)) { + if ($public && !stristr($post->generator->displayName, $application_name)) { require_once('include/html2bbcode.php'); $_SESSION["authenticated"] = true; @@ -775,6 +795,10 @@ function pumpio_fetchtimeline(&$a, $uid) { $_REQUEST["profile_uid"] = $uid; $_REQUEST["source"] = "pump.io"; + if (isset($post->object->id)) { + $_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id; + } + if ($post->object->displayName != "") $_REQUEST["title"] = html2bbcode($post->object->displayName); else @@ -801,7 +825,7 @@ function pumpio_fetchtimeline(&$a, $uid) { } if ($lastdate != 0) - set_pconfig($uid,'pumpio','lastdate', $lastdate); + PConfig::set($uid,'pumpio','lastdate', $lastdate); } function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { @@ -831,8 +855,8 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { if(link_compare($post->actor->url, $own_id)) { $contactid = $self[0]['id']; } else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); @@ -843,13 +867,7 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { $contactid = $orig_post['contact-id']; } - $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'", - dbesc(datetime_convert()), - dbesc(ACTIVITY_LIKE), - intval($uid), - intval($contactid), - dbesc($orig_post['uri']) - ); + Item::delete(['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]); if(count($r)) logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); @@ -860,6 +878,11 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) { require_once('include/items.php'); + if ($post->object->id == "") { + logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG); + return; + } + // Searching for the liked post // Two queries for speed issues $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1", @@ -895,8 +918,8 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $post->actor->url = $self[0]['url']; $post->actor->image->url = $self[0]['photo']; } else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); @@ -919,7 +942,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru return; } - $likedata = array(); + $likedata = []; $likedata['parent'] = $orig_post['id']; $likedata['verb'] = ACTIVITY_LIKE; $likedata['gravity'] = 3; @@ -935,70 +958,42 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]'; $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]'; - $post_type = t('status'); + $post_type = L10n::t('status'); $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]'; $likedata['object-type'] = ACTIVITY_OBJ_NOTE; - $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); + $likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink); $likedata['object'] = '' . ACTIVITY_OBJ_NOTE . '1' . '' . $orig_post['uri'] . '' . xmlify('') . '' . $orig_post['title'] . '' . $orig_post['body'] . ''; - $ret = item_store($likedata); + $ret = Item::insert($likedata); logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } function pumpio_get_contact($uid, $contact, $no_insert = false) { - if (function_exists("update_gcontact")) { - update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, - "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, - "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, - "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id))); - - $cid = get_contact($contact->url, $uid); - } else { - // Old Code - $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))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc($contact->location->displayName), - dbesc($contact->summary), - dbesc(normalise_link($contact->url))); - - $cid = 0; - } + GContact::update(["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, + "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, + "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, + "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)]); + $cid = Contact::getIdForURL($contact->url, $uid); if ($no_insert) return($cid); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", - intval($uid), dbesc($contact->url)); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", + intval($uid), dbesc(normalise_link($contact->url))); - if(!count($r)) { + if (!count($r)) { // create contact record - q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, + q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", intval($uid), - dbesc(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), dbesc($contact->url), dbesc(normalise_link($contact->url)), dbesc(str_replace("acct:", "", $contact->id)), @@ -1011,36 +1006,23 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { dbesc(NETWORK_PUMPIO), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location->displayName), + dbesc($contact->summary), intval(1) ); - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", - dbesc($contact->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", + dbesc(normalise_link($contact->url)), intval($uid) ); - if(! count($r)) + if (!count($r)) { return(false); - - $contact_id = $r[0]['id']; - - $g = q("select def_gid from user where uid = %d limit 1", - intval($uid) - ); - - if($g && intval($g[0]['def_gid'])) { - require_once('include/group.php'); - group_add_member($uid,'',$contact_id,$g[0]['def_gid']); } - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc($contact->location->displayName), - dbesc($contact->summary), - intval($contact_id) - ); + $contact_id = $r[0]['id']; + + Group::addMember(User::getDefaultGroup($uid), $contact_id); } else { $contact_id = $r[0]["id"]; @@ -1055,7 +1037,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { */ } - update_contact_avatar($contact->image->url, $uid, $contact_id); + Contact::updateAvatar($contact->image->url, $uid, $contact_id); return($contact_id); } @@ -1069,7 +1051,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { ); if (count($r)) - return drop_item($r[0]["id"], $false); + return Item::deleteById($r[0]["id"]); $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($post->object->id), @@ -1077,17 +1059,17 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { ); if (count($r)) - return drop_item($r[0]["id"], $false); + return Item::deleteById($r[0]["id"]); } function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { require_once('include/items.php'); require_once('include/html2bbcode.php'); - if (($post->verb == "like") OR ($post->verb == "favorite")) + if (($post->verb == "like") || ($post->verb == "favorite")) return pumpio_dolike($a, $uid, $self, $post, $own_id); - if (($post->verb == "unlike") OR ($post->verb == "unfavorite")) + if (($post->verb == "unlike") || ($post->verb == "unfavorite")) return pumpio_dounlike($a, $uid, $self, $post, $own_id); if ($post->verb == "delete") @@ -1116,7 +1098,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if (!strstr("post|share|update", $post->verb)) return false; - $receiptians = array(); + $receiptians = []; if (@is_array($post->cc)) $receiptians = array_merge($receiptians, $post->cc); @@ -1128,7 +1110,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if ($receiver->id == "http://activityschema.org/collection/public") $public = true; - $postarray = array(); + $postarray = []; $postarray['network'] = NETWORK_PUMPIO; $postarray['gravity'] = 0; $postarray['uid'] = $uid; @@ -1158,16 +1140,16 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $post->actor->image->url = $self[0]['photo']; } elseif ($contact_id == 0) { // Take an existing contact, the contact of the note or - as a fallback - the id of the user - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); if(count($r)) $contact_id = $r[0]['id']; else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); @@ -1220,26 +1202,26 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if ($post->object->displayName != "") $postarray['title'] = $post->object->displayName; - $postarray['created'] = datetime_convert('UTC','UTC',$post->published); + $postarray['created'] = DateTimeFormat::utc($post->published); if (isset($post->updated)) - $postarray['edited'] = datetime_convert('UTC','UTC',$post->updated); + $postarray['edited'] = DateTimeFormat::utc($post->updated); elseif (isset($post->received)) - $postarray['edited'] = datetime_convert('UTC','UTC',$post->received); + $postarray['edited'] = DateTimeFormat::utc($post->received); else $postarray['edited'] = $postarray['created']; if ($post->verb == "share") { - if (!intval(get_config('system','wall-to-wall_share'))) { - if (isset($post->object->author->displayName) AND ($post->object->author->displayName != "")) + if (!intval(Config::get('system','wall-to-wall_share'))) { + if (isset($post->object->author->displayName) && ($post->object->author->displayName != "")) $share_author = $post->object->author->displayName; - elseif (isset($post->object->author->preferredUsername) AND ($post->object->author->preferredUsername != "")) + elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != "")) $share_author = $post->object->author->preferredUsername; else $share_author = $post->object->author->url; $postarray['body'] = share_header($share_author, $post->object->author->url, $post->object->author->image->url, "", - datetime_convert('UTC','UTC',$post->object->created), + DateTimeFormat::utc($post->object->created), $post->links->self->href). $postarray['body']."[/share]"; @@ -1247,7 +1229,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray['body'] = "[share author='".$share_author. "' profile='".$post->object->author->url. "' avatar='".$post->object->author->image->url. - "' posted='".datetime_convert('UTC','UTC',$post->object->created). + "' posted='".DateTimeFormat::convert($post->object->created, 'UTC', 'UTC', ). "' link='".$post->links->self->href."']".$postarray['body']."[/share]"; */ } else { @@ -1261,17 +1243,13 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if (trim($postarray['body']) == "") return false; - $top_item = item_store($postarray); + $top_item = Item::insert($postarray); $postarray["id"] = $top_item; - if (($top_item == 0) AND ($post->verb == "update")) { - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", - dbesc($postarray["title"]), - dbesc($postarray["body"]), - dbesc($postarray["edited"]), - dbesc($postarray["uri"]), - intval($uid) - ); + if (($top_item == 0) && ($post->verb == "update")) { + $fields = ['title' => $postarray["title"], 'body' => $postarray["body"], 'changed' => $postarray["edited"]]; + $condition = ['uri' => $postarray["uri"], 'uid' => $uid]; + Item::update($fields, $condition); } if ($post->object->objectType == "comment") { @@ -1302,14 +1280,14 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet foreach($myconv as $conv) { // now if we find a match, it means we're in this conversation - if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id)) + if(!link_compare($conv['author-link'],$importer_url) && !link_compare($conv['author-link'],$own_id)) continue; require_once('include/enotify.php'); $conv_parent = $conv['parent']; - notification(array( + notification([ 'type' => NOTIFY_COMMENT, 'notify_flags' => $user[0]['notify-flags'], 'language' => $user[0]['language'], @@ -1317,14 +1295,14 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)), + 'link' => $a->get_baseurl().'/display/'.urlencode(Item::getGuidById($top_item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $conv_parent, - )); + ]); // only send one notification break; @@ -1338,22 +1316,23 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet function pumpio_fetchinbox(&$a, $uid) { - $ckey = get_pconfig($uid, 'pumpio', 'consumer_key'); - $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret'); - $otoken = get_pconfig($uid, 'pumpio', 'oauth_token'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $lastdate = get_pconfig($uid, 'pumpio', 'lastdate'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); + $ckey = PConfig::get($uid, 'pumpio', 'consumer_key'); + $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret'); + $otoken = PConfig::get($uid, 'pumpio', 'oauth_token'); + $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret'); + $lastdate = PConfig::get($uid, 'pumpio', 'lastdate'); + $hostname = PConfig::get($uid, 'pumpio','host'); + $username = PConfig::get($uid, "pumpio", "user"); $own_id = "https://".$hostname."/".$username; $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid)); - $lastitems = q("SELECT uri FROM `item` WHERE `network` = '%s' AND `uid` = %d AND - `extid` != '' AND `id` = `parent` - ORDER BY `commented` DESC LIMIT 10", + $lastitems = q("SELECT `uri` FROM `thread` + INNER JOIN `item` ON `item`.`id` = `thread`.`iid` + WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != '' + ORDER BY `thread`.`commented` DESC LIMIT 10", dbesc(NETWORK_PUMPIO), intval($uid) ); @@ -1368,7 +1347,7 @@ function pumpio_fetchinbox(&$a, $uid) { $client->access_token = $otoken; $client->access_token_secret = $osecret; - $last_id = get_pconfig($uid,'pumpio','last_id'); + $last_id = PConfig::get($uid,'pumpio','last_id'); $url = 'https://'.$hostname.'/api/user/'.$username.'/inbox'; @@ -1376,7 +1355,7 @@ function pumpio_fetchinbox(&$a, $uid) { $url .= '?since='.urlencode($last_id); if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user); else $success = false; @@ -1393,16 +1372,16 @@ function pumpio_fetchinbox(&$a, $uid) { foreach ($lastitems AS $item) pumpio_fetchallcomments($a, $uid, $item["uri"]); - set_pconfig($uid,'pumpio','last_id', $last_id); + PConfig::set($uid,'pumpio','last_id', $last_id); } 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'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); + $ckey = PConfig::get($uid, 'pumpio', 'consumer_key'); + $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret'); + $otoken = PConfig::get($uid, 'pumpio', 'oauth_token'); + $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret'); + $hostname = PConfig::get($uid, 'pumpio','host'); + $username = PConfig::get($uid, "pumpio", "user"); $client = new oauth_client_class; $client->oauth_version = '1.0a'; @@ -1417,7 +1396,7 @@ function pumpio_getallusers(&$a, $uid) { $url = 'https://'.$hostname.'/api/user/'.$username.'/following'; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users); else $success = false; @@ -1425,13 +1404,16 @@ function pumpio_getallusers(&$a, $uid) { $url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems; if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users); else $success = false; } - foreach ($users->items AS $user) - pumpio_get_contact($uid, $user); + if (is_array($users->items)) { + foreach ($users->items AS $user) { + pumpio_get_contact($uid, $user); + } + } } function pumpio_queue_hook(&$a,&$b) { @@ -1442,15 +1424,13 @@ function pumpio_queue_hook(&$a,&$b) { if(! count($qi)) return; - require_once('include/queue_fn.php'); - foreach($qi as $x) { if($x['network'] !== NETWORK_PUMPIO) continue; logger('pumpio_queue: run'); - $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` + $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1", intval($x['cid']) ); @@ -1461,18 +1441,18 @@ function pumpio_queue_hook(&$a,&$b) { //logger('pumpio_queue: fetching userdata '.print_r($userdata, true)); - $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"); + $oauth_token = PConfig::get($userdata['uid'], "pumpio", "oauth_token"); + $oauth_token_secret = PConfig::get($userdata['uid'], "pumpio", "oauth_token_secret"); + $consumer_key = PConfig::get($userdata['uid'], "pumpio","consumer_key"); + $consumer_secret = PConfig::get($userdata['uid'], "pumpio","consumer_secret"); - $host = get_pconfig($userdata['uid'], "pumpio", "host"); - $user = get_pconfig($userdata['uid'], "pumpio", "user"); + $host = PConfig::get($userdata['uid'], "pumpio", "host"); + $user = PConfig::get($userdata['uid'], "pumpio", "user"); $success = false; - if ($oauth_token AND $oauth_token_secret AND - $consumer_key AND $consumer_secret) { + if ($oauth_token && $oauth_token_secret && + $consumer_key && $consumer_secret) { $username = $user.'@'.$host; logger('pumpio_queue: able to post for user '.$username); @@ -1489,21 +1469,18 @@ function pumpio_queue_hook(&$a,&$b) { $client->client_secret = $consumer_secret; if (pumpio_reachable($z['url'])) - $success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); + $success = $client->CallAPI($z['url'], 'POST', $z['post'], ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user); else $success = false; if($success) { $post_id = $user->object->id; logger('pumpio_queue: send '.$username.': success '.$post_id); - if($post_id AND $iscomment) { + if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']); - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", - dbesc($post_id), - intval($z['item']) - ); + Item::update(['extid' => $post_id], ['id' => $z['item']]); } - remove_queue_item($x['id']); + Queue::removeItem($x['id']); } else logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true)); } else @@ -1511,26 +1488,26 @@ function pumpio_queue_hook(&$a,&$b) { if (!$success) { logger('pumpio_queue: delayed'); - update_queue_time($x['id']); + Queue::updateTime($x['id']); } } } function pumpio_getreceiver(&$a, $b) { - $receiver = array(); + $receiver = []; if (!$b["private"]) { if(! strstr($b['postopts'],'pumpio')) return $receiver; - $public = get_pconfig($b['uid'], "pumpio", "public"); + $public = PConfig::get($b['uid'], "pumpio", "public"); if ($public) - $receiver["to"][] = Array( + $receiver["to"][] = [ "objectType" => "collection", - "id" => "http://activityschema.org/collection/public"); + "id" => "http://activityschema.org/collection/public"]; } else { $cids = explode("><", $b["allow_cid"]); $gids = explode("><", $b["allow_gid"]); @@ -1545,30 +1522,29 @@ function pumpio_getreceiver(&$a, $b) { ); if (count($r)) { - $receiver["bcc"][] = Array( + $receiver["bcc"][] = [ "displayName" => $r[0]["name"], "objectType" => "person", "preferredUsername" => $r[0]["nick"], - "url" => $r[0]["url"]); + "url" => $r[0]["url"]]; } } foreach ($gids AS $gid) { $gid = trim($gid, " <>"); $r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ". - "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d AND `group_member`.`uid` = %d ". + "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ". "AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'", intval($gid), - intval($b["uid"]), dbesc(NETWORK_PUMPIO) ); foreach ($r AS $row) - $receiver["bcc"][] = Array( + $receiver["bcc"][] = [ "displayName" => $row["name"], "objectType" => "person", "preferredUsername" => $row["nick"], - "url" => $row["url"]); + "url" => $row["url"]]; } } @@ -1589,11 +1565,11 @@ function pumpio_getreceiver(&$a, $b) { ); if (count($r)) { - $receiver["to"][] = Array( + $receiver["to"][] = [ "displayName" => $r[0]["name"], "objectType" => "person", "preferredUsername" => $r[0]["nick"], - "url" => $r[0]["url"]); + "url" => $r[0]["url"]]; } } } @@ -1602,12 +1578,12 @@ function pumpio_getreceiver(&$a, $b) { } 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'); - $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret'); - $hostname = get_pconfig($uid, 'pumpio','host'); - $username = get_pconfig($uid, "pumpio", "user"); + $ckey = PConfig::get($uid, 'pumpio', 'consumer_key'); + $csecret = PConfig::get($uid, 'pumpio', 'consumer_secret'); + $otoken = PConfig::get($uid, 'pumpio', 'oauth_token'); + $osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret'); + $hostname = PConfig::get($uid, 'pumpio','host'); + $username = PConfig::get($uid, "pumpio", "user"); logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id); @@ -1640,7 +1616,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url); if (pumpio_reachable($url)) - $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item); + $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item); else $success = false; @@ -1709,7 +1685,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { function pumpio_reachable($url) { - $data = z_fetch_url($url, false, $redirects, array('timeout'=>10)); + $data = Network::curl($url, false, $redirects, ['timeout'=>10]); return(intval($data['return_code']) != 0); }