X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=d8538dccce431ed7d287f414960307f06340a6a6;hp=1153000d7a2d7165b8f786edb8a5f6842f5f2979;hb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;hpb=8fa3f2415a3f3906f5fdadd1601ec6830ecce3c9 diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 1153000d..d8538dcc 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -5,12 +5,18 @@ * 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\Config; +use Friendica\Core\PConfig; +use Friendica\Core\Worker; +use Friendica\Model\Contact; +use Friendica\Model\GContact; +use Friendica\Model\Group; +use Friendica\Model\User; + +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 @@ -64,8 +70,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 +81,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,18 +124,18 @@ 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 == "") || ($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); } @@ -166,8 +172,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); @@ -191,9 +197,9 @@ 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') . '
'; @@ -212,24 +218,24 @@ 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 */ @@ -253,8 +259,8 @@ function pumpio_settings(&$a,&$s) { if (($username != '') && ($servername != '')) { - $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token"); - $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret"); + $oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token"); + $oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret"); $s .= '
'; if (($oauth_token == "") || ($oauth_token_secret == "")) { @@ -306,19 +312,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 +337,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 +385,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 +413,16 @@ function pumpio_send(&$a,&$b) { logger("pumpio_send: receiver ".print_r($receiver, true)); - if (!count($receiver) && ($b['private'] || !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) { @@ -435,14 +453,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 +470,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 +495,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"] != "") && (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,14 +523,14 @@ 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); @@ -530,7 +548,7 @@ function pumpio_send(&$a,&$b) { if (count($r)) $a->contact = $r[0]["id"]; - $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $params)); + $s = serialize(['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); @@ -542,15 +560,15 @@ function pumpio_send(&$a,&$b) { 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), @@ -577,9 +595,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 +612,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,7 +625,7 @@ 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)); + $s = serialize(['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); @@ -621,9 +639,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,7 +662,7 @@ 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; @@ -665,7 +683,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 +691,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 +742,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 +767,7 @@ function pumpio_fetchtimeline(&$a, $uid) { if ($first_time) continue; - $receiptians = array(); + $receiptians = []; if (@is_array($post->cc)) $receiptians = array_merge($receiptians, $post->cc); @@ -805,7 +822,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) { @@ -928,7 +945,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; @@ -960,11 +977,11 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru function pumpio_get_contact($uid, $contact, $no_insert = false) { - update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, + 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 = get_contact($contact->url, $uid); + "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)]); + $cid = Contact::getIdForURL($contact->url, $uid); if ($no_insert) return($cid); @@ -1008,14 +1025,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = 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']); - } + Group::addMember(User::getDefaultGroup($uid), $contact_id); } else { $contact_id = $r[0]["id"]; @@ -1030,8 +1040,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { */ } - if (function_exists("update_contact_avatar")) - update_contact_avatar($contact->image->url, $uid, $contact_id); + Contact::updateAvatar($contact->image->url, $uid, $contact_id); return($contact_id); } @@ -1092,7 +1101,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); @@ -1104,7 +1113,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; @@ -1205,7 +1214,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray['edited'] = $postarray['created']; if ($post->verb == "share") { - if (!intval(get_config('system','wall-to-wall_share'))) { + 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) && ($post->object->author->preferredUsername != "")) @@ -1285,7 +1294,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $conv_parent = $conv['parent']; - notification(array( + notification([ 'type' => NOTIFY_COMMENT, 'notify_flags' => $user[0]['notify-flags'], 'language' => $user[0]['language'], @@ -1300,7 +1309,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $conv_parent, - )); + ]); // only send one notification break; @@ -1314,13 +1323,13 @@ 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; @@ -1345,7 +1354,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'; @@ -1353,7 +1362,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; @@ -1370,16 +1379,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'; @@ -1394,7 +1403,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; @@ -1402,13 +1411,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) { @@ -1438,13 +1450,13 @@ 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; @@ -1466,7 +1478,7 @@ 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; @@ -1495,19 +1507,19 @@ function pumpio_queue_hook(&$a,&$b) { 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"]); @@ -1522,30 +1534,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"]]; } } @@ -1566,11 +1577,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"]]; } } } @@ -1579,12 +1590,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); @@ -1617,7 +1628,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; @@ -1686,7 +1697,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { function pumpio_reachable($url) { - $data = z_fetch_url($url, false, $redirects, array('timeout'=>10)); + $data = z_fetch_url($url, false, $redirects, ['timeout'=>10]); return(intval($data['return_code']) != 0); }